Merge pull request #308 from bytecodealliance/wasmtime-v18.0.0

chore: Update to wasmtime v18.0.3

Author: saulecabrera

Cargo.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wasmtime (17.0.2)
+    wasmtime (18.0.3)
       rb_sys (~> 0.9.86)
 
 GEM

Gemfile.lock

@@ -21,10 +21,9 @@ magnus = { version = "0.6", features = ["rb-sys"] }
 rb-sys = { version = "*", default-features = false, features = [
   "stable-api-compiled-fallback",
 ] }
-wasmtime = { version = "= 17.0.2" }
-wasmtime-wasi = "= 17.0.2"
-wasi-common = "= 17.0.2"
-wasi-cap-std-sync = "17.0.2"
+wasmtime = { version = "=18.0.3" }
+wasmtime-wasi = "=18.0.3"
+wasi-common = "=18.0.3"
 cap-std = "2.0.0"
 anyhow = "*" # Use whatever Wasmtime uses
 wat = "1.201.0"
@@ -38,9 +37,9 @@ async-timer = { version = "1.0.0-beta.11", features = [
   "tokio1",
 ], optional = true }
 static_assertions = "1.1.0"
-wasmtime-runtime = "17.0.2"
-wasmtime-environ = "= 17.0.2"
-deterministic-wasi-ctx = "=0.1.18"
+wasmtime-runtime = "=18.0.3"
+wasmtime-environ = "=18.0.3"
+deterministic-wasi-ctx = "=0.1.19"
 
 [build-dependencies]
 rb-sys-env = "0.1.2"

ext/Cargo.toml

@@ -69,7 +69,7 @@ unsafe impl MemoryCreator for TrackedMemoryCreator {
             shared: ty.is_shared(),
             memory64: ty.is_64(),
         };
-        let tunables = wasmtime_environ::Tunables::default();
+        let tunables = wasmtime_environ::Tunables::default_host();
         let plan = MemoryPlan::for_memory(memory, &tunables);
         let base = default_memory_creator
             .new_memory(&plan, minimum, maximum, None)

ext/src/ruby_api/config/tracked_memory_creator.rs

@@ -14,11 +14,11 @@ use magnus::{Class, RHash};
 use std::borrow::Borrow;
 use std::cell::UnsafeCell;
 use std::convert::TryFrom;
+use wasi_common::{I32Exit, WasiCtx as WasiCtxImpl};
 use wasmtime::{
     AsContext, AsContextMut, Store as StoreImpl, StoreContext, StoreContextMut, StoreLimits,
     StoreLimitsBuilder,
 };
-use wasmtime_wasi::{I32Exit, WasiCtx as WasiCtxImpl};
 
 define_rb_intern!(
     WASI_CTX => "wasi_ctx",

ext/src/ruby_api/store.rs

@@ -11,7 +11,7 @@ use magnus::{
 };
 use std::{borrow::Borrow, cell::RefCell, fs::File, path::PathBuf};
 use wasi_common::pipe::ReadPipe;
-use wasmtime_wasi::WasiCtx as WasiCtxImpl;
+use wasi_common::WasiCtx as WasiCtxImpl;
 
 /// @yard
 /// WASI context to be sent as {Store#new}’s +wasi_ctx+ keyword argument.

ext/src/ruby_api/wasi_ctx.rs

@@ -260,9 +260,9 @@ pub fn file_w(path: RString) -> Result<File, Error> {
         .map_err(|e| error!("Failed to write to file {}\n{}", path, e))
 }
 
-pub fn wasi_file(file: File) -> Box<wasi_cap_std_sync::file::File> {
+pub fn wasi_file(file: File) -> Box<wasmtime_wasi::file::File> {
     let file = cap_std::fs::File::from_std(file);
-    let file = wasi_cap_std_sync::file::File::from_cap_std(file);
+    let file = wasmtime_wasi::file::File::from_cap_std(file);
     Box::new(file)
 }
 

ext/src/ruby_api/wasi_ctx_builder.rs

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