Skip to content

Commit 557cc2d

Browse files
authored
Another batch of dependency updates (#11832)
* Another batch of dependency updates Bringing some deps in `Cargo.toml` up-to-date with their latest versions along the same lines as #11820 to avoid deps getting too stale/old. Code-wise this updates `anyhow` which enables preexisting Clippy warnings to check more code, so those warnings are fixed here as well. prtest:full * Run rustfmt
1 parent 179a915 commit 557cc2d

File tree

54 files changed

+1000
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1000
-578
lines changed

Cargo.lock

Lines changed: 287 additions & 236 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ tempfile = { workspace = true }
100100
tokio = { workspace = true, features = ["rt", "time", "macros", "rt-multi-thread"] }
101101
wast = { workspace = true }
102102
criterion = { workspace = true }
103-
num_cpus = "1.13.0"
103+
num_cpus = "1.17.0"
104104
memchr = "2.4"
105105
async-trait = { workspace = true }
106106
wat = { workspace = true }
@@ -319,8 +319,8 @@ cap-fs-ext = "3.4.4"
319319
cap-net-ext = "3.4.4"
320320
cap-time-ext = "3.4.4"
321321
cap-tempfile = "3.4.4"
322-
fs-set-times = "0.20.1"
323-
system-interface = { version = "0.27.1", features = ["cap_std_impls"] }
322+
fs-set-times = "0.20.3"
323+
system-interface = { version = "0.27.3", features = ["cap_std_impls"] }
324324
io-lifetimes = { version = "2.0.3", default-features = false }
325325
io-extras = "0.18.1"
326326
rustix = "1.0.8"
@@ -344,66 +344,66 @@ json-from-wast = "0.240.0"
344344

345345
# Non-Bytecode Alliance maintained dependencies:
346346
# --------------------------
347-
arbitrary = "1.4.0"
347+
arbitrary = "1.4.2"
348348
mutatis = "0.3.2"
349-
cc = "1.0"
349+
cc = "1.2.41"
350350
object = { version = "0.37.3", default-features = false, features = ['read_core', 'elf'] }
351-
gimli = { version = "0.32.0", default-features = false, features = ['read'] }
352-
addr2line = { version = "0.25.0", default-features = false }
353-
anyhow = { version = "1.0.93", default-features = false }
351+
gimli = { version = "0.32.3", default-features = false, features = ['read'] }
352+
addr2line = { version = "0.25.1", default-features = false }
353+
anyhow = { version = "1.0.100", default-features = false }
354354
windows-sys = "0.60.2"
355355
env_logger = "0.11.5"
356-
log = { version = "0.4.27", default-features = false }
356+
log = { version = "0.4.28", default-features = false }
357357
clap = { version = "4.5.48", default-features = false, features = ["std", "derive"] }
358358
clap_complete = "4.5.58"
359359
hashbrown = { version = "0.15", default-features = false }
360360
capstone = "0.13.0"
361-
smallvec = { version = "1.6.1", features = ["union"] }
362-
tracing = "0.1.26"
361+
smallvec = { version = "1.15.1", features = ["union"] }
362+
tracing = "0.1.41"
363363
bitflags = "2.9.4"
364-
thiserror = "2.0.12"
365-
async-trait = "0.1.71"
364+
thiserror = "2.0.17"
365+
async-trait = "0.1.89"
366366
heck = "0.5"
367-
similar = "2.1.0"
368-
toml = "0.8.10"
367+
similar = "2.7.0"
368+
toml = "0.9.8"
369369
mach2 = "0.4.2"
370-
memfd = "0.6.2"
370+
memfd = "0.6.5"
371371
psm = "0.1.11"
372372
proptest = "1.0.0"
373373
rand = { version = "0.9.2", features = ["small_rng"] }
374374
# serde and serde_derive must have the same version
375-
serde = { version = "1.0.215", default-features = false, features = ['alloc'] }
376-
serde_derive = "1.0.188"
375+
serde = { version = "1.0.228", default-features = false, features = ['alloc'] }
376+
serde_derive = "1.0.228"
377377
serde_json = "1.0.80"
378-
glob = "0.3.0"
379-
libfuzzer-sys = "0.4.8"
380-
walkdir = "2.3.3"
378+
glob = "0.3.3"
379+
libfuzzer-sys = "0.4.10"
380+
walkdir = "2.5.0"
381381
cfg-if = "1.0"
382-
tempfile = "3.21.0"
382+
tempfile = "3.23.0"
383383
filecheck = "0.5.0"
384-
libc = { version = "0.2.176", default-features = true }
384+
libc = { version = "0.2.177", default-features = true }
385385
file-per-thread-logger = "0.2.0"
386-
tokio = { version = "1.43.0", features = [ "rt", "time" ] }
387-
hyper = "1.0.1"
388-
http = "1.0.0"
389-
http-body = "1.0.0"
390-
http-body-util = "0.1.0"
391-
bytes = { version = "1.4", default-features = false }
392-
futures = { version = "0.3.27", default-features = false }
393-
indexmap = { version = "2.0.0", default-features = false }
386+
tokio = { version = "1.47.1", features = [ "rt", "time" ] }
387+
hyper = "1.7.0"
388+
http = "1.3.1"
389+
http-body = "1.0.1"
390+
http-body-util = "0.1.3"
391+
bytes = { version = "1.10.1", default-features = false }
392+
futures = { version = "0.3.31", default-features = false }
393+
indexmap = { version = "2.11.4", default-features = false }
394394
syn = "2.0.106"
395-
quote = "1.0"
396-
proc-macro2 = "1.0"
397-
test-log = { version = "0.2", default-features = false, features = ["trace"] }
398-
tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter', 'ansi', 'tracing-log'] }
399-
url = "2.3.1"
400-
postcard = { version = "1.0.8", default-features = false, features = ['alloc'] }
401-
criterion = { version = "0.6.0", default-features = false, features = ["html_reports", "rayon"] }
402-
rustc-hash = "2.0.0"
395+
quote = "1.0.41"
396+
proc-macro2 = "1.0.101"
397+
test-log = { version = "0.2.18", default-features = false, features = ["trace"] }
398+
tracing-subscriber = { version = "0.3.20", default-features = false, features = ['fmt', 'env-filter', 'ansi', 'tracing-log'] }
399+
url = "2.5.7"
400+
postcard = { version = "1.1.3", default-features = false, features = ['alloc'] }
401+
criterion = { version = "0.7.0", default-features = false, features = ["html_reports", "rayon"] }
402+
rustc-hash = "2.1.1"
403403
libtest-mimic = "0.8.1"
404-
semver = { version = "1.0.17", default-features = false }
404+
semver = { version = "1.0.27", default-features = false }
405405
ittapi = "0.4.0"
406-
libm = "0.2.7"
406+
libm = "0.2.15"
407407
tokio-rustls = "0.25.0"
408408
rustls = "0.22.0"
409409
tokio-native-tls = "0.3.1"
@@ -412,9 +412,9 @@ webpki-roots = "0.26.0"
412412
itertools = "0.14.0"
413413
base64 = "0.22.1"
414414
termcolor = "1.4.1"
415-
flate2 = "1.0.30"
416-
tokio-util = "0.7.4"
417-
arbtest = "0.3.1"
415+
flate2 = "1.1.4"
416+
tokio-util = "0.7.16"
417+
arbtest = "0.3.2"
418418

419419
# =============================================================================
420420
#

cranelift/codegen/src/machinst/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ impl<T: CompilePhase> CompiledCodeBase<T> {
502502
return Ok(buf);
503503

504504
fn map_caperr(err: capstone::Error) -> anyhow::Error {
505-
anyhow::format_err!("{}", err)
505+
anyhow::format_err!("{err}")
506506
}
507507
}
508508
}

