Merge with upstream (#92)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-tools"
-version = "1.208.1"
+version = "1.209.0"
 authors = ["The Wasmtime Project Developers"]
 edition.workspace = true
 description = "CLI tools for interoperating with WebAssembly files"
@@ -49,7 +49,7 @@ all = "allow"
 
 [workspace.package]
 edition = '2021'
-version = "0.208.1"
+version = "0.209.0"
 # Current policy for wasm-tools is the same as Wasmtime which is that this
 # number can be no larger than the current stable release of Rust minus 2.
 rust-version = "1.76.0"
@@ -81,19 +81,19 @@ bitflags = "2.5.0"
 hashbrown = { version = "0.14.3", default-features = false, features = ['ahash'] }
 ahash = { version = "0.8.11", default-features = false }
 
-wasm-compose = { version = "0.208.1", path = "crates/wasm-compose" }
-wasm-encoder = { version = "0.208.1", path = "crates/wasm-encoder" }
-wasm-metadata = { version = "0.208.1", path = "crates/wasm-metadata" }
-wasm-mutate = { version = "0.208.1", path = "crates/wasm-mutate" }
-wasm-shrink = { version = "0.208.1", path = "crates/wasm-shrink" }
-wasm-smith = { version = "0.208.1", path = "crates/wasm-smith" }
-wasmparser = { version = "0.208.1", path = "crates/wasmparser", default-features = false, features = ['std'] }
-wasmprinter = { version = "0.208.1", path = "crates/wasmprinter" }
-wast = { version = "208.0.1", path = "crates/wast" }
-wat = { version = "1.208.1", path = "crates/wat" }
-wit-component = { version = "0.208.1", path = "crates/wit-component" }
-wit-parser = { version = "0.208.1", path = "crates/wit-parser" }
-wit-smith = { version = "0.208.1", path = "crates/wit-smith" }
+wasm-compose = { version = "0.209.0", path = "crates/wasm-compose" }
+wasm-encoder = { version = "0.209.0", path = "crates/wasm-encoder" }
+wasm-metadata = { version = "0.209.0", path = "crates/wasm-metadata" }
+wasm-mutate = { version = "0.209.0", path = "crates/wasm-mutate" }
+wasm-shrink = { version = "0.209.0", path = "crates/wasm-shrink" }
+wasm-smith = { version = "0.209.0", path = "crates/wasm-smith" }
+wasmparser = { version = "0.209.0", path = "crates/wasmparser", default-features = false, features = ['std'] }
+wasmprinter = { version = "0.209.0", path = "crates/wasmprinter" }
+wast = { version = "209.0.0", path = "crates/wast" }
+wat = { version = "1.209.0", path = "crates/wat" }
+wit-component = { version = "0.209.0", path = "crates/wit-component" }
+wit-parser = { version = "0.209.0", path = "crates/wit-parser" }
+wit-smith = { version = "0.209.0", path = "crates/wit-smith" }
 
 [dependencies]
 anyhow = { workspace = true }

crates/wasmparser/src/validator/core.rs

@@ -923,12 +923,14 @@ impl Module {
                     offset,
                 ));
             }
-            if page_size_log2 > 16 {
+            // Currently 2**0 and 2**16 are the only valid page sizes, but this
+            // may be relaxed to allow any power of two in the future.
+            if page_size_log2 != 0 && page_size_log2 != 16 {
                 return Err(BinaryReaderError::new("invalid custom page size", offset));
             }
             let page_size = 1_u64 << page_size_log2;
             debug_assert!(page_size.is_power_of_two());
-            debug_assert!(page_size <= DEFAULT_WASM_PAGE_SIZE);
+            debug_assert!(page_size == DEFAULT_WASM_PAGE_SIZE || page_size == 1);
             (page_size, page_size_log2)
         } else {
             let page_size_log2 = 16;

crates/wasmprinter/src/lib.rs

@@ -956,7 +956,7 @@ impl Printer {
         if ty.is_final {
             self.result.push_str("final ");
         }
-        for idx in &ty.supertype_idx {
+        if let Some(idx) = ty.supertype_idx {
             self.print_idx(&state.core.type_names, idx.as_module_index().unwrap())?;
             self.result.push(' ');
         }