Rollup merge of rust-lang#61295 - RalfJung:miri, r=oli-obk

update miri r? @oli-obk Fixes rust-lang#60533
Centril · May 30, 2019 · 023fa2a · 023fa2a
2 parents 769b700 + 34d5239
commit 023fa2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1641,6 +1641,7 @@ dependencies = [
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-workspace-hack 1.0.0",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

diff --git a/src/tools/miri b/src/tools/miri
+0 −1		.travis.yml
+5 −2		Cargo.toml
+21 −40		README.md
+83 −0		miri
+1 −1		rust-version
+4 −1		src/bin/cargo-miri.rs
+4 −3		src/fn_call.rs
+1 −1		src/lib.rs
+15 −17		src/operator.rs
+26 −26		src/stacked_borrows.rs
+1 −1		tests/compile-fail/out_of_bounds_ptr_1.rs
+8 −3		tests/compile-fail/stacked_borrows/interior_mut1.rs
+28 −0		tests/compile-fail/stacked_borrows/interior_mut2.rs
+8 −5		tests/run-pass/ptr_arith_offset_overflow.rs
+7 −0		tests/run-pass/ptr_int_casts.rs
+7 −14		travis.sh