cranelift/filetests/src/concurrent.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ fn worker_thread(
151151
// The test panicked, leaving us a `Box<Any>`.
152152
// Panics are usually strings.
153153
if let Some(msg) = e.downcast_ref::<String>() {
154-
anyhow::bail!("panicked in worker #{}: {}", thread_num, msg)
154+
anyhow::bail!("panicked in worker #{thread_num}: {msg}")
155155
} else if let Some(msg) = e.downcast_ref::<&'static str>() {
156-
anyhow::bail!("panicked in worker #{}: {}", thread_num, msg)
156+
anyhow::bail!("panicked in worker #{thread_num}: {msg}")
157157
} else {
158-
anyhow::bail!("panicked in worker #{}", thread_num)
158+
anyhow::bail!("panicked in worker #{thread_num}")
159159
}
160160
});
161161

cranelift/filetests/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,5 @@ fn pretty_anyhow_error(
108108
err: cranelift_codegen::CodegenError,
109109
) -> anyhow::Error {
110110
let s = cranelift_codegen::print_errors::pretty_error(func, err);
111-
anyhow::anyhow!("{}", s)
111+
anyhow::anyhow!("{s}")
112112
}

cranelift/filetests/src/runner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ impl TestRunner {
364364
match self.errors {
365365
0 => Ok(()),
366366
1 => anyhow::bail!("1 failure"),
367-
n => anyhow::bail!("{} failures", n),
367+
n => anyhow::bail!("{n} failures"),
368368
}
369369
}
370370

@@ -379,7 +379,7 @@ impl TestRunner {
379379
match self.errors {
380380
0 => Ok(()),
381381
1 => anyhow::bail!("1 failure"),
382-
n => anyhow::bail!("{} failures", n),
382+
n => anyhow::bail!("{n} failures"),
383383
}
384384
}
385385
}

