Skip to content

Commit

Permalink
Rollup merge of rust-lang#76848 - RalfJung:miri, r=RalfJung
Browse files Browse the repository at this point in the history 
update Miri

Let's get rust-lang/miri#1540 shipped.
Cc @rust-lang/miri r? @ghost
  • Loading branch information
@Dylan-DPC
Dylan-DPC committed Sep 19, 2020
2 parents d77f264 + 643eb07 commit acc37f3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ dependencies = [
name = "cargo-miri"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.11.1",
"directories",
"rustc-workspace-hack",
"rustc_version",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 43 files
+12 −8 README.md
+1 −23 cargo-miri/Cargo.lock
+0 −1 cargo-miri/Cargo.toml
+349 −264 cargo-miri/bin.rs
+1 −1 ci.sh
+14 −9 miri
+1 −1 rust-version
+5 −0 src/bin/miri.rs
+2 −9 src/shims/intrinsics.rs
+73 −42 src/shims/posix/fs.rs
+37 −35 test-cargo-miri/Cargo.lock
+7 −1 test-cargo-miri/Cargo.toml
+2 −0 test-cargo-miri/build.rs
+57 −36 test-cargo-miri/run-test.py
+7 −0 test-cargo-miri/src/lib.rs
+29 −0 test-cargo-miri/src/main.rs
+0 −0 test-cargo-miri/stderr.ref1
+0 −0 test-cargo-miri/stderr.ref3
+3 −0 test-cargo-miri/stdout.ref1
+0 −0 test-cargo-miri/stdout.ref2
+1 −0 test-cargo-miri/stdout.ref3
+14 −0 test-cargo-miri/subcrate/Cargo.toml
+16 −0 test-cargo-miri/subcrate/main.rs
+13 −0 test-cargo-miri/subcrate/test.rs
+1 −0 test-cargo-miri/test.stderr.ref1
+0 −0 test-cargo-miri/test.stderr.ref2
+0 −18 test-cargo-miri/test.stdout.ref
+10 −0 test-cargo-miri/test.stdout.ref1
+1 −1 test-cargo-miri/test.stdout.ref2
+9 −7 test-cargo-miri/test.stdout.ref3
+3 −9 test-cargo-miri/test.stdout.ref4
+3 −3 test-cargo-miri/test.stdout.ref5
+7 −8 test-cargo-miri/tests/test.rs
+14 −0 tests/compile-fail/fs/close_stdout.rs
+1 −1 tests/compiletest.rs
+20 −1 tests/run-pass/binary-heap.rs
+29 −5 tests/run-pass/btreemap.rs
+20 −0 tests/run-pass/fs_libc.rs
+1 −0 tests/run-pass/fs_libc.stderr
+1 −0 tests/run-pass/fs_libc.stdout
+16 −0 tests/run-pass/hashmap.rs
+18 −1 tests/run-pass/linked-list.rs
+16 −0 tests/run-pass/vec.rs

0 comments on commit acc37f3

Please sign in to comment.