Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update walrus and wasmparser deps #2234

Merged
merged 3 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/cli-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ log = "0.4"
rustc-demangle = "0.1.13"
serde_json = "1.0"
tempfile = "3.0"
walrus = "0.17.0"
walrus = "0.18.0"
wasm-bindgen-externref-xform = { path = '../externref-xform', version = '=0.2.64' }
wasm-bindgen-multi-value-xform = { path = '../multi-value-xform', version = '=0.2.64' }
wasm-bindgen-shared = { path = "../shared", version = '=0.2.64' }
wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.64' }
wasm-bindgen-wasm-conventions = { path = '../wasm-conventions', version = '=0.2.64' }
wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.64' }
wit-text = "0.7.0"
wit-walrus = "0.4.0"
wit-text = "0.8.0"
wit-walrus = "0.5.0"
wit-validator = "0.2.0"
7 changes: 3 additions & 4 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rouille = { version = "3.0.0", default-features = false }
serde = { version = "1.0", features = ['derive'] }
serde_derive = "1.0"
serde_json = "1.0"
walrus = { version = "0.17.0", features = ['parallel'] }
walrus = { version = "0.18.0", features = ['parallel'] }
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.64" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.64" }

Expand All @@ -34,11 +34,10 @@ diff = "0.1"
predicates = "1.0.0"
rayon = "1.0"
tempfile = "3.0"
walrus = "0.17"
wit-printer = "0.2"
wit-text = "0.7"
wit-text = "0.8"
wit-validator = "0.2"
wit-walrus = "0.4"
wit-walrus = "0.5"

[[test]]
name = "reference"
Expand Down
4 changes: 2 additions & 2 deletions crates/externref-xform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ edition = '2018'

[dependencies]
anyhow = "1.0"
walrus = "0.17.0"
walrus = "0.18.0"

[dev-dependencies]
rayon = "1.0"
wasmprinter = "0.2"
wast = "17.0"
wast = "21.0"
wat = "1.0"

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/externref-xform/tests/anyref-param.wat
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
local.get 1
call $foo
local.get 1
ref.nullextern
ref.null extern
table.set 0
local.get 1
i32.const 1
Expand Down
2 changes: 1 addition & 1 deletion crates/externref-xform/tests/mixed-export.wat
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
local.get 4
call $a
local.get 5
ref.nullextern
ref.null extern
table.set 0
local.get 5
i32.const 1
Expand Down
2 changes: 1 addition & 1 deletion crates/externref-xform/tests/table-grow-intrinsic.wat
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
local.get 1
call $foo)
(func $foo (type 1) (param i32)
ref.nullextern
ref.null extern
i32.const 0
table.grow 0
drop)
Expand Down
2 changes: 1 addition & 1 deletion crates/externref-xform/tests/table-set-null-intrinsic.wat
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
call $foo)
(func $foo (type 1) (param i32)
local.get 0
ref.nullextern
ref.null extern
table.set 0)
(func $alloc (type 0) (result i32)
i32.const 0)
Expand Down
4 changes: 2 additions & 2 deletions crates/multi-value-xform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ edition = "2018"

[dependencies]
anyhow = "1.0"
walrus = "0.17.0"
walrus = "0.18.0"

[dev-dependencies]
rayon = "1.0"
wasmprinter = "0.2"
wast = "17.0"
wast = "21.0"
wat = "1.0"

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/threads-xform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ edition = "2018"

[dependencies]
anyhow = "1.0"
walrus = "0.17.0"
walrus = "0.18.0"
wasm-bindgen-wasm-conventions = { path = "../wasm-conventions", version = "=0.2.64" }
2 changes: 1 addition & 1 deletion crates/wasm-conventions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ description = "Utilities for working with Wasm codegen conventions (usually esta
edition = "2018"

[dependencies]
walrus = "0.17.0"
walrus = "0.18.0"
anyhow = "1.0"
2 changes: 1 addition & 1 deletion crates/wasm-interpreter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edition = '2018'
[dependencies]
anyhow = "1.0"
log = "0.4"
walrus = "0.17.0"
walrus = "0.18.0"
wasm-bindgen-wasm-conventions = { path = "../wasm-conventions", version = "0.2.64" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tests/wasm/classes.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ exports.js_test_inspectable_classes = () => {
assert.deepStrictEqual(inspectable.toJSON(), { a: inspectable.a });
assert.strictEqual(inspectable.toString(), `{"a":${inspectable.a}}`);
// Inspectable classes in Node.js have improved console.log formatting as well
assert.strictEqual(console_log_to_string(inspectable), `Inspectable { a: ${inspectable.a} }`);
assert(console_log_to_string(inspectable).endsWith(`{ a: ${inspectable.a} }`));
// Non-inspectable classes do not have a toJSON or toString generated
assert.strictEqual(not_inspectable.toJSON, undefined);
assert.strictEqual(not_inspectable.toString(), '[object Object]');
Expand Down