Skip to content

Commit

Permalink
Merge with upstream (#86)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhil authored May 8, 2024
2 parents f6f0b8a + f017d08 commit 31abafb
Show file tree
Hide file tree
Showing 511 changed files with 267,873 additions and 1,441 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ jobs:
- run: cargo check --no-default-features -p wasmparser
- run: cargo check --no-default-features -p wasmparser --target x86_64-unknown-none
- run: cargo check --no-default-features -p wasmparser --features std
- run: cargo check --no-default-features -p wasmparser --features validate
- run: |
if cargo tree -p wasm-smith --no-default-features -e no-dev | grep wasmparser; then
echo wasm-smith without default features should not depend on wasmparser
Expand Down
106 changes: 53 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasm-tools"
version = "1.206.0"
version = "1.207.0"
authors = ["The Wasmtime Project Developers"]
edition.workspace = true
description = "CLI tools for interoperating with WebAssembly files"
Expand Down Expand Up @@ -33,7 +33,7 @@ all = "allow"

[workspace.package]
edition = '2021'
version = "0.206.0"
version = "0.207.0"

[workspace.dependencies]
anyhow = "1.0.58"
Expand Down Expand Up @@ -62,19 +62,19 @@ bitflags = "2.5.0"
hashbrown = { version = "0.14.3", default-features = false, features = ['ahash'] }
ahash = { version = "0.8.11", default-features = false }

wasm-compose = { version = "0.206.0", path = "crates/wasm-compose" }
wasm-encoder = { version = "0.206.0", path = "crates/wasm-encoder" }
wasm-metadata = { version = "0.206.0", path = "crates/wasm-metadata" }
wasm-mutate = { version = "0.206.0", path = "crates/wasm-mutate" }
wasm-shrink = { version = "0.206.0", path = "crates/wasm-shrink" }
wasm-smith = { version = "0.206.0", path = "crates/wasm-smith" }
wasmparser = { version = "0.206.0", path = "crates/wasmparser" }
wasmprinter = { version = "0.206.0", path = "crates/wasmprinter" }
wast = { version = "206.0.0", path = "crates/wast" }
wat = { version = "1.206.0", path = "crates/wat" }
wit-component = { version = "0.206.0", path = "crates/wit-component" }
wit-parser = { version = "0.206.0", path = "crates/wit-parser" }
wit-smith = { version = "0.206.0", path = "crates/wit-smith" }
wasm-compose = { version = "0.207.0", path = "crates/wasm-compose" }
wasm-encoder = { version = "0.207.0", path = "crates/wasm-encoder" }
wasm-metadata = { version = "0.207.0", path = "crates/wasm-metadata" }
wasm-mutate = { version = "0.207.0", path = "crates/wasm-mutate" }
wasm-shrink = { version = "0.207.0", path = "crates/wasm-shrink" }
wasm-smith = { version = "0.207.0", path = "crates/wasm-smith" }
wasmparser = { version = "0.207.0", path = "crates/wasmparser", default-features = false, features = ['std'] }
wasmprinter = { version = "0.207.0", path = "crates/wasmprinter" }
wast = { version = "207.0.0", path = "crates/wast" }
wat = { version = "1.207.0", path = "crates/wat" }
wit-component = { version = "0.207.0", path = "crates/wit-component" }
wit-parser = { version = "0.207.0", path = "crates/wit-parser" }
wit-smith = { version = "0.207.0", path = "crates/wit-smith" }

[dependencies]
anyhow = { workspace = true }
Expand All @@ -87,7 +87,7 @@ wat = { workspace = true }
termcolor = "1.2.0"

# Dependencies of `validate`
wasmparser = { workspace = true, optional = true }
wasmparser = { workspace = true, optional = true, features = ['validate'] }
rayon = { workspace = true, optional = true }

# Dependencies of `print`
Expand Down
4 changes: 4 additions & 0 deletions crates/fuzz-stats/src/bin/failed-instantiations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ impl State {
let mut config = wasm_smith::Config::arbitrary(&mut u)?;
config.allow_start_export = false;

// NB: just added "table64" support to this and wasmtime doesn't
// implement that yet
config.memory64_enabled = false;

// Wasmtime doesn't support these proposals yet.
config.gc_enabled = false;

Expand Down
Loading

0 comments on commit 31abafb

Please sign in to comment.