Skip to content

Commit 6ca4fc7

Browse files
committed
Merge remote-tracking branches 'origin/master' and 'ralf/shrink-whitelist' into memory-data-revived
3 parents 97e010f + fb2d0ff + 464dee8 commit 6ca4fc7

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ compiled the right way.
5656
Install Miri as a cargo subcommand:
5757

5858
```sh
59-
cargo +nightly install --git https://github.com/solson/miri/
59+
cargo +nightly install --git https://github.com/solson/miri/ miri
6060
```
6161

6262
Be aware that if you used `rustup override set` to fix a particular Rust version

src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for Evaluator<'tcx> {
319319
// We walk up the stack a few frames to also cover their callees.
320320
const WHITELIST: &[(&str, &str)] = &[
321321
// Uses mem::uninitialized
322-
("std::ptr::read", ""),
323322
("std::sys::windows::mutex::Mutex::", ""),
324323
];
325324
for frame in ecx.stack().iter()

0 commit comments

Comments
 (0)