Skip to content

Commit cdc0015

Browse files
chore: update deps, cargo fmt
Signed-off-by: Henry Gressmann <[email protected]>
1 parent 9b3e8fe commit cdc0015

22 files changed

+82
-114
lines changed

Diff for: Cargo.lock

+47-81
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
44
resolver="2"
55

66
[workspace.dependencies]
7-
wast="227"
8-
wat="1.227"
9-
wasmparser={version="0.227", default-features=false}
7+
wast="228"
8+
wat="1.228"
9+
wasmparser={version="0.228", default-features=false}
1010
eyre="0.6"
1111
log="0.4"
1212
pretty_env_logger="0.5"

Diff for: crates/cli/src/bin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use argh::FromArgs;
44
use args::WasmArg;
55
use eyre::Result;
66
use log::{debug, info};
7-
use tinywasm::{types::WasmValue, Module};
7+
use tinywasm::{Module, types::WasmValue};
88

99
use crate::args::to_wasm_args;
1010
mod args;

Diff for: crates/cli/src/wat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use wast::{
2-
parser::{self, ParseBuffer},
32
Wat,
3+
parser::{self, ParseBuffer},
44
};
55

66
pub fn wat2wasm(wat: &str) -> Vec<u8> {

Diff for: crates/parser/src/lib.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,18 @@ impl Parser {
7070
gc_types: true,
7171
stack_switching: false,
7272
component_model: false,
73-
component_model_nested_names: false,
74-
component_model_values: false,
7573
exceptions: false,
7674
gc: false,
7775
memory_control: false,
7876
relaxed_simd: false,
7977
threads: false,
8078
shared_everything_threads: false,
8179
legacy_exceptions: false,
82-
component_model_async: false,
80+
cm_async: false,
81+
cm_async_builtins: false,
82+
cm_async_stackful: false,
83+
cm_nested_names: false,
84+
cm_values: false,
8385
};
8486
Validator::new_with_features(features.into())
8587
}

Diff for: crates/tinywasm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tinywasm-types={version="0.9.0-alpha.0", path="../types", default-features=false
2020
libm={version="0.2", default-features=false}
2121

2222
[dev-dependencies]
23-
wasm-testsuite={version="0.5.0"}
23+
wasm-testsuite={version="0.5.2"}
2424
indexmap="2.7"
2525
wast={workspace=true}
2626
wat={workspace=true}

Diff for: crates/tinywasm/src/interpreter/executor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -440,12 +440,12 @@ impl<'store, 'stack> Executor<'store, 'stack> {
440440

441441
I8x16Shl => self.stack.values.calculate_diff::<i32, i8x16, i8x16>(|a, b| Ok(b.shl(a as i8))).to_cf()?,
442442
I16x8Shl => self.stack.values.calculate_diff::<i32, i16x8, i16x8>(|a, b| Ok(b.shl(a as i16))).to_cf()?,
443-
I32x4Shl => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shl(a as i32))).to_cf()?,
443+
I32x4Shl => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shl(a))).to_cf()?,
444444
I64x2Shl => self.stack.values.calculate_diff::<i32, i64x2, i64x2>(|a, b| Ok(b.shl(a as i64))).to_cf()?,
445445

446446
I8x16ShrS => self.stack.values.calculate_diff::<i32, i8x16, i8x16>(|a, b| Ok(b.shr(a as i8))).to_cf()?,
447447
I16x8ShrS => self.stack.values.calculate_diff::<i32, i16x8, i16x8>(|a, b| Ok(b.shr(a as i16))).to_cf()?,
448-
I32x4ShrS => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shr(a as i32))).to_cf()?,
448+
I32x4ShrS => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shr(a))).to_cf()?,
449449
I64x2ShrS => self.stack.values.calculate_diff::<i32, i64x2, i64x2>(|a, b| Ok(b.shr(a as i64))).to_cf()?,
450450

451451
I8x16ShrU => self.stack.values.calculate_diff::<i32, u8x16, u8x16>(|a, b| Ok(b.shr(a as u8))).to_cf()?,

Diff for: crates/tinywasm/tests/host_func_signature_check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use eyre::Result;
22
use std::fmt::Write;
33
use tinywasm::{
4-
types::{FuncType, ValType, WasmValue},
54
Extern, FuncContext, Imports, Module, Store,
5+
types::{FuncType, ValType, WasmValue},
66
};
77
use tinywasm_types::ExternRef;
88

Diff for: crates/tinywasm/tests/test-wasm-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod testsuite;
22
use eyre::Result;
33
use testsuite::TestSuite;
4-
use wasm_testsuite::data::{spec, SpecVersion};
4+
use wasm_testsuite::data::{SpecVersion, spec};
55

66
fn main() -> Result<()> {
77
TestSuite::set_log_level(log::LevelFilter::Off);

0 commit comments

Comments
 (0)