Skip to content

Commit 45cf6a4

Browse files
authored
Update walrus and wasmparser deps (#2234)
* Update walrus and wasmparser deps Gets some bug fixes and encoding updates for reference types * Update test expectations * Fix test for node 14.5
1 parent 954a3c4 commit 45cf6a4

File tree

12 files changed

+18
-19
lines changed

12 files changed

+18
-19
lines changed

crates/cli-support/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ log = "0.4"
1818
rustc-demangle = "0.1.13"
1919
serde_json = "1.0"
2020
tempfile = "3.0"
21-
walrus = "0.17.0"
21+
walrus = "0.18.0"
2222
wasm-bindgen-externref-xform = { path = '../externref-xform', version = '=0.2.64' }
2323
wasm-bindgen-multi-value-xform = { path = '../multi-value-xform', version = '=0.2.64' }
2424
wasm-bindgen-shared = { path = "../shared", version = '=0.2.64' }
2525
wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.64' }
2626
wasm-bindgen-wasm-conventions = { path = '../wasm-conventions', version = '=0.2.64' }
2727
wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.64' }
28-
wit-text = "0.7.0"
29-
wit-walrus = "0.4.0"
28+
wit-text = "0.8.0"
29+
wit-walrus = "0.5.0"
3030
wit-validator = "0.2.0"

crates/cli/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rouille = { version = "3.0.0", default-features = false }
2424
serde = { version = "1.0", features = ['derive'] }
2525
serde_derive = "1.0"
2626
serde_json = "1.0"
27-
walrus = { version = "0.17.0", features = ['parallel'] }
27+
walrus = { version = "0.18.0", features = ['parallel'] }
2828
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.64" }
2929
wasm-bindgen-shared = { path = "../shared", version = "=0.2.64" }
3030

@@ -34,11 +34,10 @@ diff = "0.1"
3434
predicates = "1.0.0"
3535
rayon = "1.0"
3636
tempfile = "3.0"
37-
walrus = "0.17"
3837
wit-printer = "0.2"
39-
wit-text = "0.7"
38+
wit-text = "0.8"
4039
wit-validator = "0.2"
41-
wit-walrus = "0.4"
40+
wit-walrus = "0.5"
4241

4342
[[test]]
4443
name = "reference"

crates/externref-xform/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ edition = '2018'
1313

1414
[dependencies]
1515
anyhow = "1.0"
16-
walrus = "0.17.0"
16+
walrus = "0.18.0"
1717

1818
[dev-dependencies]
1919
rayon = "1.0"
2020
wasmprinter = "0.2"
21-
wast = "17.0"
21+
wast = "21.0"
2222
wat = "1.0"
2323

2424
[[test]]

crates/externref-xform/tests/anyref-param.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
local.get 1
2525
call $foo
2626
local.get 1
27-
ref.nullextern
27+
ref.null extern
2828
table.set 0
2929
local.get 1
3030
i32.const 1

crates/externref-xform/tests/mixed-export.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
local.get 4
3434
call $a
3535
local.get 5
36-
ref.nullextern
36+
ref.null extern
3737
table.set 0
3838
local.get 5
3939
i32.const 1

crates/externref-xform/tests/table-grow-intrinsic.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
local.get 1
2727
call $foo)
2828
(func $foo (type 1) (param i32)
29-
ref.nullextern
29+
ref.null extern
3030
i32.const 0
3131
table.grow 0
3232
drop)

crates/externref-xform/tests/table-set-null-intrinsic.wat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
call $foo)
2727
(func $foo (type 1) (param i32)
2828
local.get 0
29-
ref.nullextern
29+
ref.null extern
3030
table.set 0)
3131
(func $alloc (type 0) (result i32)
3232
i32.const 0)

crates/multi-value-xform/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ edition = "2018"
1313

1414
[dependencies]
1515
anyhow = "1.0"
16-
walrus = "0.17.0"
16+
walrus = "0.18.0"
1717

1818
[dev-dependencies]
1919
rayon = "1.0"
2020
wasmprinter = "0.2"
21-
wast = "17.0"
21+
wast = "21.0"
2222
wat = "1.0"
2323

2424
[[test]]

crates/threads-xform/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ edition = "2018"
1313

1414
[dependencies]
1515
anyhow = "1.0"
16-
walrus = "0.17.0"
16+
walrus = "0.18.0"
1717
wasm-bindgen-wasm-conventions = { path = "../wasm-conventions", version = "=0.2.64" }

crates/wasm-conventions/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ description = "Utilities for working with Wasm codegen conventions (usually esta
1010
edition = "2018"
1111

1212
[dependencies]
13-
walrus = "0.17.0"
13+
walrus = "0.18.0"
1414
anyhow = "1.0"

crates/wasm-interpreter/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ edition = '2018'
1414
[dependencies]
1515
anyhow = "1.0"
1616
log = "0.4"
17-
walrus = "0.17.0"
17+
walrus = "0.18.0"
1818
wasm-bindgen-wasm-conventions = { path = "../wasm-conventions", version = "0.2.64" }
1919

2020
[dev-dependencies]

tests/wasm/classes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ exports.js_test_inspectable_classes = () => {
200200
assert.deepStrictEqual(inspectable.toJSON(), { a: inspectable.a });
201201
assert.strictEqual(inspectable.toString(), `{"a":${inspectable.a}}`);
202202
// Inspectable classes in Node.js have improved console.log formatting as well
203-
assert.strictEqual(console_log_to_string(inspectable), `Inspectable { a: ${inspectable.a} }`);
203+
assert(console_log_to_string(inspectable).endsWith(`{ a: ${inspectable.a} }`));
204204
// Non-inspectable classes do not have a toJSON or toString generated
205205
assert.strictEqual(not_inspectable.toJSON, undefined);
206206
assert.strictEqual(not_inspectable.toString(), '[object Object]');

0 commit comments

Comments
 (0)