From 3d781631b1eaeb97c780c9f336ca566f42ce7322 Mon Sep 17 00:00:00 2001
From: dAxpeDDa <daxpedda@gmail.com>
Date: Mon, 5 Jun 2023 13:35:08 +0200
Subject: [PATCH] Fix CI

---
 crates/cli/tests/reference.rs          | 11 +++++++++--
 crates/externref-xform/tests/all.rs    |  5 ++++-
 crates/multi-value-xform/tests/all.rs  |  5 ++++-
 crates/threads-xform/tests/all.rs      |  5 ++++-
 crates/wasm-interpreter/tests/smoke.rs |  6 +++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/crates/cli/tests/reference.rs b/crates/cli/tests/reference.rs
index 8046ee09614..272c711f083 100644
--- a/crates/cli/tests/reference.rs
+++ b/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,
diff --git a/crates/externref-xform/tests/all.rs b/crates/externref-xform/tests/all.rs
index 889e0132656..865d8212d25 100644
--- a/crates/externref-xform/tests/all.rs
+++ b/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() {
diff --git a/crates/multi-value-xform/tests/all.rs b/crates/multi-value-xform/tests/all.rs
index 30422ad6146..a72b244b9db 100644
--- a/crates/multi-value-xform/tests/all.rs
+++ b/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() {
diff --git a/crates/threads-xform/tests/all.rs b/crates/threads-xform/tests/all.rs
index 8cdb1ed2e55..789346f3446 100644
--- a/crates/threads-xform/tests/all.rs
+++ b/crates/threads-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;
 
 fn main() {
     run("tests".as_ref(), runtest);
@@ -18,7 +19,9 @@ fn main() {
 
 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();
 
diff --git a/crates/wasm-interpreter/tests/smoke.rs b/crates/wasm-interpreter/tests/smoke.rs
index c485d7b9199..611bf373e82 100644
--- a/crates/wasm-interpreter/tests/smoke.rs
+++ b/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