Skip to content

Commit 36d30ca

Browse files
committed
Auto merge of #139581 - matthiaskrgr:rollup-d6hph16, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #138869 (Try not to use verbatim paths in `Command::current_dir`) - #138993 (Make `cfg_match!` a semitransparent macro) - #139099 (Promise `array::from_fn` is generated in order of increasing indices) - #139364 (Make the compiler suggest actual paths instead of visible paths if the visible paths are through any doc hidden path.) - #139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`) - #139481 (Add job summary links to post-merge report) - #139573 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 87a75da + 1627623 commit 36d30ca

36 files changed

+789
-801
lines changed

Cargo.lock

+288-276
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ getrandom = { version = "0.3", features = ["std"] }
2222
rand = "0.9"
2323
smallvec = { version = "1.7", features = ["drain_filter"] }
2424
aes = { version = "0.8.3", features = ["hazmat"] }
25-
measureme = "11"
25+
measureme = "12"
2626
chrono = { version = "0.4.38", default-features = false }
2727
chrono-tz = "0.10"
28-
directories = "5"
28+
directories = "6"
2929

3030
# Copied from `compiler/rustc/Cargo.toml`.
3131
# But only for some targets, it fails for others. Rustc configures this in its CI, but we can't
@@ -40,7 +40,7 @@ libffi = "3.2.0"
4040
libloading = "0.8"
4141

4242
[target.'cfg(target_family = "windows")'.dependencies]
43-
windows-sys = { version = "0.52", features = [
43+
windows-sys = { version = "0.59", features = [
4444
"Win32_Foundation",
4545
"Win32_System_IO",
4646
"Win32_Storage_FileSystem",

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ Definite bugs found:
565565
* [Occasional memory leak in `std::mpsc` channels](https://github.com/rust-lang/rust/issues/121582) (original code in [crossbeam](https://github.com/crossbeam-rs/crossbeam/pull/1084))
566566
* [Weak-memory-induced memory leak in Windows thread-local storage](https://github.com/rust-lang/rust/pull/124281)
567567
* [A bug in the new `RwLock::downgrade` implementation](https://rust-lang.zulipchat.com/#narrow/channel/269128-miri/topic/Miri.20error.20library.20test) (caught by Miri before it landed in the Rust repo)
568+
* [Mockall reading unintialized memory when mocking `std::io::Read::read`, even if all expectations are satisfied](https://github.com/asomers/mockall/issues/647) (caught by Miri running Tokio's test suite)
568569

569570
Violations of [Stacked Borrows] found that are likely bugs (but Stacked Borrows is currently just an experiment):
570571

bench-cargo-miri/big-allocs/src/main.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ fn main() {
77
// We can't use too big of an allocation or this code will encounter an allocation failure in
88
// CI. Since the allocation can't be huge, we need to do a few iterations so that the effect
99
// we're trying to measure is clearly visible above the interpreter's startup time.
10-
for _ in 0..10 {
10+
// FIXME (https://github.com/rust-lang/miri/issues/4253): On 32bit targets, we can run out of
11+
// usable addresses if we don't reuse, leading to random test failures.
12+
let count = if cfg!(target_pointer_width = "32") { 8 } else { 12 };
13+
for _ in 0..count {
1114
drop(Vec::<u8>::with_capacity(512 * 1024 * 1024));
1215
}
1316
}

0 commit comments

Comments
 (0)