deps: wasmprinter update

Cargo.toml

@@ -29,7 +29,7 @@ leb128 = "0.2.4"
 log = "0.4.8"
 rayon = { version = "1.1.0", optional = true }
 walrus-macro = { path = './crates/macro', version = '=0.19.0' }
-wasm-encoder = "0.29.0"
+wasm-encoder = "0.41.0"
 wasmparser = "0.80.2"
 gimli = "0.26.0"
 

crates/fuzz-utils/Cargo.toml

@@ -10,7 +10,7 @@ anyhow = "1.0"
 env_logger = "0.8.1"
 rand = { version = "0.7.0", features = ['small_rng'] }
 tempfile = "3.1.0"
-wasmparser = "0.67"
+wasmparser = "0.80.2"
 wat = "1.0"
 
 [dependencies.walrus]

crates/tests/Cargo.toml

@@ -16,8 +16,8 @@ serde_json = { version = "1.0.40", features = ['preserve_order'] }
 tempfile = "3.1.0"
 walrus = { path = "../.." }
 walrus-tests-utils = { path = "../tests-utils" }
-wasmprinter = "=0.2.59"
-wat = "1.0.36"
+wasmprinter = "=0.2.78"
+wat = "1.0.85"
 
 [features]
 parallel = ['walrus/parallel']

crates/tests/tests/round_trip/elem-segments-1.wat

@@ -1,5 +1,5 @@
 (module
-  (table 1 anyfunc)
+  (table 1 funcref)
   (func)
   (elem (i32.const 1) 0)
   (export "foo" (table 0))

crates/tests/tests/round_trip/elem-segments-2.wat

@@ -1,5 +1,5 @@
 (module
-  (table 1 anyfunc)
+  (table 1 funcref)
   (func)
   (elem (i32.const 1) 0)
   (elem (i32.const 2) 0)

crates/tests/tests/round_trip/elem-segments-3.wat

@@ -1,5 +1,5 @@
 (module
-  (table 1 anyfunc)
+  (table 1 funcref)
   (func)
   (elem (i32.const 1) 0)
   (elem (i32.const 3) 0)

crates/tests/tests/round_trip/gc_keep_used_tables.wat

@@ -2,7 +2,7 @@
 
 (module
   (type (;0;) (func (result i32)))
-  (table 1 1 anyfunc)
+  (table 1 1 funcref)
   (export "t" (table 0)))
 
 (; CHECK-ALL:

crates/tests/tests/round_trip/gc_unused_tables.wat

@@ -2,7 +2,7 @@
 
 (module
   (type (;0;) (func (result i32)))
-  (table 1 1 anyfunc)
+  (table 1 1 funcref)
   (func $f (type 0) (result i32)
     i32.const 42)
   (export "f" (func $f)))

crates/tests/tests/round_trip/import-gc.wat

@@ -1,7 +1,7 @@
 (module
   (type (func))
   (import "" "a" (func (type 0)))
-  (import "" "b" (table 1 anyfunc))
+  (import "" "b" (table 1 funcref))
   (import "" "c" (global i32))
   (import "" "d" (memory 1))
   )

crates/tests/tests/round_trip/import-table.wat

@@ -1,5 +1,5 @@
 (module
-  (import "" "" (table 1 anyfunc))
+  (import "" "" (table 1 funcref))
   (export "b" (table 0))
   )
 

crates/tests/tests/round_trip/keep-elem-segments.wat

@@ -1,7 +1,7 @@
 (module
   (type (func))
 
-  (table anyfunc (elem 1))
+  (table funcref (elem 1))
 
   (func
     i32.const 0

crates/tests/tests/round_trip/table-init.wast

@@ -1,6 +1,6 @@
 (module
   (import "x" "y" (global i32))
-  (table 1 anyfunc)
+  (table 1 funcref)
   (func)
   (elem (global.get 0) 0)
   (export "x" (table 0)))

crates/tests/tests/valid/const.wat

@@ -2,5 +2,5 @@
   (type (;0;) (func (result i32)))
   (func $inc (type 0) (result i32)
     i32.const 42)
-  (table (;0;) 1 1 anyfunc)
+  (table (;0;) 1 1 funcref)
   (memory (;0;) 16))

crates/tests/tests/valid/inc.wat

@@ -4,5 +4,5 @@
     local.get 0
     i32.const 1
     i32.add)
-  (table (;0;) 1 1 anyfunc)
+  (table (;0;) 1 1 funcref)
   (memory (;0;) 16))

src/error.rs

@@ -1,6 +1,5 @@
 //! Error types and utilities.
 
-pub use anyhow::Error;
 use std::fmt;
 
 /// Either `Ok(T)` or `Err(failure::Error)`.

src/module/custom.rs

@@ -36,9 +36,7 @@ pub trait CustomSection: WalrusAny + Debug + Send + Sync {
     /// array provided.
     ///
     /// The default provided method does nothing.
-    fn add_gc_roots(&self, roots: &mut Roots) {
-        drop(roots);
-    }
+    fn add_gc_roots(&self, _roots: &mut Roots) {}
 
     /// Apply the given code transformations to this custom section.
     ///

src/module/elements.rs

@@ -185,7 +185,10 @@ impl Emit for ModuleElements {
                         None => wasm_encoder::ConstExpr::ref_null(wasm_encoder::HeapType::Func),
                     })
                     .collect();
-                let els = wasm_encoder::Elements::Expressions(els_vec.as_slice());
+                let els = wasm_encoder::Elements::Expressions(
+                    wasm_encoder::RefType::FUNCREF,
+                    els_vec.as_slice(),
+                );
                 emit_elem(cx, &mut wasm_element_section, &element.kind, els);
             } else {
                 let els_vec: Vec<u32> = element
@@ -212,15 +215,14 @@ impl Emit for ModuleElements {
                         wasm_element_section.active(
                             table_index,
                             &offset.to_wasmencoder_type(&cx),
-                            wasm_encoder::RefType::FUNCREF,
                             els,
                         );
                     }
                     ElementKind::Passive => {
-                        wasm_element_section.passive(wasm_encoder::RefType::FUNCREF, els);
+                        wasm_element_section.passive(els);
                     }
                     ElementKind::Declared => {
-                        wasm_element_section.declared(wasm_encoder::RefType::FUNCREF, els);
+                        wasm_element_section.declared(els);
                     }
                 }
             }

src/module/exports.rs

@@ -1,6 +1,6 @@
 //! Exported items in a wasm module.
 
-use anyhow::{bail, Context};
+use anyhow::Context;
 
 use crate::emit::{Emit, EmitContext};
 use crate::parse::IndicesToIds;