Skip to content

Commit 75465d6

Browse files
authored
Unrolled build for #143114
Rollup merge of #143114 - leopardracer:master, r=RalfJung Minor Documentation Improvements --- ## Description - Fixed typos and improved clarity in comments and documentation. ---
2 parents 11ad40b + 39092cc commit 75465d6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/tools/miri/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Definite bugs found:
592592
* [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))
593593
* [Weak-memory-induced memory leak in Windows thread-local storage](https://github.com/rust-lang/rust/pull/124281)
594594
* [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)
595-
* [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)
595+
* [Mockall reading uninitialized 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)
596596
* [`ReentrantLock` not correctly dealing with reuse of addresses for TLS storage of different threads](https://github.com/rust-lang/rust/pull/141248)
597597

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

src/tools/miri/tests/fail/dangling_pointers/dangling_pointer_to_raw_pointer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn direct_raw(x: *const (i32, i32)) -> *const i32 {
66

77
// Ensure that if a raw pointer is created via an intermediate
88
// reference, we catch that. (Just in case someone decides to
9-
// desugar this differenly or so.)
9+
// desugar this differently or so.)
1010
fn via_ref(x: *const (i32, i32)) -> *const i32 {
1111
unsafe { &(*x).0 as *const i32 } //~ERROR: dangling pointer
1212
}

src/tools/test-float-parse/src/ui.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub fn finish_all(tests: &[TestInfo], total_elapsed: Duration, cfg: &Config) ->
118118
match result {
119119
Ok(FinishedAll) => (),
120120
Err(EarlyExit::Timeout) => {
121-
println!(" exited early; exceded {:?} timeout", cfg.timeout)
121+
println!(" exited early; exceeded {:?} timeout", cfg.timeout)
122122
}
123123
Err(EarlyExit::MaxFailures) => {
124124
println!(" exited early; exceeded {:?} max failures", cfg.max_failures)

0 commit comments

Comments
 (0)