chore: update deps & testsuite, add msrv

explodingcamera · explodingcamera · commit ba1f2638d297 · 2024-06-25T13:08:24.000+02:00
Signed-off-by: Henry Gressmann &lt;mail@henrygressmann.de&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ inherits="release"
 
 [workspace.package]
 version="0.7.0"
+rust-version="1.79"
 edition="2021"
 license="MIT OR Apache-2.0"
 authors=["Henry Gressmann <mail@henrygressmann.de>"]
@@ -20,7 +21,8 @@ repository="https://github.com/explodingcamera/tinywasm"
 [package]
 name="tinywasm-root"
 publish=false
-edition="2021"
+edition.workspace=true
+rust-version.workspace=true
 
 [[example]]
 name="wasm-rust"
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -2,12 +2,13 @@
 name="benchmarks"
 publish=false
 edition.workspace=true
+rust-version.workspace=true
 
 [dependencies]
 criterion={version="0.5"}
 tinywasm={path="../crates/tinywasm"}
 wat={version="1"}
-wasmi={version="0.32", features=["std"]}
+wasmi={version="0.33", features=["std"]}
 wasmer={version="4.3", features=["cranelift", "singlepass"]}
 argon2={version="0.5"}
 
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -6,6 +6,7 @@ edition.workspace=true
 license.workspace=true
 authors.workspace=true
 repository.workspace=true
+rust-version.workspace=true
 
 [[bin]]
 name="tinywasm-cli"
@@ -19,7 +20,7 @@ argh="0.1"
 color-eyre={version="0.6", default-features=false}
 log="0.4"
 pretty_env_logger="0.5"
-wast={version="210.0", optional=true}
+wast={version="211.0", optional=true}
 
 [features]
 default=["wat"]
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
@@ -6,9 +6,10 @@ edition.workspace=true
 license.workspace=true
 authors.workspace=true
 repository.workspace=true
+rust-version.workspace=true
 
 [dependencies]
-wasmparser={version="0.210", default-features=false, features=["validate"]}
+wasmparser={version="0.211", default-features=false, features=["validate"]}
 log={version="0.4", optional=true}
 tinywasm-types={version="0.7.0", path="../types", default-features=false}
 