cranelift/filetests/src/test_alias_analysis.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct TestAliasAnalysis;
1616
pub fn subtest(parsed: &TestCommand) -> anyhow::Result<Box<dyn SubTest>> {
1717
assert_eq!(parsed.command, "alias-analysis");
1818
if !parsed.options.is_empty() {
19-
anyhow::bail!("No options allowed on {}", parsed);
19+
anyhow::bail!("No options allowed on {parsed}");
2020
}
2121
Ok(Box::new(TestAliasAnalysis))
2222
}

cranelift/filetests/src/test_cat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct TestCat;
1616
pub fn subtest(parsed: &TestCommand) -> anyhow::Result<Box<dyn SubTest>> {
1717
assert_eq!(parsed.command, "cat");
1818
if !parsed.options.is_empty() {
19-
anyhow::bail!("No options allowed on {}", parsed);
19+
anyhow::bail!("No options allowed on {parsed}");
2020
}
2121
Ok(Box::new(TestCat))
2222
}

cranelift/filetests/src/test_compile.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn subtest(parsed: &TestCommand) -> Result<Box<dyn SubTest>> {
2929
match option {
3030
TestOption::Flag("precise-output") => test.precise_output = true,
3131
TestOption::Flag("expect-fail") => test.expect_fail = true,
32-
_ => anyhow::bail!("unknown option on {}", parsed),
32+
_ => anyhow::bail!("unknown option on {parsed}"),
3333
}
3434
}
3535
Ok(Box::new(test))
@@ -85,9 +85,7 @@ impl SubTest for TestCompile {
8585
disas.disas().to_string()
8686
}
8787
_ => {
88-
let cs = isa
89-
.to_capstone()
90-
.map_err(|e| anyhow::format_err!("{}", e))?;
88+
let cs = isa.to_capstone().map_err(|e| anyhow::format_err!("{e}"))?;
9189
compiled_code.disassemble(Some(&params), &cs)?
9290
}
9391
};

cranelift/filetests/src/test_domtree.rs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct TestDomtree;
2828
pub fn subtest(parsed: &TestCommand) -> anyhow::Result<Box<dyn SubTest>> {
2929
assert_eq!(parsed.command, "domtree");
3030
if !parsed.options.is_empty() {
31-
anyhow::bail!("No options allowed on {}", parsed)
31+
anyhow::bail!("No options allowed on {parsed}")
3232
}
3333
Ok(Box::new(TestDomtree))
3434
}
@@ -61,36 +61,31 @@ impl SubTest for TestDomtree {
6161

6262
let expected_block = match func.layout.inst_block(inst) {
6363
Some(expected_block) => expected_block,
64-
_ => anyhow::bail!("instruction {} is not in layout", inst),
64+
_ => anyhow::bail!("instruction {inst} is not in layout"),
6565
};
6666
for src_block in tail.split_whitespace() {
6767
let block = match context.details.map.lookup_str(src_block) {
6868
Some(AnyEntity::Block(block)) => block,
69-
_ => anyhow::bail!("expected defined block, got {}", src_block),
69+
_ => anyhow::bail!("expected defined block, got {src_block}"),
7070
};
7171

7272
// Annotations say that `expected_block` is the idom of `block`.
7373
if expected.insert(block, expected_block).is_some() {
74-
anyhow::bail!("multiple dominators for {}", src_block);
74+
anyhow::bail!("multiple dominators for {src_block}");
7575
}
7676

7777
// Compare to computed domtree.
7878
match domtree.idom(block) {
7979
Some(got_block) if got_block != expected_block => {
8080
anyhow::bail!(
81-
"mismatching idoms for {}:\n\
82-
want: {}, got: {}",
83-
src_block,
84-
inst,
85-
got_block
81+
"mismatching idoms for {src_block}:\n\
82+
want: {inst}, got: {got_block}"
8683
);
8784
}
8885
None => {
8986
anyhow::bail!(
90-
"mismatching idoms for {}:\n\
91-
want: {}, got: unreachable",
92-
src_block,
93-
inst
87+
"mismatching idoms for {src_block}:\n\
88+
want: {inst}, got: unreachable"
9489
);
9590
}
9691
_ => {}
@@ -109,10 +104,8 @@ impl SubTest for TestDomtree {
109104
{
110105
if let Some(got_block) = domtree.idom(block) {
111106
anyhow::bail!(
112-
"mismatching idoms for renumbered {}:\n\
113-
want: unreachable, got: {}",
114-
block,
115-
got_block
107+
"mismatching idoms for renumbered {block}:\n\
108+
want: unreachable, got: {got_block}"
116109
);
117110
}
118111
}

0 commit comments

Comments
 (0)