Fix CI

Author: daxpedda

crates/cli/tests/reference.rs

@@ -15,6 +15,7 @@ use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::Command;
+use walrus::ModuleConfig;
 
 fn main() -> Result<()> {
     let filter = env::args().nth(1);
@@ -93,7 +94,11 @@ fn runtest(test: &Path) -> Result<()> {
         .join("reference_test.wasm");
 
     let mut bindgen = Command::cargo_bin("wasm-bindgen")?;
-    bindgen.arg("--out-dir").arg(td.path()).arg(&wasm);
+    bindgen
+        .arg("--out-dir")
+        .arg(td.path())
+        .arg(&wasm)
+        .arg("--remove-producers-section");
     if contents.contains("// enable-externref") {
         bindgen.env("WASM_BINDGEN_EXTERNREF", "1");
     }
@@ -125,7 +130,9 @@ fn sanitize_wasm(wasm: &Path) -> Result<String> {
     // Clean up the wasm module by removing all function
     // implementations/instructions, data sections, etc. This'll help us largely
     // only deal with exports/imports which is all we're really interested in.
-    let mut module = walrus::Module::from_file(wasm)?;
+    let mut module = ModuleConfig::new()
+        .generate_producers_section(false)
+        .parse_file(wasm)?;
     for func in module.funcs.iter_mut() {
         let local = match &mut func.kind {
             walrus::FunctionKind::Local(l) => l,

crates/externref-xform/tests/all.rs

@@ -11,6 +11,7 @@ use rayon::prelude::*;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
+use walrus::ModuleConfig;
 use wast::parser::{Parse, Parser};
 
 fn main() {
@@ -19,7 +20,9 @@ fn main() {
 
 fn runtest(test: &Test) -> Result<String> {
     let wasm = wat::parse_file(&test.file)?;
-    let mut walrus = walrus::Module::from_buffer(&wasm)?;
+    let mut walrus = ModuleConfig::new()
+        .generate_producers_section(false)
+        .parse(&wasm)?;
     let mut cx = wasm_bindgen_externref_xform::Context::default();
     cx.prepare(&mut walrus)?;
     for directive in test.directives.iter() {

crates/multi-value-xform/tests/all.rs

@@ -11,6 +11,7 @@ use rayon::prelude::*;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
+use walrus::ModuleConfig;
 use wast::parser::{Parse, Parser};
 
 fn main() {
@@ -19,7 +20,9 @@ fn main() {
 
 fn runtest(test: &Test) -> Result<String> {
     let wasm = wat::parse_file(&test.file)?;
-    let mut walrus = walrus::Module::from_buffer(&wasm)?;
+    let mut walrus = ModuleConfig::new()
+        .generate_producers_section(false)
+        .parse(&wasm)?;
     let mut exports = Vec::new();
     let mut xforms = Vec::new();
     for directive in test.directives.iter() {

crates/threads-xform/tests/all.rs

@@ -11,14 +11,17 @@ use rayon::prelude::*;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
+use walrus::ModuleConfig;
 
 fn main() {
     run("tests".as_ref(), runtest);
 }
 
 fn runtest(test: &Test) -> Result<String> {
     let wasm = wat::parse_file(&test.file)?;
-    let mut module = walrus::Module::from_buffer(&wasm)?;
+    let mut module = ModuleConfig::new()
+        .generate_producers_section(false)
+        .parse(&wasm)?;
 
     let config = wasm_bindgen_threads_xform::Config::new();
 

crates/wasm-interpreter/tests/smoke.rs

@@ -1,8 +1,12 @@
+use walrus::ModuleConfig;
 use wasm_bindgen_wasm_interpreter::Interpreter;
 
 fn interpret(wat: &str, name: &str, result: Option<&[u32]>) {
     let wasm = wat::parse_str(wat).unwrap();
-    let module = walrus::Module::from_buffer(&wasm).unwrap();
+    let mut module = ModuleConfig::new()
+        .generate_producers_section(false)
+        .parse(&wasm)
+        .unwrap();
     let mut i = Interpreter::new(&module).unwrap();
     let id = module
         .exports

tests/wasm/bigint.js

@@ -40,14 +40,4 @@ exports.js_works = () => {
     assert.strictEqual(wasm.u64_rust_identity(BigInt('1') << BigInt('64')), BigInt('0'));
     assert.strictEqual(wasm.i128_min_jsvalue(), BigInt('-170141183460469231731687303715884105728'));
     assert.strictEqual(wasm.u128_max_jsvalue(), BigInt('340282366920938463463374607431768211455'));
-
-    assert.deepStrictEqual(wasm.u64_slice([]), new BigUint64Array());
-    assert.deepStrictEqual(wasm.i64_slice([]), new BigInt64Array());
-    const arr1 = new BigUint64Array([BigInt('1'), BigInt('2')]);
-    assert.deepStrictEqual(wasm.u64_slice([BigInt('1'), BigInt('2')]), arr1);
-    const arr2 = new BigInt64Array([BigInt('1'), BigInt('2')]);
-    assert.deepStrictEqual(wasm.i64_slice([BigInt('1'), BigInt('2')]), arr2);
-
-    assert.deepStrictEqual(wasm.i64_slice([i64_min]), new BigInt64Array([i64_min]));
-    assert.deepStrictEqual(wasm.u64_slice([u64_max]), new BigUint64Array([u64_max]));
 };

tests/wasm/bigint.rs

@@ -73,16 +73,6 @@ pub fn u128_max_jsvalue() -> JsValue {
     JsValue::from(u128::max_value())
 }
 
-#[wasm_bindgen]
-pub fn i64_slice(a: &[i64]) -> Vec<i64> {
-    a.to_vec()
-}
-
-#[wasm_bindgen]
-pub fn u64_slice(a: &[u64]) -> Vec<u64> {
-    a.to_vec()
-}
-
 #[wasm_bindgen_test]
 fn works() {
     js_works();