Update wasm-tools and Wasmtime dependencies (#1380)

* use workspace dependencies for wasm-tools and wasmtime dependencies

This will significantly simplify updating those commonly used dependencies in the future.

* bump wasm-tools depdendencies to v227

Author: Robbepop

Cargo.lock

@@ -28,6 +28,8 @@ categories = ["wasm", "no-std", "virtualization"]
 exclude = ["tests"]
 
 [workspace.dependencies]
+
+# Wasmi crates
 wasmi = { version = "0.41.0", path = "crates/wasmi", default-features = false }
 wasmi_wasi = { version = "0.41.0", path = "crates/wasi", default-features = false }
 wasmi_core = { version = "0.41.0", path = "crates/core", default-features = false }
@@ -38,6 +40,18 @@ wasmi_c_api_macros = { version = "0.41.0", path = "crates/c_api/macro" }
 wasmi_fuzz = { version = "0.41.0", path = "crates/fuzz" }
 wasmi_wast = { version = "0.41.0", path = "crates/wast" }
 
+# wasm-tools dependencies
+wat = { version = "1.227", default-features = false }
+wast = { version = "227.0.0", default-features = false }
+wasmparser = { version = "0.227.0", default-features = false }
+wasm-smith = "0.227.0"
+wasmprinter = { version = "0.227.0", default-features = false }
+
+# Wasmtime dependencies
+wasi-common = { version = "30.0.2", default-features = false }
+wiggle = { version = "30.0.2", default-features = false }
+wasmtime = { version = "30.0.2", default-features = false }
+
 [profile.bench]
 lto = "fat"
 codegen-units = 1

Cargo.toml

@@ -14,10 +14,10 @@ categories.workspace = true
 exclude.workspace = true
 
 [dependencies]
-anyhow = "1"
-clap = { version = "4", features = ["derive"] }
 wasmi = { workspace = true }
 wasmi_wasi = { workspace = true }
+anyhow = "1"
+clap = { version = "4", features = ["derive"] }
 
 [dev-dependencies]
 assert_cmd = "2.0.7"

crates/cli/Cargo.toml

@@ -16,16 +16,16 @@ publish = false
 
 [dependencies]
 wasmi = { workspace = true, features = ["std"] }
-wasmi-stack = { package = "wasmi", version = "0.31.2", optional = true }
-wasmtime = { version = "30.0.2", optional = true, default-features = false, features = [
+wasmtime = { workspace = true, optional = true, features = [
     "cranelift",
     "runtime",
     "std",
 ] }
-wasm-smith = "0.226.0"
+wasm-smith = { workspace = true }
+wasmprinter = { workspace = true }
+wasmi-stack = { package = "wasmi", version = "0.31.2", optional = true }
 arbitrary = "1.3.2"
 sha2 = "0.10"
-wasmprinter = { version = "0.226.0", default-features = false }
 anyhow = "1.0.91"
 
 [features]

crates/fuzz/Cargo.toml

@@ -14,8 +14,8 @@ categories.workspace = true
 exclude.workspace = true
 
 [dependencies]
-wasi-common = { version = "30.0.2", default-features = false, features = ["sync"]}
-wiggle = { version = "30.0.2", default-features = false }
+wasi-common = { workspace = true, features = ["sync"]}
+wiggle = { workspace = true }
 wasmi = { workspace = true, features = ["std"]}
 
 [dev-dependencies]

crates/wasi/Cargo.toml

@@ -19,10 +19,11 @@ exclude = [
 ]
 
 [dependencies]
-wasmparser = { version = "0.226.0", default-features = false, features = ["validate", "features"] }
 wasmi_core = { workspace = true }
 wasmi_collections = { workspace = true }
 wasmi_ir = { workspace = true }
+wasmparser = { workspace = true, features = ["validate", "features"] }
+wat = { workspace = true, optional = true }
 spin = { version = "0.9", default-features = false, features = [
     "mutex",
     "spin_mutex",
@@ -31,7 +32,6 @@ spin = { version = "0.9", default-features = false, features = [
 smallvec = { version = "1.13.1", features = ["union"] }
 multi-stash = { version = "0.2.0" }
 arrayvec = { version = "0.7.4", default-features = false }
-wat = { version = "1.226", default-features = false, optional = true }
 
 [dev-dependencies]
 assert_matches = "1.5"

crates/wasmi/Cargo.toml

@@ -15,5 +15,5 @@ exclude.workspace = true
 
 [dependencies]
 wasmi = { workspace = true, features = ["std"] }
-wast = { version = "226.0.0", default-features = false, features = ["wasm-module"] }
+wast = { workspace = true, features = ["wasm-module"] }
 anyhow = "1.0"

crates/wast/Cargo.toml

@@ -13,10 +13,10 @@ cargo-fuzz = true
 [dependencies]
 wasmi_fuzz = { workspace = true }
 wasmi = { workspace = true, features = ["std"] }
-wasm-smith = "0.226.0"
+wasm-smith = { workspace = true }
 libfuzzer-sys = "0.4.7"
 arbitrary = "1.3.2"
-wasmprinter = { version = "0.226.0", optional = true }
+wasmprinter = { workspace = true, optional = true }
 
 [features]
 default = []