Merge pull request #218 from bytecodealliance/update-wasmtime10

chore: Update to wasmtime@10

Author: saulecabrera

Cargo.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wasmtime (9.0.4)
+    wasmtime (10.0.0)
       rb_sys (~> 0.9.81)
 
 GEM

Gemfile.lock

@@ -10,5 +10,5 @@ doctest = false
 wasmtime-rb = { path = "../../ext", features = ["ruby-api"] }
 
 [dev-dependencies]
-magnus = { version = "0.5.3", features = ["embed"] } # Only need embed feature for tests
+magnus = { version = "0.5.5", features = ["embed"] } # Only need embed feature for tests
 wasmtime-rb = { path = "../../ext", features = ["embed"] } # Only need embed feature for tests

examples/rust-crate/Cargo.toml

@@ -20,10 +20,10 @@ magnus = { version = "0.5.5", features = ["rb-sys-interop"] }
 rb-sys = { version = "*", default-features = false, features = [
   "stable-api-compiled-fallback",
 ] }
-wasmtime = { version = "= 9.0.4" }
-wasmtime-wasi = "= 9.0.4"
-wasi-common = "= 9.0.4"
-wasi-cap-std-sync = "= 9.0.4"
+wasmtime = { version = "= 10.0.0" }
+wasmtime-wasi = "= 10.0.0"
+wasi-common = "= 10.0.0"
+wasi-cap-std-sync = "= 10.0.0"
 cap-std = "1.0.5"
 anyhow = "*" # Use whatever Wasmtime uses
 wat = "1.0.69"
@@ -37,8 +37,8 @@ async-timer = { version = "1.0.0-beta.8", features = [
   "tokio1",
 ], optional = true }
 static_assertions = "1.1.0"
-wasmtime-runtime = "= 9.0.4"
-wasmtime-environ = "= 9.0.4"
+wasmtime-runtime = "= 10.0.0"
+wasmtime-environ = "= 10.0.0"
 
 [build-dependencies]
 rb-sys-env = "0.1.2"

ext/Cargo.toml

@@ -33,7 +33,7 @@ fn bundle_ruby_file(filename: &str) -> Result<(), Box<dyn Error>> {
         contents
     };
 
-    let template = r###"
+    let template = r##"
 // This file is generated by build.rs
 
 use magnus::eval;
@@ -48,7 +48,7 @@ __FILE_CONTENTS__
     Ok(())
 }
 
-"###;
+"##;
 
     let contents = template.replace("__FILE_CONTENTS__", &contents);
 

ext/build.rs

@@ -55,7 +55,7 @@ impl<'a> Global<'a> {
         mutability: Mutability,
     ) -> Result<Self, Error> {
         let wasm_type = value_type.to_val_type()?;
-        let wasm_default = default.to_wasm_val(wasm_type)?;
+        let wasm_default = default.to_wasm_val(wasm_type.clone())?;
         let store = s.get();
         let inner = GlobalImpl::new(
             store.context_mut(),
@@ -96,7 +96,7 @@ impl<'a> Global<'a> {
     /// @def type
     /// @return [Symbol] The Wasm type of the global‘s content.
     pub fn type_(&self) -> Result<Symbol, Error> {
-        self.ty().map(|ty| ty.content().to_sym())
+        self.ty().map(|ty| ty.content().clone().to_sym())
     }
 
     /// @yard
@@ -130,7 +130,7 @@ impl<'a> Global<'a> {
     }
 
     fn value_type(&self) -> Result<wasmtime::ValType, Error> {
-        self.ty().map(|ty| *ty.content())
+        self.ty().map(|ty| ty.content().clone())
     }
 
     fn retain_non_nil_extern_ref(&self, value: Value) -> Result<(), Error> {

ext/src/ruby_api/global.rs

@@ -124,9 +124,13 @@ impl<'a> UnsafeSlice<'a> {
         _flags: i32,
     ) -> bool {
         let obj = unsafe { Value::from_raw(value) };
-        let Ok(memory) = <Obj<UnsafeSlice>>::try_convert(obj) else { return false };
+        let Ok(memory) = <Obj<UnsafeSlice>>::try_convert(obj) else {
+            return false;
+        };
         let memory = memory.get();
-        let Ok(raw_slice) = memory.get_raw_slice() else { return false; };
+        let Ok(raw_slice) = memory.get_raw_slice() else {
+            return false;
+        };
         let (ptr, size) = (raw_slice.as_ptr(), raw_slice.len());
 
         unsafe { rb_memory_view_init_as_byte_array(view, value, ptr as _, size as _, true) }
@@ -135,7 +139,9 @@ impl<'a> UnsafeSlice<'a> {
     #[cfg(ruby_gte_3_0)]
     extern "C" fn is_memory_view_available(value: VALUE) -> bool {
         let obj = unsafe { Value::from_raw(value) };
-        let Ok(memory) = <Obj<UnsafeSlice>>::try_convert(obj) else { return false };
+        let Ok(memory) = <Obj<UnsafeSlice>>::try_convert(obj) else {
+            return false;
+        };
         let memory = memory.get();
 
         memory.get_raw_slice().is_ok()

ext/src/ruby_api/memory/unsafe_slice.rs

@@ -3,7 +3,7 @@ use magnus::{exception::arg_error, Error, ExceptionClass, Value};
 use static_assertions::assert_eq_size;
 use wasmtime::{FuncType, ValType};
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Clone)]
 #[repr(C)]
 struct Param {
     val: Value,
@@ -19,17 +19,19 @@ impl Param {
         Self { index, ty, val }
     }
 
-    fn to_wasmtime_val(self) -> Result<wasmtime::Val, Error> {
-        self.val.to_wasm_val(self.ty).map_err(|error| match error {
-            Error::Error(class, msg) => {
-                Error::new(class, format!("{} (param at index {})", msg, self.index))
-            }
-            Error::Exception(exception) => Error::new(
-                ExceptionClass::from_value(exception.class().into()).unwrap_or_else(arg_error),
-                format!("{} (param at index {})", exception, self.index),
-            ),
-            _ => error,
-        })
+    fn to_wasmtime_val(&self) -> Result<wasmtime::Val, Error> {
+        self.val
+            .to_wasm_val(self.ty.clone())
+            .map_err(|error| match error {
+                Error::Error(class, msg) => {
+                    Error::new(class, format!("{} (param at index {})", msg, self.index))
+                }
+                Error::Exception(exception) => Error::new(
+                    ExceptionClass::from_value(exception.class().into()).unwrap_or_else(arg_error),
+                    format!("{} (param at index {})", exception, self.index),
+                ),
+                _ => error,
+            })
     }
 }
 

ext/src/ruby_api/params.rs

@@ -52,7 +52,7 @@ impl<'a> Table<'a> {
         let (max,) = kw.optional;
         let store = s.get();
         let wasm_type = value_type.to_val_type()?;
-        let wasm_default = default.to_wasm_val(wasm_type)?;
+        let wasm_default = default.to_wasm_val(wasm_type.clone())?;
 
         let inner = TableImpl::new(
             store.context_mut(),

ext/src/ruby_api/table.rs

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wasmtime
-  VERSION = "9.0.4"
+  VERSION = "10.0.0"
 end