diff --git a/crates/parser/src/conversion.rs b/crates/parser/src/conversion.rs
@@ -256,8 +256,10 @@ pub(crate) fn process_const_operators(ops: OperatorsReader<'_>) -> Result<ConstI
 
 pub(crate) fn convert_heaptype(heap: wasmparser::HeapType) -> ValType {
     match heap {
-        wasmparser::HeapType::Func => ValType::RefFunc,
-        wasmparser::HeapType::Extern => ValType::RefExtern,
+        wasmparser::HeapType::Abstract { shared: false, ty: wasmparser::AbstractHeapType::Func } => ValType::RefFunc,
+        wasmparser::HeapType::Abstract { shared: false, ty: wasmparser::AbstractHeapType::Extern } => {
+            ValType::RefExtern
+        }
         _ => unimplemented!("Unsupported heap type: {:?}", heap),
     }
 }
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
@@ -6,6 +6,7 @@ edition.workspace=true
 license.workspace=true
 authors.workspace=true
 repository.workspace=true
+rust-version.workspace=true
 readme="../../README.md"
 
 [lib]
@@ -20,7 +21,7 @@ libm={version="0.2", default-features=false}
 
 [dev-dependencies]
 wasm-testsuite={path="../wasm-testsuite"}
-wast={version="209.0"}
+wast={version="211.0"}
 owo-colors={version="4.0"}
 eyre={version="0.6"}
 serde_json={version="1.0"}
diff --git a/crates/tinywasm/src/instance.rs b/crates/tinywasm/src/instance.rs
@@ -2,7 +2,7 @@ use alloc::{boxed::Box, format, rc::Rc, string::ToString};
 use tinywasm_types::*;
 
 use crate::func::{FromWasmValueTuple, IntoWasmValueTuple};
-use crate::{Error, FuncHandle, FuncHandleTyped, GlobalRef, Imports, MemoryRef, MemoryRefMut, Module, Result, Store};
+use crate::{Error, FuncHandle, FuncHandleTyped, Imports, MemoryRef, MemoryRefMut, Module, Result, Store};
 
 /// An instanciated WebAssembly module
 ///
diff --git a/crates/tinywasm/src/store/table.rs b/crates/tinywasm/src/store/table.rs
@@ -213,17 +213,17 @@ mod tests {
 
         match table_instance.get_wasm_val(0) {
             Ok(WasmValue::RefFunc(_)) => {}
-            _ => assert!(false, "get_wasm_val failed to return the correct WasmValue"),
+            _ => panic!("get_wasm_val failed to return the correct WasmValue"),
         }
 
         match table_instance.get_wasm_val(1) {
             Ok(WasmValue::RefNull(ValType::RefFunc)) => {}
-            _ => assert!(false, "get_wasm_val failed to return the correct WasmValue"),
+            _ => panic!("get_wasm_val failed to return the correct WasmValue"),
         }
 
         match table_instance.get_wasm_val(999) {
             Err(Error::Trap(Trap::TableOutOfBounds { .. })) => {}
-            _ => assert!(false, "get_wasm_val failed to handle undefined element correctly"),
+            _ => panic!("get_wasm_val failed to handle undefined element correctly"),
         }
     }
 
diff --git a/crates/tinywasm/tests/generated/2.0.csv b/crates/tinywasm/tests/generated/2.0.csv
diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
diff --git a/crates/tinywasm/tests/testsuite/run.rs b/crates/tinywasm/tests/testsuite/run.rs
@@ -216,7 +216,7 @@ impl TestSuite {
                     test_group.add_result(&format!("Wat({})", i), span.linecol_in(wast), result.map(|_| ()));
                 }
 
-                AssertMalformed { span, mut module, message: _ } => {
+                AssertMalformed { span, mut module, message } => {
                     let Ok(module) = module.encode() else {
                         test_group.add_result(&format!("AssertMalformed({})", i), span.linecol_in(wast), Ok(()));
                         continue;
@@ -230,7 +230,15 @@ impl TestSuite {
                         &format!("AssertMalformed({})", i),
                         span.linecol_in(wast),
                         match res {
-                            Ok(_) => Err(eyre!("expected module to be malformed")),
+                            Ok(_) => {
+                                // // skip "zero byte expected" as the magic number is not checked by wasmparser
+                                // (Don't need to error on this, doesn't matter if it's malformed)
+                                if message == "zero byte expected" {
+                                    continue;
+                                }
+
+                                Err(eyre!("expected module to be malformed"))
+                            }
                             Err(_) => Ok(()),
                         },
                     );
diff --git a/crates/tinywasm/tests/testsuite/util.rs b/crates/tinywasm/tests/testsuite/util.rs
@@ -2,7 +2,7 @@ use std::panic::{self, AssertUnwindSafe};
 
 use eyre::{eyre, Result};
 use tinywasm_types::{ModuleInstanceAddr, TinyWasmModule, ValType, WasmValue};
-use wast::QuoteWat;
+use wast::{core::AbstractHeapType, QuoteWat};
 
 pub fn try_downcast_panic(panic: Box<dyn std::any::Any + Send>) -> String {
     let info = panic.downcast_ref::<panic::PanicInfo>().or(None).map(|p| p.to_string()).clone();
@@ -104,28 +104,36 @@ fn wastarg2tinywasmvalue(arg: wast::WastArg) -> Result<tinywasm_types::WasmValue
         I64(i) => WasmValue::I64(i),
         RefExtern(v) => WasmValue::RefExtern(v),
         RefNull(t) => match t {
-            wast::core::HeapType::Func => WasmValue::RefNull(ValType::RefFunc),
-            wast::core::HeapType::Extern => WasmValue::RefNull(ValType::RefExtern),
+            wast::core::HeapType::Abstract { shared: false, ty: AbstractHeapType::Func } => {
+                WasmValue::RefNull(ValType::RefFunc)
+            }
+            wast::core::HeapType::Abstract { shared: false, ty: AbstractHeapType::Extern } => {
+                WasmValue::RefNull(ValType::RefExtern)
+            }
             _ => return Err(eyre!("unsupported arg type: refnull: {:?}", t)),
         },
         v => return Err(eyre!("unsupported arg type: {:?}", v)),
     })
 }
 
-fn wastret2tinywasmvalue(arg: wast::WastRet) -> Result<tinywasm_types::WasmValue> {
-    let wast::WastRet::Core(arg) = arg else {
+fn wastret2tinywasmvalue(ret: wast::WastRet) -> Result<tinywasm_types::WasmValue> {
+    let wast::WastRet::Core(ret) = ret else {
         return Err(eyre!("unsupported arg type"));
     };
 
     use wast::core::WastRetCore::*;
-    Ok(match arg {
+    Ok(match ret {
         F32(f) => nanpattern2tinywasmvalue(f)?,
         F64(f) => nanpattern2tinywasmvalue(f)?,
         I32(i) => WasmValue::I32(i),
         I64(i) => WasmValue::I64(i),
         RefNull(t) => match t {
-            Some(wast::core::HeapType::Func) => WasmValue::RefNull(ValType::RefFunc),
-            Some(wast::core::HeapType::Extern) => WasmValue::RefNull(ValType::RefExtern),
+            Some(wast::core::HeapType::Abstract { shared: false, ty: AbstractHeapType::Func }) => {
+                WasmValue::RefNull(ValType::RefFunc)
+            }
+            Some(wast::core::HeapType::Abstract { shared: false, ty: AbstractHeapType::Extern }) => {
+                WasmValue::RefNull(ValType::RefExtern)
+            }
             _ => return Err(eyre!("unsupported arg type: refnull: {:?}", t)),
         },
         RefExtern(v) => match v {
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
@@ -6,6 +6,7 @@ edition.workspace=true
 license.workspace=true
 authors.workspace=true
 repository.workspace=true
+rust-version.workspace=true
 
 [dependencies]
 log={version="0.4", optional=true}
diff --git a/crates/wasm-testsuite/Cargo.toml b/crates/wasm-testsuite/Cargo.toml
@@ -7,6 +7,7 @@ readme="README.md"
 edition.workspace=true
 authors.workspace=true
 repository.workspace=true
+rust-version.workspace=true
 
 [lib]
 path="lib.rs"
@@ -15,4 +16,4 @@ path="lib.rs"
 independent=true
 
 [dependencies]
-rust-embed={version="8.3", features=["include-exclude"]}
+rust-embed={version="8.4", features=["include-exclude"]}
diff --git a/crates/wasm-testsuite/data b/crates/wasm-testsuite/data
@@ -1 +1 @@
-Subproject commit 6dfedc8b8423a91c1dc340d3af1a7f4fbf7868b4
+Subproject commit e05365077e13a1d86ffe77acfb1a835b7aa78422
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel="nightly-2024-06-13"
+channel="nightly"

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,10 @@ pub(crate) fn process_const_operators(ops: OperatorsReader<'_>) -> Result<ConstI`
`256`	`256`
`257`	`257`	`pub(crate) fn convert_heaptype(heap: wasmparser::HeapType) -> ValType {`
`258`	`258`	`match heap {`
`259`		`- wasmparser::HeapType::Func => ValType::RefFunc,`
`260`		`- wasmparser::HeapType::Extern => ValType::RefExtern,`
	`259`	`+ wasmparser::HeapType::Abstract { shared: false, ty: wasmparser::AbstractHeapType::Func } => ValType::RefFunc,`
	`260`	`+ wasmparser::HeapType::Abstract { shared: false, ty: wasmparser::AbstractHeapType::Extern } => {`
	`261`	`+ ValType::RefExtern`
	`262`	`+ }`
`261`	`263`	`_ => unimplemented!("Unsupported heap type: {:?}", heap),`
`262`	`264`	`}`
`263`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,17 +213,17 @@ mod tests {`
`213`	`213`
`214`	`214`	`match table_instance.get_wasm_val(0) {`
`215`	`215`	`Ok(WasmValue::RefFunc(_)) => {}`
`216`		`- _ => assert!(false, "get_wasm_val failed to return the correct WasmValue"),`
	`216`	`+ _ => panic!("get_wasm_val failed to return the correct WasmValue"),`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`match table_instance.get_wasm_val(1) {`
`220`	`220`	`Ok(WasmValue::RefNull(ValType::RefFunc)) => {}`
`221`		`- _ => assert!(false, "get_wasm_val failed to return the correct WasmValue"),`
	`221`	`+ _ => panic!("get_wasm_val failed to return the correct WasmValue"),`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`match table_instance.get_wasm_val(999) {`
`225`	`225`	`Err(Error::Trap(Trap::TableOutOfBounds { .. })) => {}`
`226`		`- _ => assert!(false, "get_wasm_val failed to handle undefined element correctly"),`
	`226`	`+ _ => panic!("get_wasm_val failed to handle undefined element correctly"),`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`