From eddc2a75bd39e0f067441785287c744f3eaa1a26 Mon Sep 17 00:00:00 2001 From: Julien Cretin Date: Wed, 4 Dec 2024 23:40:43 +0100 Subject: [PATCH] Upgrade all dependencies (#699) --- crates/board/CHANGELOG.md | 2 +- crates/board/Cargo.lock | 2 +- crates/board/Cargo.toml | 3 +- crates/cli-tools/CHANGELOG.md | 1 + crates/cli-tools/Cargo.lock | 26 +-- crates/cli-tools/Cargo.toml | 2 +- crates/cli-tools/src/action.rs | 2 +- crates/cli-tools/src/error.rs | 2 +- crates/cli/CHANGELOG.md | 2 +- crates/cli/Cargo.lock | 27 ++- crates/interpreter/CHANGELOG.md | 7 + crates/interpreter/Cargo.lock | 25 ++- crates/interpreter/Cargo.toml | 4 +- crates/interpreter/src/exec.rs | 16 +- crates/interpreter/src/valid.rs | 6 +- crates/interpreter/tests/spec.rs | 5 +- crates/protocol-tokio/Cargo.lock | 2 +- crates/protocol-usb/Cargo.lock | 2 +- crates/protocol/crates/schema/Cargo.lock | 5 +- crates/runner-host/Cargo.lock | 8 +- .../runner-host/crates/web-client/Cargo.lock | 6 +- .../runner-host/crates/web-server/Cargo.lock | 6 +- crates/runner-nordic/Cargo.lock | 4 +- crates/scheduler/CHANGELOG.md | 2 +- crates/scheduler/Cargo.lock | 4 +- crates/scheduler/Cargo.toml | 4 +- crates/store/CHANGELOG.md | 6 + crates/store/Cargo.lock | 4 +- crates/store/Cargo.toml | 2 +- crates/store/fuzz/Cargo.lock | 4 +- crates/store/src/store.rs | 4 +- crates/wasm-bench/Cargo.lock | 192 +++++++----------- crates/wasm-bench/Cargo.toml | 8 +- crates/xtask/Cargo.lock | 83 +++++--- crates/xtask/src/main.rs | 4 +- examples/rust/hsm/common/Cargo.lock | 26 +-- examples/rust/hsm/common/Cargo.toml | 2 +- examples/rust/hsm/host/Cargo.lock | 36 +++- examples/rust/protocol/host/Cargo.lock | 2 +- rust-toolchain.toml | 2 +- scripts/sync.sh | 5 + scripts/wrapper.sh | 4 +- third_party/SchemaStore/schemastore | 2 +- third_party/WebAssembly/spec | 2 +- 44 files changed, 295 insertions(+), 268 deletions(-) diff --git a/crates/board/CHANGELOG.md b/crates/board/CHANGELOG.md index b94c9e11d..4d0ee34cb 100644 --- a/crates/board/CHANGELOG.md +++ b/crates/board/CHANGELOG.md @@ -167,4 +167,4 @@ ## 0.1.0 - + diff --git a/crates/board/Cargo.lock b/crates/board/Cargo.lock index a00624cba..d8251b3b4 100644 --- a/crates/board/Cargo.lock +++ b/crates/board/Cargo.lock @@ -782,7 +782,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/board/Cargo.toml b/crates/board/Cargo.toml index f36dd1c8e..07207b82b 100644 --- a/crates/board/Cargo.toml +++ b/crates/board/Cargo.toml @@ -37,7 +37,7 @@ usbd-serial = { version = "0.2.2", default-features = false, optional = true } wasefire-error = { version = "0.1.2", path = "../error" } wasefire-logger = { version = "0.1.6", path = "../logger" } wasefire-protocol = { version = "0.2.0", path = "../protocol" } -wasefire-store = { version = "0.3.0", path = "../store", optional = true } +wasefire-store = { version = "0.3.1-git", path = "../store", optional = true } [dependencies.wasefire-applet-api] version = "0.7.1-git" @@ -155,6 +155,7 @@ internal-software-crypto-hmac = ["dep:hmac"] [lints] clippy.unit-arg = "allow" rust.missing-docs = "warn" +rust.unexpected_cfgs = { level = "allow", check-cfg = ["cfg(target_arch, values(\"spirv\"))"] } rust.unreachable-pub = "warn" rust.unsafe-op-in-unsafe-fn = "warn" rust.unused-crate-dependencies = "warn" diff --git a/crates/cli-tools/CHANGELOG.md b/crates/cli-tools/CHANGELOG.md index a6877389e..ebb501712 100644 --- a/crates/cli-tools/CHANGELOG.md +++ b/crates/cli-tools/CHANGELOG.md @@ -9,6 +9,7 @@ ### Patch +- Fix clippy lints - Update dependencies ## 0.2.0 diff --git a/crates/cli-tools/Cargo.lock b/crates/cli-tools/Cargo.lock index 8a920646d..6567e7adc 100644 --- a/crates/cli-tools/Cargo.lock +++ b/crates/cli-tools/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", @@ -944,9 +944,9 @@ checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1162,9 +1162,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", @@ -1246,9 +1246,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1300,18 +1300,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", @@ -1594,7 +1594,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/cli-tools/Cargo.toml b/crates/cli-tools/Cargo.toml index ded05efd6..4e697d80d 100644 --- a/crates/cli-tools/Cargo.toml +++ b/crates/cli-tools/Cargo.toml @@ -16,7 +16,7 @@ all-features = true [dependencies] anyhow = { version = "1.0.86", default-features = false, features = ["std"] } -cargo_metadata = { version = "0.18.1", default-features = false, optional = true } +cargo_metadata = { version = "0.19.1", default-features = false, optional = true } data-encoding = { version = "2.6.0", default-features = false, features = ["std"], optional = true } flate2 = { version = "1.0.34", default-features = false, features = ["rust_backend"] } humantime = { version = "2.1.0", default-features = false, optional = true } diff --git a/crates/cli-tools/src/action.rs b/crates/cli-tools/src/action.rs index 7c32869a9..94f862b65 100644 --- a/crates/cli-tools/src/action.rs +++ b/crates/cli-tools/src/action.rs @@ -573,7 +573,7 @@ impl RustAppletBuild { if self.prod { cargo.arg("-Zbuild-std=core,alloc"); let mut features = "-Zbuild-std-features=panic_immediate_abort".to_string(); - if self.opt_level.map_or(false, OptLevel::optimize_for_size) { + if self.opt_level.is_some_and(OptLevel::optimize_for_size) { features.push_str(",optimize_for_size"); } cargo.arg(features); diff --git a/crates/cli-tools/src/error.rs b/crates/cli-tools/src/error.rs index 55a49b87d..f6b441ff9 100644 --- a/crates/cli-tools/src/error.rs +++ b/crates/cli-tools/src/error.rs @@ -20,5 +20,5 @@ use std::error::Error; pub fn root_cause_is( error: &anyhow::Error, predicate: impl FnOnce(&E) -> bool, ) -> bool { - error.root_cause().downcast_ref::().map_or(false, predicate) + error.root_cause().downcast_ref::().is_some_and(predicate) } diff --git a/crates/cli/CHANGELOG.md b/crates/cli/CHANGELOG.md index 44805eb24..e7ed91943 100644 --- a/crates/cli/CHANGELOG.md +++ b/crates/cli/CHANGELOG.md @@ -60,4 +60,4 @@ ## 0.1.0 - + diff --git a/crates/cli/Cargo.lock b/crates/cli/Cargo.lock index 07e976028..f6fcfd4eb 100644 --- a/crates/cli/Cargo.lock +++ b/crates/cli/Cargo.lock @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", @@ -1075,9 +1075,9 @@ checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1328,12 +1328,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", - "memchr", "ryu", "serde", ] @@ -1419,9 +1418,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1473,18 +1472,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", @@ -1786,7 +1785,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/interpreter/CHANGELOG.md b/crates/interpreter/CHANGELOG.md index e0eaa1df0..c54391f08 100644 --- a/crates/interpreter/CHANGELOG.md +++ b/crates/interpreter/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.3.2-git + +### Patch + +- Fix clippy lints +- Update dependencies + ## 0.3.1 ### Minor diff --git a/crates/interpreter/Cargo.lock b/crates/interpreter/Cargo.lock index 076e31513..fa470550f 100644 --- a/crates/interpreter/Cargo.lock +++ b/crates/interpreter/Cargo.lock @@ -159,6 +159,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + [[package]] name = "syn" version = "2.0.66" @@ -178,9 +184,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "version_check" @@ -197,7 +203,7 @@ dependencies = [ [[package]] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" dependencies = [ "lazy_static", "libm", @@ -211,9 +217,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.219.1" +version = "0.221.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" +checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5" dependencies = [ "leb128", "wasmparser", @@ -221,19 +227,20 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.219.1" +version = "0.221.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" +checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" dependencies = [ "bitflags", "indexmap", + "semver", ] [[package]] name = "wast" -version = "219.0.1" +version = "221.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f79a9d9df79986a68689a6b40bcc8d5d40d807487b235bebc2ac69a242b54a1" +checksum = "fcc4470b9de917ba199157d1f0ae104f2ae362be728c43e68c571c7715bd629e" dependencies = [ "bumpalo", "leb128", diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml index 7305c3d2d..038df6351 100644 --- a/crates/interpreter/Cargo.toml +++ b/crates/interpreter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" authors = ["Julien Cretin "] license = "Apache-2.0" publish = true @@ -21,7 +21,7 @@ wasefire-error = { version = "0.1.2", path = "../error" } [dev-dependencies] lazy_static = "1.4.0" -wast = "219.0.1" +wast = "221.0.2" [features] # Enable debugging features (only works for targets with std). diff --git a/crates/interpreter/src/exec.rs b/crates/interpreter/src/exec.rs index e0c0a4fec..30a26bc73 100644 --- a/crates/interpreter/src/exec.rs +++ b/crates/interpreter/src/exec.rs @@ -287,7 +287,7 @@ impl<'m> Store<'m> { let name = HostName { module, name }; check(self.func_default.is_none())?; check(self.insts.is_empty())?; - check(self.funcs.last().map_or(true, |x| x.0 < name))?; + check(self.funcs.last().is_none_or(|x| x.0 < name))?; self.funcs.push((name, type_)); Ok(()) } @@ -903,7 +903,7 @@ impl<'m> Thread<'m> { let s = self.pop_value().unwrap_i32() as usize; let d = self.pop_value().unwrap_i32() as usize; let mem = store.mem(inst_id, 0); - if core::cmp::max(s, d).checked_add(n).map_or(true, |x| x > mem.len() as usize) { + if core::cmp::max(s, d).checked_add(n).is_none_or(|x| x > mem.len() as usize) { return Err(trap()); } mem.data.copy_within(s .. s + n, d); @@ -913,7 +913,7 @@ impl<'m> Thread<'m> { let val = self.pop_value().unwrap_i32() as u8; let d = self.pop_value().unwrap_i32() as usize; let mem = store.mem(inst_id, 0); - if d.checked_add(n).map_or(true, |x| x > mem.len() as usize) { + if d.checked_add(n).is_none_or(|x| x > mem.len() as usize) { memory_too_small(d, n, mem); return Err(trap()); } @@ -958,7 +958,7 @@ impl<'m> Thread<'m> { let val = self.pop_value(); let i = self.pop_value().unwrap_i32() as usize; let table = store.table(inst_id, x); - if i.checked_add(n).map_or(true, |x| x > table.elems.len()) { + if i.checked_add(n).is_none_or(|x| x > table.elems.len()) { return Err(trap()); } table.elems[i ..][.. n].fill(val); @@ -1371,8 +1371,8 @@ impl<'m> Thread<'m> { } fn table_init(d: usize, s: usize, n: usize, table: &mut Table, elems: &[Val]) -> Result<(), Error> { - if s.checked_add(n).map_or(true, |x| x > elems.len()) - || d.checked_add(n).map_or(true, |x| x > table.elems.len()) + if s.checked_add(n).is_none_or(|x| x > elems.len()) + || d.checked_add(n).is_none_or(|x| x > table.elems.len()) { Err(trap()) } else { @@ -1382,8 +1382,8 @@ fn table_init(d: usize, s: usize, n: usize, table: &mut Table, elems: &[Val]) -> } fn memory_init(d: usize, s: usize, n: usize, mem: &mut Memory, data: &[u8]) -> Result<(), Error> { - if s.checked_add(n).map_or(true, |x| x > data.len()) - || d.checked_add(n).map_or(true, |x| x > mem.len() as usize) + if s.checked_add(n).is_none_or(|x| x > data.len()) + || d.checked_add(n).is_none_or(|x| x > mem.len() as usize) { memory_too_small(d, n, mem); Err(trap()) diff --git a/crates/interpreter/src/valid.rs b/crates/interpreter/src/valid.rs index df352e86f..03293ad14 100644 --- a/crates/interpreter/src/valid.rs +++ b/crates/interpreter/src/valid.rs @@ -139,13 +139,13 @@ impl<'m> Context<'m> { } if let Some(mut parser) = self.check_section(parser, SectionId::Data)? { let n = parser.parse_vec()?; - check(self.datas.map_or(true, |m| m == n))?; + check(self.datas.is_none_or(|m| m == n))?; for _ in 0 .. n { parser.parse_data(&mut ParseData::new(self, &mut refs, globals_len))?; } check(parser.is_empty())?; } else { - check(self.datas.map_or(true, |m| m == 0))?; + check(self.datas.is_none_or(|m| m == 0))?; } self.check_section(parser, SectionId::Custom)?; check(parser.is_empty()) @@ -247,7 +247,7 @@ impl<'m> Context<'m> { } fn data(&self, x: DataIdx) -> CheckResult { - check(self.datas.map_or(false, |n| (x as usize) < n)) + check(self.datas.is_some_and(|n| (x as usize) < n)) } } diff --git a/crates/interpreter/tests/spec.rs b/crates/interpreter/tests/spec.rs index b5ba42510..59a9b7fd6 100644 --- a/crates/interpreter/tests/spec.rs +++ b/crates/interpreter/tests/spec.rs @@ -166,10 +166,7 @@ impl<'m> Env<'m> { fn maybe_instantiate(&mut self, name: &str, wasm: &[u8]) -> Result { let module = self.alloc(wasm.len()); module.copy_from_slice(wasm); - let module = match Module::new(module) { - Ok(x) => x, - Err(e) => return Err(e), - }; + let module = Module::new(module)?; let memory = self.alloc(mem_size(name)); self.store.instantiate(module, memory) } diff --git a/crates/protocol-tokio/Cargo.lock b/crates/protocol-tokio/Cargo.lock index b1f17d50f..8d7f3d6b5 100644 --- a/crates/protocol-tokio/Cargo.lock +++ b/crates/protocol-tokio/Cargo.lock @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/protocol-usb/Cargo.lock b/crates/protocol-usb/Cargo.lock index 3f52fd670..e0f6bc323 100644 --- a/crates/protocol-usb/Cargo.lock +++ b/crates/protocol-usb/Cargo.lock @@ -329,7 +329,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/protocol/crates/schema/Cargo.lock b/crates/protocol/crates/schema/Cargo.lock index 5e323c9f2..5ef116b79 100644 --- a/crates/protocol/crates/schema/Cargo.lock +++ b/crates/protocol/crates/schema/Cargo.lock @@ -1020,12 +1020,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", - "memchr", "ryu", "serde", ] diff --git a/crates/runner-host/Cargo.lock b/crates/runner-host/Cargo.lock index f9e7d6e1f..10f36e2c1 100644 --- a/crates/runner-host/Cargo.lock +++ b/crates/runner-host/Cargo.lock @@ -1778,9 +1778,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", @@ -2394,7 +2394,7 @@ dependencies = [ [[package]] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" dependencies = [ "num_enum", "paste", @@ -2467,7 +2467,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/runner-host/crates/web-client/Cargo.lock b/crates/runner-host/crates/web-client/Cargo.lock index 79f87f70e..975755dd7 100644 --- a/crates/runner-host/crates/web-client/Cargo.lock +++ b/crates/runner-host/crates/web-client/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -946,9 +946,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", diff --git a/crates/runner-host/crates/web-server/Cargo.lock b/crates/runner-host/crates/web-server/Cargo.lock index 6abfe2b22..b49e6689c 100644 --- a/crates/runner-host/crates/web-server/Cargo.lock +++ b/crates/runner-host/crates/web-server/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -738,9 +738,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", diff --git a/crates/runner-nordic/Cargo.lock b/crates/runner-nordic/Cargo.lock index ad0167448..6e8dfd116 100644 --- a/crates/runner-nordic/Cargo.lock +++ b/crates/runner-nordic/Cargo.lock @@ -1191,7 +1191,7 @@ dependencies = [ [[package]] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" dependencies = [ "num_enum", "paste", @@ -1253,7 +1253,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/scheduler/CHANGELOG.md b/crates/scheduler/CHANGELOG.md index 41712cfd0..46e0c63ad 100644 --- a/crates/scheduler/CHANGELOG.md +++ b/crates/scheduler/CHANGELOG.md @@ -177,4 +177,4 @@ ## 0.1.0 - + diff --git a/crates/scheduler/Cargo.lock b/crates/scheduler/Cargo.lock index 3d8b2b6e8..c53fe7512 100644 --- a/crates/scheduler/Cargo.lock +++ b/crates/scheduler/Cargo.lock @@ -777,7 +777,7 @@ dependencies = [ [[package]] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" dependencies = [ "num_enum", "paste", @@ -828,7 +828,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml index 136fe928b..b77307a81 100644 --- a/crates/scheduler/Cargo.toml +++ b/crates/scheduler/Cargo.toml @@ -28,11 +28,11 @@ wasefire-error = { version = "0.1.2", path = "../error" } wasefire-logger = { version = "0.1.6", path = "../logger" } wasefire-one-of = { version = "0.1.0", path = "../one-of" } wasefire-protocol = { version = "0.2.0", path = "../protocol", features = ["device"] } -wasefire-store = { version = "0.3.0", path = "../store", optional = true } +wasefire-store = { version = "0.3.1-git", path = "../store", optional = true } wasefire-sync = { version = "0.1.1", path = "../sync", optional = true } [dependencies.wasefire-interpreter] -version = "0.3.1" +version = "0.3.2-git" path = "../interpreter" features = ["toctou"] optional = true diff --git a/crates/store/CHANGELOG.md b/crates/store/CHANGELOG.md index 91b75ce48..eb7e351b1 100644 --- a/crates/store/CHANGELOG.md +++ b/crates/store/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.3.1-git + +### Patch + +- Fix clippy lints + ## 0.3.0 ### Major diff --git a/crates/store/Cargo.lock b/crates/store/Cargo.lock index b887249cd..e1a4f56d9 100644 --- a/crates/store/Cargo.lock +++ b/crates/store/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "bitflags" @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "tempfile", "wasefire-error", diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index 3032a4317..b0217ea44 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" authors = ["Julien Cretin "] license = "Apache-2.0" publish = true diff --git a/crates/store/fuzz/Cargo.lock b/crates/store/fuzz/Cargo.lock index 1bd4e904a..f18b5f10a 100644 --- a/crates/store/fuzz/Cargo.lock +++ b/crates/store/fuzz/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "arbitrary" @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/crates/store/src/store.rs b/crates/store/src/store.rs index 9b80d95c3..b5073bf64 100644 --- a/crates/store/src/store.rs +++ b/crates/store/src/store.rs @@ -870,7 +870,7 @@ impl Store { _ => continue, }; let pos = self.format.page_head(init, page); - if best.map_or(true, |x| pos.cmp(&x) == ordering) { + if best.is_none_or(|x| pos.cmp(&x) == ordering) { best = Some(pos); } } @@ -955,7 +955,7 @@ impl Store { } *pos += 1 + length; ParsedEntry::User(header) - } else if footer.map_or(true, |x| is_erased(&x)) { + } else if footer.is_none_or(|x| is_erased(&x)) { self.parse_partial(pos) } else { *pos += 1 + length; diff --git a/crates/wasm-bench/Cargo.lock b/crates/wasm-bench/Cargo.lock index 07283958d..5e375ada2 100644 --- a/crates/wasm-bench/Cargo.lock +++ b/crates/wasm-bench/Cargo.lock @@ -61,12 +61,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - [[package]] name = "az" version = "1.2.1" @@ -247,18 +241,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540b193ff98b825a1f250a75b3118911af918a734154c69d80bcfcf91e7e9522" +checksum = "2ba4f80548f22dc9c43911907b5e322c5555544ee85f785115701e6a28c9abe1" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb269598b9557ab942d687d3c1086d77c4b50dcf35813f3a65ba306fd42279" +checksum = "005884e3649c3e5ff2dc79e8a94b138f11569cc08a91244a292714d2a86e9156" dependencies = [ "serde", "serde_derive", @@ -266,9 +260,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46566d7c83a8bff4150748d66020f4c7224091952aa4b4df1ec4959c39d937a1" +checksum = "fe4036255ec33ce9a37495dfbcfc4e1118fd34e693eff9a1e106336b7cd16a9b" dependencies = [ "bumpalo", "cranelift-bforest", @@ -283,39 +277,40 @@ dependencies = [ "log", "regalloc2", "rustc-hash 2.0.0", + "serde", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df8a86a34236cc75a8a6a271973da779c2aeb36c43b6e14da474cf931317082" +checksum = "f7ca74f4b68319da11d39e894437cb6e20ec7c2e11fbbda823c3bf207beedff7" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf75340b6a57b7c7c1b74f10d3d90883ee6d43a554be8131a4046c2ebcf5eb65" +checksum = "897e54f433a0269c4187871aa06d452214d5515d228d5bdc22219585e9eef895" [[package]] name = "cranelift-control" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e84495bc5d23d86aad8c86f8ade4af765b94882af60d60e271d3153942f1978" +checksum = "29cb4018f5bf59fb53f515fa9d80e6f8c5ce19f198dc538984ebd23ecf8965ec" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963c17147b80df351965e57c04d20dbedc85bcaf44c3436780a59a3f1ff1b1c2" +checksum = "305399fd781a2953ac78c1396f02ff53144f39c33eb7fc7789cf4e8936d13a96" dependencies = [ "cranelift-bitset", "serde", @@ -324,9 +319,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727f02acbc4b4cb2ba38a6637101d579db50190df1dd05168c68e762851a3dd5" +checksum = "9230b460a128d53653456137751d27baf567947a3ab8c0c4d6e31fd08036d81e" dependencies = [ "cranelift-codegen", "log", @@ -336,15 +331,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b00cc2e03c748f2531eea01c871f502b909d30295fdcad43aec7bf5c5b4667" +checksum = "b961e24ae3ec9813a24a15ae64bbd2a42e4de4d79a7f3225a412e3b94e78d1c8" [[package]] name = "cranelift-native" -version = "0.113.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbeaf978dc7c1a2de8bbb9162510ed218eb156697bc45590b8fbdd69bb08e8de" +checksum = "4d5bd76df6c9151188dfa428c863b33da5b34561b67f43c0cf3f24a794f9fa1f" dependencies = [ "cranelift-codegen", "libc", @@ -595,12 +590,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - [[package]] name = "itertools" version = "0.12.1" @@ -790,15 +779,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "num_enum" version = "0.7.2" @@ -839,11 +819,12 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "panic-rtt-target" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608d1d809dd8960d5e8364981279c7ab280a13d98b99eae049885a7ab2b1cbfe" +checksum = "9a8116ffce1f89818647b84fba66d16cfdf3c0bee3c9320e606588d3e7415ce7" dependencies = [ "critical-section", + "portable-atomic", "rtt-target", ] @@ -899,9 +880,9 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33e7f8a43ccc7f93b330fef4baf271764674926f3f4d40f4a196d54de8af26" +checksum = "a3b8d81cf799e20564931e9867ca32de545188c6ee4c2e0f6e41d32f0c7dc6fb" dependencies = [ "cranelift-bitset", "log", @@ -1031,11 +1012,12 @@ dependencies = [ [[package]] name = "rtt-target" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b34c9e6832388e45f3c01f1bb60a016384a0a4ad80cdd7d34913bed25037f0" +checksum = "4235cd78091930e907d2a510adb0db1369e82668eafa338f109742fa0c83059d" dependencies = [ "critical-section", + "portable-atomic", "ufmt-write", ] @@ -1122,9 +1104,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", @@ -1176,16 +1158,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "string-interner" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" -dependencies = [ - "cfg-if", - "hashbrown", -] - [[package]] name = "strsim" version = "0.8.0" @@ -1353,7 +1325,7 @@ dependencies = [ [[package]] name = "wasefire-interpreter" -version = "0.3.1" +version = "0.3.2-git" dependencies = [ "libm", "num_enum", @@ -1383,11 +1355,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a" +checksum = "29cbbd772edcb8e7d524a82ee8cef8dd046fc14033796a754c3ad246d019fa54" dependencies = [ "leb128", + "wasmparser 0.219.1", ] [[package]] @@ -1412,9 +1385,9 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07e84e3bcdab2f4301827623260ada2557596ca462f7470b60f5182a25270b1" +checksum = "a19af97fcb96045dd1d6b4d23e2b4abdbbe81723dbc5c9f016eb52145b320063" dependencies = [ "arrayvec", "multi-stash", @@ -1423,46 +1396,39 @@ dependencies = [ "wasmi_collections", "wasmi_core", "wasmi_ir", - "wasmparser-nostd", + "wasmparser 0.221.2", ] [[package]] name = "wasmi_collections" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0fd5f4f2c4fe0c98554bb7293108ed2b1d0c124dce0974f999de7d517d37bc" -dependencies = [ - "ahash", - "hashbrown", - "string-interner", -] +checksum = "e80d6b275b1c922021939d561574bf376613493ae2b61c6963b15db0e8813562" [[package]] name = "wasmi_core" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a5f7bbd933a0fb3bac6c541f8bd90c0c8adcd91bb3ac088a2088995325b3d9" +checksum = "3a8c51482cc32d31c2c7ff211cd2bedd73c5bd057ba16a2ed0110e7a96097c33" dependencies = [ "downcast-rs", "libm", - "num-traits", - "paste", ] [[package]] name = "wasmi_ir" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3345445247388df2b5b35250a30c9209c27c8d2c6db1bf4c89b65636264bf9" +checksum = "6e431a14c186db59212a88516788bd68ed51f87aa1e08d1df742522867b5289a" dependencies = [ "wasmi_core", ] [[package]] name = "wasmparser" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc" +checksum = "5c771866898879073c53b565a6c7b49953795159836714ac56a5befb581227c5" dependencies = [ "ahash", "bitflags 2.6.0", @@ -1473,30 +1439,30 @@ dependencies = [ ] [[package]] -name = "wasmparser-nostd" -version = "0.100.2" +name = "wasmparser" +version = "0.221.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" +checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" dependencies = [ - "indexmap-nostd", + "bitflags 2.6.0", ] [[package]] name = "wasmprinter" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ace089155491837b75f474bf47c99073246d1b737393fe722d6dee311595ddc" +checksum = "228cdc1f30c27816da225d239ce4231f28941147d34713dee8f1fff7cb330e54" dependencies = [ "anyhow", "termcolor", - "wasmparser", + "wasmparser 0.219.1", ] [[package]] name = "wasmtime" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e762e163fd305770c6c341df3290f0cabb3c264e7952943018e9a1ced8d917" +checksum = "5b79302e3e084713249cc5622e8608e7410afdeeea8c8026d04f491d1fab0b4b" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -1522,7 +1488,7 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasmparser", + "wasmparser 0.219.1", "wasmtime-asm-macros", "wasmtime-component-macro", "wasmtime-cranelift", @@ -1535,18 +1501,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63caa7aebb546374e26257a1900fb93579171e7c02514cde26805b9ece3ef812" +checksum = "fe53a24e7016a5222875d8ca3ad6024b464465985693c42098cd0bb710002c28" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-component-macro" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a4b5ce2ad9c15655e830f0eac0c38b8def30c74ecac71f452d3901e491b68" +checksum = "e118acbd2bc09b32ad8606bc7cef793bf5019c1b107772e64dc6c76b5055d40b" dependencies = [ "anyhow", "proc-macro2", @@ -1559,15 +1525,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e87a1212270dbb84a49af13d82594e00a92769d6952b0ea7fc4366c949f6ad" +checksum = "4a6db4f3ee18c699629eabb9c64e77efe5a93a5137f098db7cab295037ba41c2" [[package]] name = "wasmtime-cranelift" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb40dddf38c6a5eefd5ce7c1baf43b00fe44eada11a319fab22e993a960262f" +checksum = "8b87e6c78f562b50aff1afd87ff32a57e241424c846c1c8f3c5fd352d2d62906" dependencies = [ "anyhow", "cfg-if", @@ -1583,16 +1549,16 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.219.1", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8613075e89e94a48c05862243c2b718eef1b9c337f51493ebf951e149a10fa19" +checksum = "c25bfeaa16432d59a0706e2463d315ef4c9ebcfaf5605670b99d46373bdf9f27" dependencies = [ "anyhow", "cranelift-bitset", @@ -1607,15 +1573,15 @@ dependencies = [ "smallvec", "target-lexicon", "wasm-encoder", - "wasmparser", + "wasmparser 0.219.1", "wasmprinter", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da47fba49af72581bc0dc67c8faaf5ee550e6f106e285122a184a675193701a5" +checksum = "91b218a92866f74f35162f5d03a4e0f62cd0e1cc624285b1014275e5d4575fad" dependencies = [ "anyhow", "cfg-if", @@ -1625,15 +1591,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770e10cdefb15f2b6304152978e115bd062753c1ebe7221c0b6b104fa0419ff6" +checksum = "4d5f8acf677ee6b3b8ba400dd9753ea4769e56a95c4b30b045ac6d2d54b2f8ea" [[package]] name = "wasmtime-versioned-export-macros" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8efb877c9e5e67239d4553bb44dd2a34ae5cfb728f3cf2c5e64439c6ca6ee7" +checksum = "df09be00c38f49172ca9936998938476e3f2df782673a39ae2ef9fb0838341b6" dependencies = [ "proc-macro2", "quote", @@ -1642,9 +1608,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bef2a726fd8d1ee9b0144655e16c492dc32eb4c7c9f7e3309fcffe637870933" +checksum = "bf3963c9c29df91564d8bd181eb00d0dbaeafa1b2a01e15952bb7391166b704e" dependencies = [ "anyhow", "heck", @@ -1779,9 +1745,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "wit-parser" -version = "0.218.0" +version = "0.219.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d1066ab761b115f97fef2b191090faabcb0f37b555b758d3caf42d4ed9e55" +checksum = "4a86f669283257e8e424b9a4fc3518e3ade0b95deb9fbc0f93a1876be3eda598" dependencies = [ "anyhow", "id-arena", @@ -1792,7 +1758,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.219.1", ] [[package]] diff --git a/crates/wasm-bench/Cargo.toml b/crates/wasm-bench/Cargo.toml index 6d032313b..318c29128 100644 --- a/crates/wasm-bench/Cargo.toml +++ b/crates/wasm-bench/Cargo.toml @@ -11,12 +11,12 @@ cortex-m = { version = "0.7.7", features = ["critical-section-single-core"], opt cortex-m-rt = { version = "0.7.3", optional = true } embedded-alloc = { version = "0.6.0", optional = true } nrf52840-hal = { version = "0.18.0", optional = true } -panic-rtt-target = { version = "0.1.3", optional = true } +panic-rtt-target = { version = "0.2.0", optional = true } riscv = { version = "0.12.1", features = ["critical-section-single-hart"], optional = true } riscv-rt = { version = "0.13.0", optional = true } -rtt-target = { version = "0.5.0", optional = true } +rtt-target = { version = "0.6.1", optional = true } wasefire-interpreter = { path = "../interpreter", features = ["float-types"], optional = true } -wasmi = { version = "0.38.0", default-features = false, optional = true } +wasmi = { version = "0.40.0", default-features = false, optional = true } [dependencies.portable-atomic] version = "1.6.0" @@ -31,7 +31,7 @@ features = ["build-bindgen", "use-32bit-slots"] optional = true [dependencies.wasmtime] -version = "26.0.1" +version = "27.0.0" default-features = false features = ["cranelift", "runtime"] optional = true diff --git a/crates/xtask/Cargo.lock b/crates/xtask/Cargo.lock index 75f8fe497..fbf0eb8d6 100644 --- a/crates/xtask/Cargo.lock +++ b/crates/xtask/Cargo.lock @@ -215,7 +215,7 @@ checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -250,16 +250,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror", + "thiserror 2.0.4", ] [[package]] @@ -305,7 +305,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -484,7 +484,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -514,7 +514,7 @@ checksum = "4673f83edb6dfabfbc26704bd89ee95f4b164cd5db5fe8c88efda48fb0fca8d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -589,7 +589,7 @@ dependencies = [ "serde", "serde_plain", "strum", - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -609,7 +609,7 @@ dependencies = [ "serde", "sha2", "strum", - "thiserror", + "thiserror 1.0.61", "xmas-elf 0.9.1", ] @@ -1220,7 +1220,7 @@ checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ "cfg-if", "miette-derive", - "thiserror", + "thiserror 1.0.61", "unicode-width", ] @@ -1232,7 +1232,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -1325,7 +1325,7 @@ checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -1398,7 +1398,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -1543,7 +1543,7 @@ dependencies = [ "serde_yaml", "static_assertions", "svg", - "thiserror", + "thiserror 1.0.61", "tracing", "typed-path", "uf2-decode", @@ -1575,9 +1575,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -1863,17 +1863,16 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", - "memchr", "ryu", "serde", ] @@ -2027,7 +2026,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -2055,9 +2054,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2108,7 +2107,16 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.61", +] + +[[package]] +name = "thiserror" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +dependencies = [ + "thiserror-impl 2.0.4", ] [[package]] @@ -2119,7 +2127,18 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] @@ -2163,7 +2182,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -2271,7 +2290,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -2486,7 +2505,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] @@ -2505,7 +2524,7 @@ version = "0.1.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -2536,7 +2555,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -2570,7 +2589,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2855,7 +2874,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] diff --git a/crates/xtask/src/main.rs b/crates/xtask/src/main.rs index eec64d235..00f3dcdc3 100644 --- a/crates/xtask/src/main.rs +++ b/crates/xtask/src/main.rs @@ -482,7 +482,7 @@ impl RunnerOptions { if main.release { cargo.arg("-Zbuild-std=core,alloc"); let mut features = "-Zbuild-std-features=panic_immediate_abort".to_string(); - if self.opt_level.map_or(false, action::OptLevel::optimize_for_size) { + if self.opt_level.is_some_and(action::OptLevel::optimize_for_size) { features.push_str(",optimize_for_size"); } cargo.arg(features); @@ -744,7 +744,7 @@ async fn wrap_command() -> Result { } async fn ensure_assemblyscript() -> Result<()> { - const ASC_VERSION: &str = "0.27.30"; // scripts/upgrade.sh relies on this name + const ASC_VERSION: &str = "0.27.31"; // scripts/upgrade.sh relies on this name const BIN: &str = "examples/assemblyscript/node_modules/.bin/asc"; const JSON: &str = "examples/assemblyscript/node_modules/assemblyscript/package.json"; if fs::exists(BIN).await && fs::exists(JSON).await { diff --git a/examples/rust/hsm/common/Cargo.lock b/examples/rust/hsm/common/Cargo.lock index 1f8c78a29..be70e09da 100644 --- a/examples/rust/hsm/common/Cargo.lock +++ b/examples/rust/hsm/common/Cargo.lock @@ -19,7 +19,7 @@ checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -93,7 +93,7 @@ checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -104,9 +104,9 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -128,7 +128,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -164,22 +164,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] @@ -232,7 +232,7 @@ dependencies = [ "data-encoding-macro", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.90", ] [[package]] diff --git a/examples/rust/hsm/common/Cargo.toml b/examples/rust/hsm/common/Cargo.toml index 730ea81dd..22b4172f1 100644 --- a/examples/rust/hsm/common/Cargo.toml +++ b/examples/rust/hsm/common/Cargo.toml @@ -6,7 +6,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -thiserror = { version = "1.0.61", optional = true } +thiserror = { version = "2.0.4", optional = true } wasefire = { path = "../../../../crates/prelude", optional = true } [features] diff --git a/examples/rust/hsm/host/Cargo.lock b/examples/rust/hsm/host/Cargo.lock index 0cc01d06c..526088fee 100644 --- a/examples/rust/hsm/host/Cargo.lock +++ b/examples/rust/hsm/host/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -134,7 +134,7 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" name = "common" version = "0.1.0" dependencies = [ - "thiserror", + "thiserror 2.0.4", ] [[package]] @@ -272,9 +272,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -350,9 +350,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -365,7 +365,16 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.61", +] + +[[package]] +name = "thiserror" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +dependencies = [ + "thiserror-impl 2.0.4", ] [[package]] @@ -379,13 +388,24 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "unescaper" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0adf6ad32eb5b3cadff915f7b770faaac8f7ff0476633aa29eb0d9584d889d34" dependencies = [ - "thiserror", + "thiserror 1.0.61", ] [[package]] diff --git a/examples/rust/protocol/host/Cargo.lock b/examples/rust/protocol/host/Cargo.lock index 7fbcb09c3..56b991c56 100644 --- a/examples/rust/protocol/host/Cargo.lock +++ b/examples/rust/protocol/host/Cargo.lock @@ -594,7 +594,7 @@ dependencies = [ [[package]] name = "wasefire-store" -version = "0.3.0" +version = "0.3.1-git" dependencies = [ "wasefire-error", ] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 17f00058b..ef9a22634 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2024-10-29" +channel = "nightly-2024-12-04" components = ["clippy", "llvm-tools", "miri", "rust-src", "rustfmt"] targets = [ "i686-unknown-linux-gnu", diff --git a/scripts/sync.sh b/scripts/sync.sh index 438e5d36d..895ae3276 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -39,6 +39,11 @@ for dir in $(find crates -name Cargo.toml -printf '%h\n' | sort); do case $crate in board|one-of|prelude) add_lint $file warn rust.missing-docs ;; esac + # TODO(bytemuck > 1.20.0): Remove. + case $crate in + board) echo 'rust.unexpected_cfgs = { level = "allow", check-cfg = '\ +'["cfg(target_arch, values(\"spirv\"))"] }' >> $file ;; + esac # TODO: Enable for all crates. case $crate in interpreter|runner-*|scheduler|xtask|*/fuzz) ;; diff --git a/scripts/wrapper.sh b/scripts/wrapper.sh index 2f8f056c7..08fefecd3 100755 --- a/scripts/wrapper.sh +++ b/scripts/wrapper.sh @@ -49,11 +49,11 @@ case "$1" in *) e "Wrapper does not support 'cargo $2'" ;; esac ;; - mdbook) ensure_cargo mdbook 0.4.40 ;; + mdbook) ensure_cargo mdbook 0.4.43 ;; probe-rs) ensure_cargo probe-rs-tools 0.24.0 ;; rust-objcopy|rust-size) ensure_cargo cargo-binutils 0.3.6 ;; taplo) ensure_cargo taplo-cli 0.9.3 ;; - trunk) ensure_cargo trunk 0.21.1 ;; + trunk) ensure_cargo trunk 0.21.4 ;; twiggy) ensure_cargo twiggy 0.7.0 ;; *) IS_CARGO=n ;; esac diff --git a/third_party/SchemaStore/schemastore b/third_party/SchemaStore/schemastore index f92e99dc9..b49459dc8 160000 --- a/third_party/SchemaStore/schemastore +++ b/third_party/SchemaStore/schemastore @@ -1 +1 @@ -Subproject commit f92e99dc9ddbd444ee6c1b346feb1ed746a5682f +Subproject commit b49459dc8f90228c7f44645ea859d57f75c880d9 diff --git a/third_party/WebAssembly/spec b/third_party/WebAssembly/spec index 85a7ccb03..06a88d08c 160000 --- a/third_party/WebAssembly/spec +++ b/third_party/WebAssembly/spec @@ -1 +1 @@ -Subproject commit 85a7ccb0307fb1284ea22f74cd77bd833ec25440 +Subproject commit 06a88d08cf0b1cf7f16d877f27ee25e1f5e09187