From a0dfc288206405ac8e2476ec0e8fbc7ae0c81776 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 23 Jan 2024 21:27:43 -0800 Subject: [PATCH] Update to wasi:cli@0.2.0-rc-2024-01-16. --- lib/virtual_adapter.debug.wasm | Bin 265048 -> 265048 bytes lib/virtual_adapter.wasm | Bin 232649 -> 232649 bytes src/virt_deny/exit.rs | 2 +- src/virt_env.rs | 4 +- src/virt_io/stdio.rs | 32 +++++------ wit/deps/cli/command.wit | 2 +- wit/deps/cli/imports.wit | 2 +- wit/deps/http/proxy.wit | 6 +-- wit/virt.wit | 96 ++++++++++++++++----------------- 9 files changed, 72 insertions(+), 72 deletions(-) diff --git a/lib/virtual_adapter.debug.wasm b/lib/virtual_adapter.debug.wasm index dd559ea6f95597bc4eb85de8aa86f1823328000d..353e5fe905fc003bb04be26d143de2e80e8e9d3a 100755 GIT binary patch delta 984 zcmZ8gOGs2<6!xAo>K%t_hEYdIuNCF^NXu~^`AE%08+GQ6i!vg@2%#bZ7lAOjun1cu z;U!NCqo5WojUn&GMYL+ufHUJbYNd%`52Gb#?Xoz?@RrRsQMVY)JDdeY6Ig_wZoWhvd1^oM3d3dpc)JQ zZpLlDpYc?ni!m1PNj}iQm0Jul#(J=xla5d)V>raa;xnPp z39IUEa@0(YDhFSX_7zm6hz{R|E9P(+Y`Qo?z11)zxdY_VF)G|iH*`EL+(oZ-?2+op z8W?9*Tn<>|pou7Ys8)j!Nl$5TjrRWmhqCq|_QzD9T zHTsw-T!RKzAR^;?a-h;y8tUln034Or&PqX&hO^MkF{S)JpGpONTh1qst%6r7D(O=O zIxWp+{>HSC$>;w$wN=@aDjInVZW>&JXVOzdS{Tn!tVg8nXj3Y=#++Vfr;f5WbX`aBK=V5GN>5Hl*%KO%;vI?YL{WZ{ zd20x#C#-d);wAjaWM>K6n6xL6H<@BdY~{$CB(^izN+Q1m@}`itp3bKVk*O3H^P}L` VL$)*uIh&S&#!Sd<&ZTiN_!lTsMPdK| delta 1267 zcmY*ZO-NKx7_dJKm^D9evvvshx>g7LLOX8Z_?k9%*dnp1 zUX0`EmA?vBFsAk%!7CttYs2k*Lnj%m;RVb*H%eMtOAqSSpgIa}rTBN3o z5g%%
    =uJyxKVc3Y+NKBF?}SfL3>bHv@rJ#sffwUFBEwu=8!^YJP@Z-YOdhjDMs zn;!Oh(30LYyv4}ok(S>4DRXZVR~ z+2{F((#qgi4Li;86iGT6vusUR%bHVwl=k((#o(*w^ny%A^&$NkW6iNy;#|W0f&HUc1LANiT_ulut_xrOjQ!eQ=3`zsSQq!+Q{OIdeF%BD#k|b0E0%2!Jy`hGkZoho@tuM z`mQ-;zF@Nr=v@xI>G9y0kBhC`Yo&3sG!8?4n}JyNMdh?#}=QY&#F>UFfyly_D3k zira2kZ#$>w+pg(OTTQyVRD+fAm?Q_?S1mqHT%K6)OKnwb3#N&NE37nb;o(NI{b t5%2v`SQ2+H(^4K`L=taZHmuiA?GZ^8nWK?>@!N>hwEkJlvR)~z{srW;a0LJW delta 1289 zcmZ8hT}YE*6yAG2=cd@yR?dq`Lql6`xu5S7)cMmz1cfE)x~RxDx3PWBn#c0OYMG-+43JQw|x^O?xUC|Fg*X6+P`M$b)&Uwx`&w0;#-gkA;wz_D` zd=wU+%j0!*%GnL^r9w02*DL+NR*M&S(BiajB~-;C)2^xMiTI?cn#V)58$pjPPT&ug zZtGUUuKB!hWIL?k4zLUUe&7wi4BRLOfKSUl;03t{_>+79xLVN_dlcP&NzrqkD0-7b7JgeKdv>;K#;wseZBf-06<0k~TccQA}C{M#$ zCU+*q2)H^fg$NCBE-3~P*q9R6VJxOZ0>+-SIIkJ%Tv|MBhSj$&KG&f9!LqcMCnMAZ zUuW6p;h-y?=5 z{81W&?oOTw(|lCVsu9uY$TQPMM=fd$&xz=ulJ$2fvSz zU2S?nb!`YzHs~eF?d6$gVhG%^Jn8$`g5_w{0v3!jK3pJuLGKg{1FtQTzM%Ju`dL(S ziLOj()i^OC{ep3ARKkbC&qpOZKmI)`;d^2CnADA&%VQE=H7|`x`@!Ulj0hSEbO#Nk VZv-WL7yM?E`S+cx4JW0n{1+?gM?nAp diff --git a/src/virt_deny/exit.rs b/src/virt_deny/exit.rs index a79c6f5..4396c4b 100644 --- a/src/virt_deny/exit.rs +++ b/src/virt_deny/exit.rs @@ -12,7 +12,7 @@ static WASI_EXIT_FNS: OnceLock> = OnceLock: fn get_wasi_exit_fns() -> &'static Vec<(&'static str, FuncParams, FuncResults)> { WASI_EXIT_FNS.get_or_init(|| { Vec::from([( - "wasi:cli/exit@0.2.0-rc-2023-12-05#exit", + "wasi:cli/exit@0.2.0-rc-2024-01-16#exit", vec![ValType::I32], vec![], )]) diff --git a/src/virt_env.rs b/src/virt_env.rs index 491b784..0776b70 100644 --- a/src/virt_env.rs +++ b/src/virt_env.rs @@ -222,7 +222,7 @@ pub(crate) fn stub_env_virt(module: &mut Module) -> Result<()> { module.replace_imported_func( module .imports - .get_func("wasi:cli/environment@0.2.0-rc-2023-12-05", fn_name)?, + .get_func("wasi:cli/environment@0.2.0-rc-2024-01-16", fn_name)?, |(body, _)| { body.unreachable(); }, @@ -240,7 +240,7 @@ pub(crate) fn strip_env_virt(module: &mut Module) -> Result<()> { for fn_name in WASI_ENV_FNS { if let Ok(fid) = module.exports.get_func(format!( - "wasi:cli/environment@0.2.0-rc-2023-12-05#{fn_name}" + "wasi:cli/environment@0.2.0-rc-2024-01-16#{fn_name}" )) { module.replace_exported_func(fid, |(body, _)| { body.unreachable(); diff --git a/src/virt_io/stdio.rs b/src/virt_io/stdio.rs index 4a9bfc7..6a1b08a 100644 --- a/src/virt_io/stdio.rs +++ b/src/virt_io/stdio.rs @@ -6,42 +6,42 @@ use super::StubRequirement; /// Imports exposed by WASI for STDIO functionality which are allowed to be missing const WASI_STDIO_IMPORTS: &[(&str, &str, &StubRequirement)] = &[ ( - "wasi:cli/stdin@0.2.0-rc-2023-12-05", + "wasi:cli/stdin@0.2.0-rc-2024-01-16", "get-stdin", &StubRequirement::Optional, ), ( - "wasi:cli/stdout@0.2.0-rc-2023-12-05", + "wasi:cli/stdout@0.2.0-rc-2024-01-16", "get-stdout", &StubRequirement::Optional, ), ( - "wasi:cli/stderr@0.2.0-rc-2023-12-05", + "wasi:cli/stderr@0.2.0-rc-2024-01-16", "get-stderr", &StubRequirement::Optional, ), ( - "wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05", + "wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16", "get-terminal-stdin", &StubRequirement::Optional, ), ( - "wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05", + "wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16", "get-terminal-stdout", &StubRequirement::Optional, ), ( - "wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05", + "wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16", "get-terminal-stderr", &StubRequirement::Optional, ), ( - "wasi:cli/terminal-input@0.2.0-rc-2023-12-05", + "wasi:cli/terminal-input@0.2.0-rc-2024-01-16", "drop-terminal-input", &StubRequirement::Optional, ), ( - "wasi:cli/terminal-output@0.2.0-rc-2023-12-05", + "wasi:cli/terminal-output@0.2.0-rc-2024-01-16", "drop-terminal-output", &StubRequirement::Optional, ), @@ -72,14 +72,14 @@ pub(crate) fn stub_stdio_virt(module: &mut Module) -> Result<()> { /// Exported functions related to STDIO const WASI_STDIO_EXPORTS: [&str; 8] = [ - "wasi:cli/stdin@0.2.0-rc-2023-12-05#get-stdin", - "wasi:cli/stdout@0.2.0-rc-2023-12-05#get-stdout", - "wasi:cli/stderr@0.2.0-rc-2023-12-05#get-stderr", - "wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05#get-terminal-stdin", - "wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05#get-terminal-stdout", - "wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05#get-terminal-stderr", - "wasi:cli/terminal-input@0.2.0-rc-2023-12-05#[dtor]terminal-input", - "wasi:cli/terminal-output@0.2.0-rc-2023-12-05#[dtor]terminal-output", + "wasi:cli/stdin@0.2.0-rc-2024-01-16#get-stdin", + "wasi:cli/stdout@0.2.0-rc-2024-01-16#get-stdout", + "wasi:cli/stderr@0.2.0-rc-2024-01-16#get-stderr", + "wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16#get-terminal-stdin", + "wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16#get-terminal-stdout", + "wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16#get-terminal-stderr", + "wasi:cli/terminal-input@0.2.0-rc-2024-01-16#[dtor]terminal-input", + "wasi:cli/terminal-output@0.2.0-rc-2024-01-16#[dtor]terminal-output", ]; /// Strip exported WASI functions that implement standard I/O (stdin, stdout, etc) access diff --git a/wit/deps/cli/command.wit b/wit/deps/cli/command.wit index cc82ae5..a988916 100644 --- a/wit/deps/cli/command.wit +++ b/wit/deps/cli/command.wit @@ -1,4 +1,4 @@ -package wasi:cli@0.2.0-rc-2023-12-05; +package wasi:cli@0.2.0-rc-2024-01-16; world command { include imports; diff --git a/wit/deps/cli/imports.wit b/wit/deps/cli/imports.wit index 3606a99..8ce1abe 100644 --- a/wit/deps/cli/imports.wit +++ b/wit/deps/cli/imports.wit @@ -1,4 +1,4 @@ -package wasi:cli@0.2.0-rc-2023-12-05; +package wasi:cli@0.2.0-rc-2024-01-16; world imports { include wasi:clocks/imports@0.2.0-rc-2023-11-10; diff --git a/wit/deps/http/proxy.wit b/wit/deps/http/proxy.wit index 20d4a43..8906da1 100644 --- a/wit/deps/http/proxy.wit +++ b/wit/deps/http/proxy.wit @@ -12,14 +12,14 @@ world proxy { // Proxies have standard output and error streams which are expected to // terminate in a developer-facing console provided by the host. - import wasi:cli/stdout@0.2.0-rc-2023-12-05; - import wasi:cli/stderr@0.2.0-rc-2023-12-05; + import wasi:cli/stdout@0.2.0-rc-2024-01-16; + import wasi:cli/stderr@0.2.0-rc-2024-01-16; // TODO: this is a temporary workaround until component tooling is able to // gracefully handle the absence of stdin. Hosts must return an eof stream // for this import, which is what wasi-libc + tooling will do automatically // when this import is properly removed. - import wasi:cli/stdin@0.2.0-rc-2023-12-05; + import wasi:cli/stdin@0.2.0-rc-2024-01-16; // This is the default handler to use when user code simply wants to make an // HTTP request (e.g., via `fetch()`). diff --git a/wit/virt.wit b/wit/virt.wit index 5a7611c..81de6bc 100644 --- a/wit/virt.wit +++ b/wit/virt.wit @@ -3,7 +3,7 @@ package local:virt; // in future this should be defined as a union world of the various // virtual subsystems, when union syntax lands world virtual-adapter { - import wasi:cli/environment@0.2.0-rc-2023-12-05; + import wasi:cli/environment@0.2.0-rc-2024-01-16; import wasi:filesystem/preopens@0.2.0-rc-2023-11-10; import wasi:filesystem/types@0.2.0-rc-2023-11-10; import wasi:io/error@0.2.0-rc-2023-11-10; @@ -12,25 +12,25 @@ world virtual-adapter { export wasi:io/streams@0.2.0-rc-2023-11-10; import wasi:io/poll@0.2.0-rc-2023-11-10; export wasi:io/poll@0.2.0-rc-2023-11-10; - export wasi:cli/environment@0.2.0-rc-2023-12-05; + export wasi:cli/environment@0.2.0-rc-2024-01-16; export wasi:filesystem/types@0.2.0-rc-2023-11-10; export wasi:filesystem/preopens@0.2.0-rc-2023-11-10; - import wasi:cli/stdin@0.2.0-rc-2023-12-05; - import wasi:cli/stdout@0.2.0-rc-2023-12-05; - import wasi:cli/stderr@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-input@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-output@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05; - export wasi:cli/stdin@0.2.0-rc-2023-12-05; - export wasi:cli/stdout@0.2.0-rc-2023-12-05; - export wasi:cli/stderr@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-input@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-output@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05; + import wasi:cli/stdin@0.2.0-rc-2024-01-16; + import wasi:cli/stdout@0.2.0-rc-2024-01-16; + import wasi:cli/stderr@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-input@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-output@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16; + export wasi:cli/stdin@0.2.0-rc-2024-01-16; + export wasi:cli/stdout@0.2.0-rc-2024-01-16; + export wasi:cli/stderr@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-input@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-output@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16; import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10; export wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10; import wasi:http/types@0.2.0-rc-2023-10-18; @@ -89,28 +89,28 @@ world virtual-fs { } world virtual-stdio { - import wasi:cli/stdin@0.2.0-rc-2023-12-05; - import wasi:cli/stdout@0.2.0-rc-2023-12-05; - import wasi:cli/stderr@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-input@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-output@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05; - export wasi:cli/stdin@0.2.0-rc-2023-12-05; - export wasi:cli/stdout@0.2.0-rc-2023-12-05; - export wasi:cli/stderr@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-input@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-output@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05; - export wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05; + import wasi:cli/stdin@0.2.0-rc-2024-01-16; + import wasi:cli/stdout@0.2.0-rc-2024-01-16; + import wasi:cli/stderr@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-input@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-output@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16; + export wasi:cli/stdin@0.2.0-rc-2024-01-16; + export wasi:cli/stdout@0.2.0-rc-2024-01-16; + export wasi:cli/stderr@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-input@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-output@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16; + export wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16; } // remaining subsystems world virtual-env { - import wasi:cli/environment@0.2.0-rc-2023-12-05; - export wasi:cli/environment@0.2.0-rc-2023-12-05; + import wasi:cli/environment@0.2.0-rc-2024-01-16; + export wasi:cli/environment@0.2.0-rc-2024-01-16; } world virtual-clocks { @@ -156,8 +156,8 @@ world virtual-http { } world virtual-exit { - import wasi:cli/exit@0.2.0-rc-2023-12-05; - export wasi:cli/exit@0.2.0-rc-2023-12-05; + import wasi:cli/exit@0.2.0-rc-2024-01-16; + export wasi:cli/exit@0.2.0-rc-2024-01-16; } world virt-test { @@ -176,17 +176,17 @@ world virt-test { import wasi:random/insecure-seed@0.2.0-rc-2023-11-10; import wasi:io/poll@0.2.0-rc-2023-11-10; import wasi:io/streams@0.2.0-rc-2023-11-10; - import wasi:cli/environment@0.2.0-rc-2023-12-05; + import wasi:cli/environment@0.2.0-rc-2024-01-16; import wasi:filesystem/preopens@0.2.0-rc-2023-11-10; - import wasi:cli/exit@0.2.0-rc-2023-12-05; - import wasi:cli/stdin@0.2.0-rc-2023-12-05; - import wasi:cli/stdout@0.2.0-rc-2023-12-05; - import wasi:cli/stderr@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-input@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-output@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05; - import wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05; + import wasi:cli/exit@0.2.0-rc-2024-01-16; + import wasi:cli/stdin@0.2.0-rc-2024-01-16; + import wasi:cli/stdout@0.2.0-rc-2024-01-16; + import wasi:cli/stderr@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-input@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-output@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdin@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stdout@0.2.0-rc-2024-01-16; + import wasi:cli/terminal-stderr@0.2.0-rc-2024-01-16; export test-get-env: func() -> list>; export test-file-read: func(path: string) -> string;