Auto merge of #60173 - RalfJung:miri, r=oli-obk

update miri r? @oli-obk
rust-lang · May 2, 2019 · 08bfe16 · 08bfe16
2 parents d15fc17 + 71338fc
commit 08bfe16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -296,18 +296,6 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "cargo_metadata"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cargo_metadata"
 version = "0.7.1"
@@ -1621,7 +1609,7 @@ name = "miri"
 version = "0.1.0"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4074,7 +4062,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
-"checksum cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d8dfe3adeb30f7938e6c1dd5327f29235d8ada3e898aeb08c343005ec2915a2"
 "checksum cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "585784cac9b05c93a53b17a0b24a5cdd1dfdda5256f030e089b549d2390cc720"
 "checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"

diff --git a/src/tools/miri b/src/tools/miri
+1 −0		.appveyor.yml
+6 −4		.travis.yml
+2 −2		Cargo.toml
+82 −55		README.md
+1 −1		rust-version
+16 −10		src/bin/cargo-miri.rs
+150 −83		src/fn_call.rs
+10 −4		src/lib.rs
+9 −1		src/stacked_borrows.rs
+20 −5		test-cargo-miri/run-test.py
+0 −4		test-cargo-miri/src/main.rs
+6 −14		test-cargo-miri/tests/test.rs
+1 −1		tests/compile-fail/ctlz_nonzero.rs
+1 −1		tests/compile-fail/cttz_nonzero.rs
+1 −1		tests/compile-fail/deref_fn_ptr.rs
+1 −1		tests/compile-fail/getrandom.rs
+1 −2		tests/compile-fail/never_transmute_humans.rs
+1 −1		tests/compile-fail/null_pointer_deref.rs
+1 −1		tests/compile-fail/null_pointer_deref_zst.rs
+1 −1		tests/compile-fail/null_pointer_write.rs
+1 −1		tests/compile-fail/null_pointer_write_zst.rs
+20 −0		tests/compile-fail/stacked_borrows/illegal_read7.rs
+12 −0		tests/compile-fail/stacked_borrows/illegal_write6.rs
+10 −0		tests/compile-fail/stacked_borrows/mut_exclusive_violation2.rs
+1 −1		tests/compiletest.rs
+0 −1		tests/run-pass/async-fn.rs
+1 −1		tests/run-pass/env.rs
+3 −0		tests/run-pass/exit.rs
+5 −9		tests/run-pass/hashmap.rs
+28 −2		tests/run-pass/heap_allocator.rs
+33 −0		tests/run-pass/linked-list.rs
+15 −7		travis.sh