Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Update some deps on their major version tracks (#13570)

Alex Crichtondc201782dade
diff --git a/Cargo.lock b/Cargo.lock
index f5e04383bc..d904a78746 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -646,9 +646,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "cpp_demangle"
-version = "0.4.3"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
+checksum = "0667304c32ea56cb4cd6d2d7c0cfe9a2f8041229db8c033af7f8d69492429def"
dependencies = [
"cfg-if",
]
@@ -2427,9 +2427,9 @@ dependencies = [
[[package]]
name = "mutatis"
-version = "0.4.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645a17bdae66c8ee0fdba0004ab864cbd711bec41aae4c466ce0d35e266c946e"
+checksum = "cda9aa1c47053dd102896e1f3e69d0cec502e3467af8c3ab3b58702cc62197ef"
dependencies = [
"log",
"mutatis-derive",
@@ -2438,9 +2438,9 @@ dependencies = [
[[package]]
name = "mutatis-derive"
-version = "0.4.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2c58c651085c4319cd3554f44541dcf1be8daa0481c9089de50926750623e7"
+checksum = "1a3c893cbc8cc5b87607ed340786512781aff5d8d7ede9f43a82464f5c7c2390"
dependencies = [
"proc-macro2",
"quote",
@@ -3449,9 +3449,12 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "similar"
-version = "2.7.0"
+version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+checksum = "e6505efef05804732ed8a3f2d4f279429eb485bd69d5b0cc6b19cc02005cda16"
+dependencies = [
+ "bstr",
+]
[[package]]
name = "slab"
@@ -5267,9 +5270,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.1"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
dependencies = [
"rustls-pki-types",
]
diff --git a/Cargo.toml b/Cargo.toml
index aecd9a782e..56d51e331d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -376,7 +376,7 @@ wasip2 = "1.0"
arbitrary = "1.4.2"
backtrace = "0.3.76"
bumpalo = "3.20.2"
-mutatis = {version = "0.4.0", features = ["alloc", "derive", "check"] }
+mutatis = { version = "0.5.2", features = ["alloc", "derive", "check"] }
cc = "1.2.41"
object = { version = "0.39.0", default-features = false, features = ['read_core', 'elf'] }
gimli = { version = "0.33.0", default-features = false, features = ['read'] }
@@ -396,7 +396,7 @@ bitflags = "2.9.4"
thiserror = "2.0.17"
async-trait = "0.1.89"
heck = "0.5"
-similar = "2.7.0"
+similar = "3.1.1"
toml = "0.9.8"
mach2 = "0.6"
memfd = "0.6.5"
@@ -443,7 +443,7 @@ native-tls = "0.2.11"
tokio-openssl = "0.6.5"
openssl = "0.10.80"
openssl-sys = "0.9.116"
-webpki-roots = "0.26.0"
+webpki-roots = "1.0.7"
itertools = "0.14.0"
base64 = "0.22.1"
termcolor = "1.4.1"
diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml
index c3b3745e31..fad20aff60 100644
--- a/cranelift/codegen/Cargo.toml
+++ b/cranelift/codegen/Cargo.toml
@@ -52,7 +52,7 @@ libm = { workspace = true }
[dev-dependencies]
criterion = { workspace = true }
-similar = "2.1.0"
+similar = { workspace = true }
env_logger = { workspace = true }
proptest = { workspace = true }
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index d3196c3d42..aecdb45fab 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -20,7 +20,7 @@ all-features = true
[dependencies]
anyhow = { workspace = true }
postcard = { workspace = true }
-cpp_demangle = { version = "0.4.3", default-features = false, features = ['alloc'], optional = true }
+cpp_demangle = { version = "0.5.1", default-features = false, features = ['alloc'], optional = true }
cranelift-entity = { workspace = true, features = ['enable-serde'] }
cranelift-bitset = { workspace = true, features = ['enable-serde'] }
cranelift-bforest = { workspace = true }
diff --git a/crates/environ/src/demangling.rs b/crates/environ/src/demangling.rs
index d9a88aa44b..e9648bd44c 100644
--- a/crates/environ/src/demangling.rs
+++ b/crates/environ/src/demangling.rs
@@ -8,8 +8,7 @@ pub fn demangle_function_name(writer: &mut impl core::fmt::Write, name: &str) ->
if let Ok(demangled) = rustc_demangle::try_demangle(name) {
return write!(writer, "{demangled}");
} else if let Ok(symbol) = cpp_demangle::Symbol::new(name) {
- let options = cpp_demangle::DemangleOptions::default();
- if let Ok(demangled) = symbol.demangle(&options) {
+ if let Ok(demangled) = symbol.demangle() {
return write!(writer, "{demangled}");
}
}
diff --git a/crates/fuzzing/src/generators/exception_ops.rs b/crates/fuzzing/src/generators/exception_ops.rs
index c3f5e788b0..78993d7900 100644
--- a/crates/fuzzing/src/generators/exception_ops.rs
+++ b/crates/fuzzing/src/generators/exception_ops.rs
@@ -565,41 +565,6 @@ impl DefaultMutate for CatchKind {
type DefaultMutate = EnumMutator;
}
-impl Generate<TagSig> for TagSigMutator {
- fn generate(&mut self, ctx: &mut Context) -> MutResult<TagSig> {
- let count = ctx.rng().gen_index(MAX_TAG_PARAMS).unwrap_or(0) + 1;
- let params = (0..count)
- .map(|_| EnumMutator.generate(ctx))
- .collect::<MutResult<Vec<_>>>()?;
- Ok(TagSig { params })
- }
-}
-
-impl Generate<Scenario> for ScenarioMutator {
- fn generate(&mut self, ctx: &mut Context) -> MutResult<Scenario> {
- let mut m = mutatis::mutators::u32();
- Ok(Scenario {
- throw_tag: mutatis::Generate::<u32>::generate(&mut m, ctx)?,
- throw_depth: mutatis::Generate::<u32>::generate(&mut m, ctx)?,
- catch_depth: mutatis::Generate::<u32>::generate(&mut m, ctx)?,
- catch_kind: EnumMutator.generate(ctx)?,
- decoy_catches: vec![],
- decoy_catches_after: vec![],
- })
- }
-}
-
-impl Generate<ExceptionOps> for ExceptionOpsMutator {
- fn generate(&mut self, _ctx: &mut Context) -> MutResult<ExceptionOps> {
- let mut ops = ExceptionOps::default();
- let mut session = mutatis::Session::new();
- for _ in 0..32 {
- session.mutate(&mut ops)?;
- }
- Ok(ops)
- }
-}
-
#[cfg(test)]
mod tests {
use super::*;
diff --git a/deny.toml b/deny.toml
index 03edc7b394..24f94f3ed9 100644
--- a/deny.toml
+++ b/deny.toml
@@ -20,6 +20,7 @@ allow = [
"MPL-2.0",
"Zlib",
"Unicode-3.0",
+ "CDLA-Permissive-2.0",
]
[[licenses.clarify]]
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 2c35712b4d..f43511a9e6 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -2754,6 +2754,12 @@ criteria = "safe-to-deploy"
delta = "0.3.5 -> 0.4.3"
notes = "No substantive changes to `unsafe` code and otherwise all looks good."
+[[audits.cpp_demangle]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.4.3 -> 0.5.1"
+notes = "API refactors, support for new symbols, nothing awry."
+
[[audits.cpufeatures]]
who = "Alex Crichton <[email protected]>"
criteria = "safe-to-deploy"
@@ -4641,6 +4647,12 @@ who = "Pat Hickey <[email protected]>"
criteria = "safe-to-deploy"
version = "1.4.1"
+[[audits.similar]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "2.7.0 -> 3.1.1"
+notes = "Lots of crate changes, new algorithms, etc, but nothing awry. No `unsafe` changes"
+
[[audits.sized-chunks]]
who = "Nick Fitzgerald <[email protected]>"
criteria = "safe-to-deploy"
@@ -6311,6 +6323,12 @@ who = "Pat Hickey <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.23.0 -> 0.25.2"
+[[audits.webpki-roots]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.26.1 -> 1.0.7"
+notes = "Minor changes, new certs, etc. Nothing major"
+
[[audits.which]]
who = "Alex Crichton <[email protected]>"
criteria = "safe-to-run"