Bump to 35.0.0 (#292)

Author: alexcrichton

VERSION

@@ -1 +1 @@
-34.0.0
+35.0.0

ci/download-wasmtime.py

@@ -12,7 +12,7 @@
 
 # set to "dev" to download the latest or pick a tag from
 # https://github.com/bytecodealliance/wasmtime/tags
-WASMTIME_VERSION = "v34.0.0"
+WASMTIME_VERSION = "v35.0.0"
 
 
 def main(platform, arch):

rust/Cargo.lock

@@ -12,7 +12,7 @@ heck = { version = "0.4", features = ["unicode"] }
 wit-parser = "0.230.0"
 wit-component = "0.230.0"
 indexmap = "2.0"
-wasmtime-environ = { version = "34.0.0", features = ['component-model', 'compile'] }
+wasmtime-environ = { version = "35.0.0", features = ['component-model', 'compile'] }
 wit-bindgen = "0.42.1"
 wit-bindgen-core = "0.42.1"
 

rust/Cargo.toml

@@ -35,10 +35,10 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::fmt::Write;
 use std::mem;
 use wasmtime_environ::component::{
-    CanonicalOptions, Component, ComponentTypes, ComponentTypesBuilder, CoreDef, CoreExport,
-    Export, ExportItem, GlobalInitializer, InstantiateModule, InterfaceType, LoweredIndex,
-    RuntimeImportIndex, RuntimeInstanceIndex, StaticModuleIndex, StringEncoding, Trampoline,
-    TrampolineIndex, Translator, TypeFuncIndex, TypeResourceTableIndex,
+    CanonicalOptions, CanonicalOptionsDataModel, Component, ComponentTypes, ComponentTypesBuilder,
+    CoreDef, CoreExport, Export, ExportItem, GlobalInitializer, InstantiateModule, InterfaceType,
+    LoweredIndex, RuntimeImportIndex, RuntimeInstanceIndex, StaticModuleIndex, StringEncoding,
+    Trampoline, TrampolineIndex, Translator, TypeFuncIndex, TypeResourceTableIndex,
 };
 use wasmtime_environ::prelude::*;
 use wasmtime_environ::{EntityIndex, ModuleTranslation, PrimaryMap, ScopeVec, Tunables};
@@ -228,25 +228,28 @@ impl WasmtimePy {
                 Trampoline::StreamWrite { .. } => unimplemented!(),
                 Trampoline::StreamCancelRead { .. } => unimplemented!(),
                 Trampoline::StreamCancelWrite { .. } => unimplemented!(),
-                Trampoline::StreamCloseReadable { .. } => unimplemented!(),
-                Trampoline::StreamCloseWritable { .. } => unimplemented!(),
+                Trampoline::StreamDropReadable { .. } => unimplemented!(),
+                Trampoline::StreamDropWritable { .. } => unimplemented!(),
                 Trampoline::FutureNew { .. } => unimplemented!(),
                 Trampoline::FutureRead { .. } => unimplemented!(),
                 Trampoline::FutureWrite { .. } => unimplemented!(),
                 Trampoline::FutureCancelRead { .. } => unimplemented!(),
                 Trampoline::FutureCancelWrite { .. } => unimplemented!(),
-                Trampoline::FutureCloseReadable { .. } => unimplemented!(),
-                Trampoline::FutureCloseWritable { .. } => unimplemented!(),
+                Trampoline::FutureDropReadable { .. } => unimplemented!(),
+                Trampoline::FutureDropWritable { .. } => unimplemented!(),
                 Trampoline::ErrorContextNew { .. } => unimplemented!(),
                 Trampoline::ErrorContextDebugMessage { .. } => unimplemented!(),
                 Trampoline::ErrorContextDrop { .. } => unimplemented!(),
-                Trampoline::AsyncEnterCall => unimplemented!(),
-                Trampoline::AsyncExitCall { .. } => unimplemented!(),
                 Trampoline::FutureTransfer => unimplemented!(),
                 Trampoline::StreamTransfer => unimplemented!(),
                 Trampoline::ErrorContextTransfer => unimplemented!(),
-                Trampoline::SyncEnterCall => unimplemented!(),
-                Trampoline::SyncExitCall { .. } => unimplemented!(),
+                Trampoline::TaskCancel { .. } => unimplemented!(),
+                Trampoline::SubtaskCancel { .. } => unimplemented!(),
+                Trampoline::PrepareCall { .. } => unimplemented!(),
+                Trampoline::SyncStartCall { .. } => unimplemented!(),
+                Trampoline::AsyncStartCall { .. } => unimplemented!(),
+                Trampoline::ContextGet(_) => unimplemented!(),
+                Trampoline::ContextSet(_) => unimplemented!(),
             }
         }
 
