Merge remote-tracking branch 'origin/main' into decode-wasm-in-wit-pa…

…rser

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-tools"
-version = "1.0.58"
+version = "1.0.59"
 authors = ["The Wasmtime Project Developers"]
 edition.workspace = true
 description = "CLI tools for interoperating with WebAssembly files"
@@ -56,19 +56,19 @@ pretty_assertions = "1.3.0"
 semver = "1.0.0"
 smallvec = "1.11.1"
 
-wasm-compose = { version = "0.5.3", path = "crates/wasm-compose" }
-wasm-encoder = { version = "0.41.1", path = "crates/wasm-encoder" }
-wasm-metadata = { version = "0.10.18", path = "crates/wasm-metadata" }
-wasm-mutate = { version = "0.2.47", path = "crates/wasm-mutate" }
-wasm-shrink = { version = "0.1.48", path = "crates/wasm-shrink" }
-wasm-smith = { version = "0.15.2", path = "crates/wasm-smith" }
-wasmparser = { version = "0.121.1", path = "crates/wasmparser" }
-wasmprinter = { version = "0.2.79", path = "crates/wasmprinter" }
-wast = { version = "71.0.0", path = "crates/wast" }
-wat = { version = "1.0.86", path = "crates/wat" }
-wit-component = { version = "0.20.2", path = "crates/wit-component" }
+wasm-compose = { version = "0.5.4", path = "crates/wasm-compose" }
+wasm-encoder = { version = "0.41.2", path = "crates/wasm-encoder" }
+wasm-metadata = { version = "0.10.19", path = "crates/wasm-metadata" }
+wasm-mutate = { version = "0.2.48", path = "crates/wasm-mutate" }
+wasm-shrink = { version = "0.1.49", path = "crates/wasm-shrink" }
+wasm-smith = { version = "0.16.0", path = "crates/wasm-smith" }
+wasmparser = { version = "0.121.2", path = "crates/wasmparser" }
+wasmprinter = { version = "0.2.80", path = "crates/wasmprinter" }
+wast = { version = "71.0.1", path = "crates/wast" }
+wat = { version = "1.0.87", path = "crates/wat" }
+wit-component = { version = "0.20.3", path = "crates/wit-component" }
 wit-parser = { version = "0.13.2", path = "crates/wit-parser" }
-wit-smith = { version = "0.1.28", path = "crates/wit-smith" }
+wit-smith = { version = "0.1.29", path = "crates/wit-smith" }
 
 [dependencies]
 anyhow = { workspace = true }
@@ -112,7 +112,7 @@ rustc-demangle = { version = "0.1.21", optional = true }
 cpp_demangle = { version = "0.4.0", optional = true }
 
 # Dependencies of `component`
-wit-component = { workspace = true, optional = true, features = ['dummy-module', 'wat'] }
+wit-component = { workspace = true, optional = true, features = ['dummy-module', 'wat', 'semver-check'] }
 wit-parser = { workspace = true, optional = true, features = ['decoding', 'wat', 'serde'] }
 wast = { workspace = true, optional = true }
 

crates/wasm-compose/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-compose"
-version = "0.5.3"
+version = "0.5.4"
 edition.workspace = true
 authors = ["Peter Huene <[email protected]>"]
 license = "Apache-2.0 WITH LLVM-exception"

crates/wasm-encoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-encoder"
-version = "0.41.1"
+version = "0.41.2"
 authors = ["Nick Fitzgerald <[email protected]>"]
 edition.workspace = true
 license = "Apache-2.0 WITH LLVM-exception"

crates/wasm-metadata/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-metadata"
-version = "0.10.18"
+version = "0.10.19"
 edition.workspace = true
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-metadata"

crates/wasm-mutate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-mutate"
-version = "0.2.47"
+version = "0.2.48"
 edition.workspace = true
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-mutate"

crates/wasm-mutate/src/mutators/codemotion/ir.rs

@@ -185,22 +185,6 @@ pub trait AstWriter {
         Ok(())
     }
 
-    /// Default encoding for code node
-    ///
-    /// This function is called by the defaut implementation
-    /// of the `write_code` method
-    fn write_code_default<'a>(
-        &self,
-        ast: &Ast,
-        nodeidx: usize,
-        range: Range<usize>,
-        newfunc: &mut Function,
-        operators: &Vec<OperatorAndByteOffset>,
-        input_wasm: &'a [u8],
-    ) -> crate::Result<()> {
-        self.write_code(ast, nodeidx, range, newfunc, operators, input_wasm)
-    }
-
     /// Encoding discriminator for the Ast nodes
     ///
     /// It calls the corresponding methods depending on the node type