Update wasmtime and h2 (#633)

veracruz-project · Jun 25, 2023 · 81f9d9f · 81f9d9f
2 parents 870db97 + ca03ffb
commit 81f9d9f
Show file tree

Hide file tree

Showing 12 changed files with 1,586 additions and 628 deletions.
diff --git a/execution-engine/Cargo.toml b/execution-engine/Cargo.toml
@@ -49,7 +49,7 @@ strum_macros = "0.24"
 typetag = "=0.1.6"
 wasi-types = { path = "../third-party/wasi-types" }
 wasmi = { path = "../third-party/wasmi" }
-wasmtime = { version = "3.0.1", optional = true }
+wasmtime = { version = "9.0.1", optional = true }
 
 [lib]
 name = "execution_engine"

diff --git a/execution-engine/src/engines/wasmtime.rs b/execution-engine/src/engines/wasmtime.rs
@@ -491,10 +491,10 @@ impl WasmtimeRuntimeState {
 
         let return_from_main = match check_main(&export.ty(&store)) {
             EntrySignature::ArgvAndArgc => instance
-                .get_typed_func::<(i32, i32), (), _>(&mut store, WasiWrapper::ENTRY_POINT_NAME)?
+                .get_typed_func::<(i32, i32), ()>(&mut store, WasiWrapper::ENTRY_POINT_NAME)?
                 .call(&mut store, (0, 0)),
             EntrySignature::NoParameters => instance
-                .get_typed_func::<(), (), _>(&mut store, WasiWrapper::ENTRY_POINT_NAME)?
+                .get_typed_func::<(), ()>(&mut store, WasiWrapper::ENTRY_POINT_NAME)?
                 .call(&mut store, ()),
             EntrySignature::NoEntryFound => {
                 return Err(anyhow!(FatalEngineError::NoProgramEntryPoint))

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.65.0
+1.66.0
diff --git a/workspaces/applications/Cargo.lock b/workspaces/applications/Cargo.lock
diff --git a/workspaces/applications/rust-toolchain.toml b/workspaces/applications/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.65.0"
+channel = "1.66.0"
 components = [ "rustfmt" ]
 targets = [ "wasm32-wasi" ]