From e3bb2da0533c09748015824fe049807d09a44189 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 25 Oct 2022 11:16:47 -0700 Subject: [PATCH 1/2] Fix the `publish.rs` script and version bounds Makes it so the `./publish` script can now be run after this commit. --- Cargo.toml | 12 ++++++------ publish.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2d5a004507..a629dde19b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,14 +41,14 @@ wasmtime = "1.0.0" wasm-encoder = { version = "0.18.0", path = "crates/wasm-encoder"} wasm-compose = { version = "0.1.3", path = "crates/wasm-compose"} -wasm-mutate = { version = "0.2.4", path = "crates/wasm-mutate" } -wasm-shrink = { version = "0.1.6", path = "crates/wasm-shrink" } -wasm-smith = { version = "0.11.2", path = "crates/wasm-smith" } +wasm-mutate = { version = "0.2.9", path = "crates/wasm-mutate" } +wasm-shrink = { version = "0.1.11", path = "crates/wasm-shrink" } +wasm-smith = { version = "0.11.6", path = "crates/wasm-smith" } wasmparser = { version = "0.92.0", path = "crates/wasmparser" } -wasmparser-dump = { version = "0.1.4", path = "crates/dump" } -wasmprinter = { version = "0.2.36", path = "crates/wasmprinter" } +wasmparser-dump = { version = "0.1.9", path = "crates/dump" } +wasmprinter = { version = "0.2.41", path = "crates/wasmprinter" } wast = { version = "47.0.1", path = "crates/wast" } -wat = { version = "1.0.44", path = "crates/wat" } +wat = { version = "1.0.49", path = "crates/wat" } [dependencies] anyhow = { workspace = true } diff --git a/publish.rs b/publish.rs index b67fdadbc0..c5a5823117 100644 --- a/publish.rs +++ b/publish.rs @@ -242,7 +242,7 @@ fn bump_version(krate: &mut Crate, crates: &mut [Crate], bumps: &[(String, bool) if !is_deps || !line.starts_with(&format!("{} ", other.name)) { continue; } - if !line.contains(&other.version) { + if !line.contains(&other.version) && !line.contains("workspace = true") { if !line.contains("version =") || !krate.publish { continue; } From 919c94dc224ea03d5e19fdc4c20b05fb5c25e835 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 25 Oct 2022 11:38:30 -0700 Subject: [PATCH 2/2] Bump wasm-tools crates --- Cargo.toml | 22 +++++++++++----------- crates/dump/Cargo.toml | 2 +- crates/wasm-compose/Cargo.toml | 2 +- crates/wasm-encoder/Cargo.toml | 2 +- crates/wasm-mutate/Cargo.toml | 2 +- crates/wasm-shrink/Cargo.toml | 2 +- crates/wasm-smith/Cargo.toml | 2 +- crates/wasmparser/Cargo.toml | 2 +- crates/wasmprinter/Cargo.toml | 2 +- crates/wast/Cargo.toml | 2 +- crates/wat/Cargo.toml | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a629dde19b..992d50ab77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-tools" -version = "1.0.12" +version = "1.0.13" authors = ["The Wasmtime Project Developers"] edition.workspace = true description = "CLI tools for interoperating with WebAssembly files" @@ -39,16 +39,16 @@ rayon = "1.3" serde = { version = "1.0.137", features = ["derive"] } wasmtime = "1.0.0" -wasm-encoder = { version = "0.18.0", path = "crates/wasm-encoder"} -wasm-compose = { version = "0.1.3", path = "crates/wasm-compose"} -wasm-mutate = { version = "0.2.9", path = "crates/wasm-mutate" } -wasm-shrink = { version = "0.1.11", path = "crates/wasm-shrink" } -wasm-smith = { version = "0.11.6", path = "crates/wasm-smith" } -wasmparser = { version = "0.92.0", path = "crates/wasmparser" } -wasmparser-dump = { version = "0.1.9", path = "crates/dump" } -wasmprinter = { version = "0.2.41", path = "crates/wasmprinter" } -wast = { version = "47.0.1", path = "crates/wast" } -wat = { version = "1.0.49", path = "crates/wat" } +wasm-encoder = { version = "0.19.0", path = "crates/wasm-encoder"} +wasm-compose = { version = "0.1.4", path = "crates/wasm-compose"} +wasm-mutate = { version = "0.2.10", path = "crates/wasm-mutate" } +wasm-shrink = { version = "0.1.12", path = "crates/wasm-shrink" } +wasm-smith = { version = "0.11.7", path = "crates/wasm-smith" } +wasmparser = { version = "0.93.0", path = "crates/wasmparser" } +wasmparser-dump = { version = "0.1.10", path = "crates/dump" } +wasmprinter = { version = "0.2.42", path = "crates/wasmprinter" } +wast = { version = "48.0.0", path = "crates/wast" } +wat = { version = "1.0.50", path = "crates/wat" } [dependencies] anyhow = { workspace = true } diff --git a/crates/dump/Cargo.toml b/crates/dump/Cargo.toml index 6dba8f1c8a..0e9561e5d7 100644 --- a/crates/dump/Cargo.toml +++ b/crates/dump/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmparser-dump" -version = "0.1.9" +version = "0.1.10" authors = ["The Wasmtime Project Developers"] edition.workspace = true license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wasm-compose/Cargo.toml b/crates/wasm-compose/Cargo.toml index c4e59605bb..7a361355c4 100644 --- a/crates/wasm-compose/Cargo.toml +++ b/crates/wasm-compose/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-compose" -version = "0.1.3" +version = "0.1.4" edition.workspace = true authors = ["Peter Huene "] license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wasm-encoder/Cargo.toml b/crates/wasm-encoder/Cargo.toml index 65fa046353..5962f3e81a 100644 --- a/crates/wasm-encoder/Cargo.toml +++ b/crates/wasm-encoder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-encoder" -version = "0.18.0" +version = "0.19.0" authors = ["Nick Fitzgerald "] edition.workspace = true license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wasm-mutate/Cargo.toml b/crates/wasm-mutate/Cargo.toml index c56fece75c..79e62c6b4a 100644 --- a/crates/wasm-mutate/Cargo.toml +++ b/crates/wasm-mutate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-mutate" -version = "0.2.9" +version = "0.2.10" edition.workspace = true license = "Apache-2.0 WITH LLVM-exception" repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-mutate" diff --git a/crates/wasm-shrink/Cargo.toml b/crates/wasm-shrink/Cargo.toml index c480a1b7a3..3bf1d5b195 100644 --- a/crates/wasm-shrink/Cargo.toml +++ b/crates/wasm-shrink/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0 WITH LLVM-exception" readme = "./README.md" repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-shrink" name = "wasm-shrink" -version = "0.1.11" +version = "0.1.12" [dependencies] anyhow = { workspace = true } diff --git a/crates/wasm-smith/Cargo.toml b/crates/wasm-smith/Cargo.toml index c5f223f1d4..d92ca4eb37 100644 --- a/crates/wasm-smith/Cargo.toml +++ b/crates/wasm-smith/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0 WITH LLVM-exception" name = "wasm-smith" readme = "./README.md" repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-smith" -version = "0.11.6" +version = "0.11.7" exclude = ["/benches/corpus"] [[bench]] diff --git a/crates/wasmparser/Cargo.toml b/crates/wasmparser/Cargo.toml index b566162528..14a9364683 100644 --- a/crates/wasmparser/Cargo.toml +++ b/crates/wasmparser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmparser" -version = "0.92.0" +version = "0.93.0" authors = ["Yury Delendik "] license = "Apache-2.0 WITH LLVM-exception" repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser" diff --git a/crates/wasmprinter/Cargo.toml b/crates/wasmprinter/Cargo.toml index 3a0e5d24e3..359a6e31d2 100644 --- a/crates/wasmprinter/Cargo.toml +++ b/crates/wasmprinter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmprinter" -version = "0.2.41" +version = "0.2.42" authors = ["Alex Crichton "] edition.workspace = true license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml index 55d4b42e7b..a9ccf15f48 100644 --- a/crates/wast/Cargo.toml +++ b/crates/wast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wast" -version = "47.0.1" +version = "48.0.0" authors = ["Alex Crichton "] edition.workspace = true license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wat/Cargo.toml b/crates/wat/Cargo.toml index e68d90d563..698edc00dc 100644 --- a/crates/wat/Cargo.toml +++ b/crates/wat/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wat" -version = "1.0.49" +version = "1.0.50" authors = ["Alex Crichton "] edition.workspace = true license = "Apache-2.0 WITH LLVM-exception"