Auto merge of #76848 - RalfJung:miri, r=RalfJung

update Miri Let's get rust-lang/miri#1540 shipped. Fixes #76968. Cc `@rust-lang/miri` r? `@ghost`
rust-lang · Sep 20, 2020 · 1fd5b9d · 1fd5b9d
2 parents 2e0edc0 + 0e90875
commit 1fd5b9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -342,7 +342,6 @@ dependencies = [
 name = "cargo-miri"
 version = "0.1.0"
 dependencies = [
- "cargo_metadata 0.11.1",
  "directories",
  "rustc-workspace-hack",
  "rustc_version",
@@ -576,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "colored"
-version = "1.9.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
 dependencies = [
  "atty",
  "lazy_static",
@@ -886,11 +885,10 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "2.0.2"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
+checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
 dependencies = [
- "cfg-if",
  "dirs-sys",
 ]
 
@@ -1186,6 +1184,17 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "gimli"
 version = "0.22.0"
@@ -1992,7 +2001,7 @@ dependencies = [
  "colored",
  "compiletest_rs",
  "env_logger 0.7.1",
- "getrandom",
+ "getrandom 0.2.0",
  "hex 0.4.2",
  "libc",
  "log",
@@ -2584,7 +2593,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.14",
  "libc",
  "rand_chacha",
  "rand_core",
@@ -2608,7 +2617,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.14",
 ]
 
 [[package]]
@@ -2684,7 +2693,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
 dependencies = [
- "getrandom",
+ "getrandom 0.1.14",
  "redox_syscall",
  "rust-argon2",
 ]

diff --git a/src/tools/miri b/src/tools/miri
+81 −71		Cargo.lock
+2 −2		Cargo.toml
+19 −11		README.md
+55 −72		cargo-miri/Cargo.lock
+1 −2		cargo-miri/Cargo.toml
+373 −264		cargo-miri/bin.rs
+1 −1		ci.sh
+14 −9		miri
+1 −1		rust-version
+5 −0		src/bin/miri.rs
+1 −1		src/helpers.rs
+11 −9		src/shims/foreign_items.rs
+2 −9		src/shims/intrinsics.rs
+2 −0		src/shims/panic.rs
+73 −42		src/shims/posix/fs.rs
+44 −40		test-cargo-miri/Cargo.lock
+7 −2		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
+30 −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
+17 −0		test-cargo-miri/subcrate/Cargo.toml
+16 −0		test-cargo-miri/subcrate/main.rs
+16 −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
+10 −9		test-cargo-miri/test.stdout.ref3
+3 −9		test-cargo-miri/test.stdout.ref4
+3 −3		test-cargo-miri/test.stdout.ref5
+5 −11		test-cargo-miri/tests/test.rs
+14 −0		tests/compile-fail/fs/close_stdout.rs
+2 −2		tests/compile-fail/generator-pinned-moved.rs
+2 −2		tests/compile-fail/panic/panic_abort1.rs
+1 −2		tests/compile-fail/panic/panic_abort2.rs
+1 −2		tests/compile-fail/panic/panic_abort3.rs
+1 −2		tests/compile-fail/panic/panic_abort4.rs
+2 −2		tests/compile-fail/storage_dead_dangling.rs
+3 −1		tests/compile-fail/validity/transmute_through_ptr.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