@@ -892,11 +895,15 @@ impl<'a> Instantiator<'a> {
         // can be plumbed through to string lifting/lowering below.
         assert_eq!(opts.string_encoding, StringEncoding::Utf8);
 
-        let memory = match opts.memory {
+        let model = match opts.data_model {
+            CanonicalOptionsDataModel::LinearMemory(opts) => opts,
+            CanonicalOptionsDataModel::Gc { .. } => todo!(),
+        };
+        let memory = match model.memory {
             Some(idx) => Some(format!("{this}._core_memory{}", idx.as_u32())),
             None => None,
         };
-        let realloc = match opts.realloc {
+        let realloc = match model.realloc {
             Some(idx) => Some(format!("{this}._realloc{}", idx.as_u32())),
             None => None,
         };

rust/src/bindgen.rs

@@ -2148,6 +2148,12 @@ def wasmtime_config_wasm_memory64_set(arg0: Any, arg1: Any) -> None:
 def wasmtime_config_wasm_wide_arithmetic_set(arg0: Any, arg1: Any) -> None:
     return _wasmtime_config_wasm_wide_arithmetic_set(arg0, arg1)  # type: ignore
 
+_wasmtime_config_wasm_stack_switching_set = dll.wasmtime_config_wasm_stack_switching_set
+_wasmtime_config_wasm_stack_switching_set.restype = None
+_wasmtime_config_wasm_stack_switching_set.argtypes = [POINTER(wasm_config_t), c_bool]
+def wasmtime_config_wasm_stack_switching_set(arg0: Any, arg1: Any) -> None:
+    return _wasmtime_config_wasm_stack_switching_set(arg0, arg1)  # type: ignore
+
 _wasmtime_config_strategy_set = dll.wasmtime_config_strategy_set
 _wasmtime_config_strategy_set.restype = None
 _wasmtime_config_strategy_set.argtypes = [POINTER(wasm_config_t), wasmtime_strategy_t]
@@ -2571,6 +2577,45 @@ def wasmtime_sharedmemory_size(memory: Any) -> int:
 def wasmtime_sharedmemory_grow(memory: Any, delta: Any, prev_size: Any) -> ctypes._Pointer:
     return _wasmtime_sharedmemory_grow(memory, delta, prev_size)  # type: ignore
 
+class wasmtime_wasip2_config_t(Structure):
+    pass
+
+_wasmtime_wasip2_config_new = dll.wasmtime_wasip2_config_new
+_wasmtime_wasip2_config_new.restype = POINTER(wasmtime_wasip2_config_t)
+_wasmtime_wasip2_config_new.argtypes = []
+def wasmtime_wasip2_config_new() -> ctypes._Pointer:
+    return _wasmtime_wasip2_config_new()  # type: ignore
+
+_wasmtime_wasip2_config_inherit_stdin = dll.wasmtime_wasip2_config_inherit_stdin
+_wasmtime_wasip2_config_inherit_stdin.restype = None
+_wasmtime_wasip2_config_inherit_stdin.argtypes = [POINTER(wasmtime_wasip2_config_t)]
+def wasmtime_wasip2_config_inherit_stdin(config: Any) -> None:
+    return _wasmtime_wasip2_config_inherit_stdin(config)  # type: ignore
+
+_wasmtime_wasip2_config_inherit_stdout = dll.wasmtime_wasip2_config_inherit_stdout
+_wasmtime_wasip2_config_inherit_stdout.restype = None
+_wasmtime_wasip2_config_inherit_stdout.argtypes = [POINTER(wasmtime_wasip2_config_t)]
+def wasmtime_wasip2_config_inherit_stdout(config: Any) -> None:
+    return _wasmtime_wasip2_config_inherit_stdout(config)  # type: ignore
+
+_wasmtime_wasip2_config_inherit_stderr = dll.wasmtime_wasip2_config_inherit_stderr
+_wasmtime_wasip2_config_inherit_stderr.restype = None
+_wasmtime_wasip2_config_inherit_stderr.argtypes = [POINTER(wasmtime_wasip2_config_t)]
+def wasmtime_wasip2_config_inherit_stderr(config: Any) -> None:
+    return _wasmtime_wasip2_config_inherit_stderr(config)  # type: ignore
+
+_wasmtime_wasip2_config_arg = dll.wasmtime_wasip2_config_arg
+_wasmtime_wasip2_config_arg.restype = None
+_wasmtime_wasip2_config_arg.argtypes = [POINTER(wasmtime_wasip2_config_t), POINTER(c_char), c_size_t]
+def wasmtime_wasip2_config_arg(config: Any, arg: Any, arg_len: Any) -> None:
+    return _wasmtime_wasip2_config_arg(config, arg, arg_len)  # type: ignore
+
+_wasmtime_wasip2_config_delete = dll.wasmtime_wasip2_config_delete
+_wasmtime_wasip2_config_delete.restype = None
+_wasmtime_wasip2_config_delete.argtypes = [POINTER(wasmtime_wasip2_config_t)]
+def wasmtime_wasip2_config_delete(config: Any) -> None:
+    return _wasmtime_wasip2_config_delete(config)  # type: ignore
+
 class wasmtime_store(Structure):
     pass
 
@@ -2641,6 +2686,12 @@ def wasmtime_context_get_fuel(context: Any, fuel: Any) -> ctypes._Pointer:
 def wasmtime_context_set_wasi(context: Any, wasi: Any) -> ctypes._Pointer:
     return _wasmtime_context_set_wasi(context, wasi)  # type: ignore
 
+_wasmtime_context_set_wasip2 = dll.wasmtime_context_set_wasip2
+_wasmtime_context_set_wasip2.restype = None
+_wasmtime_context_set_wasip2.argtypes = [POINTER(wasmtime_context_t), POINTER(wasmtime_wasip2_config_t)]
+def wasmtime_context_set_wasip2(context: Any, config: Any) -> None:
+    return _wasmtime_context_set_wasip2(context, config)  # type: ignore
+
 _wasmtime_context_set_epoch_deadline = dll.wasmtime_context_set_epoch_deadline
 _wasmtime_context_set_epoch_deadline.restype = None
 _wasmtime_context_set_epoch_deadline.argtypes = [POINTER(wasmtime_context_t), c_uint64]
@@ -3881,6 +3932,12 @@ def wasmtime_component_linker_instance_add_module(linker_instance: Any, name: An
 def wasmtime_component_linker_instance_add_func(linker_instance: Any, name: Any, name_len: Any, callback: Any, data: Any, finalizer: Any) -> ctypes._Pointer:
     return _wasmtime_component_linker_instance_add_func(linker_instance, name, name_len, callback, data, finalizer)  # type: ignore
 
+_wasmtime_component_linker_add_wasip2 = dll.wasmtime_component_linker_add_wasip2
+_wasmtime_component_linker_add_wasip2.restype = POINTER(wasmtime_error_t)
+_wasmtime_component_linker_add_wasip2.argtypes = [POINTER(wasmtime_component_linker_t)]
+def wasmtime_component_linker_add_wasip2(linker: Any) -> ctypes._Pointer:
+    return _wasmtime_component_linker_add_wasip2(linker)  # type: ignore
+
 _wasmtime_component_linker_instance_delete = dll.wasmtime_component_linker_instance_delete
 _wasmtime_component_linker_instance_delete.restype = None
 _wasmtime_component_linker_instance_delete.argtypes = [POINTER(wasmtime_component_linker_instance_t)]