Skip to content

Commit

Permalink
Auto merge of #61295 - RalfJung:miri, r=oli-obk
Browse files Browse the repository at this point in the history 
update miri

r? @oli-obk

Fixes #60533
  • Loading branch information
@bors
bors committed Jun 2, 2019
2 parents 627486a + 4dfed4a commit 607aadc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,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)",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 49 files
+1 −1 .appveyor.yml
+0 −1 .travis.yml
+5 −2 Cargo.toml
+21 −40 README.md
+150 −0 miri
+1 −1 rust-version
+4 −1 src/bin/cargo-miri.rs
+4 −3 src/fn_call.rs
+3 −2 src/intrinsic.rs
+37 −38 src/lib.rs
+15 −17 src/operator.rs
+62 −53 src/stacked_borrows.rs
+2 −0 tests/compile-fail/modifying_constants.rs
+1 −1 tests/compile-fail/out_of_bounds_ptr_1.rs
+19 −0 tests/compile-fail/rc_as_raw.rs
+8 −3 tests/compile-fail/stacked_borrows/interior_mut1.rs
+28 −0 tests/compile-fail/stacked_borrows/interior_mut2.rs
+7 −0 tests/compile-fail/stacked_borrows/unescaped_static.rs
+3 −3 tests/run-pass/box_box_trait.rs
+1 −1 tests/run-pass/call_drop_on_fat_ptr_array_elements.rs
+1 −1 tests/run-pass/call_drop_through_trait_object.rs
+1 −1 tests/run-pass/call_drop_through_trait_object_rc.rs
+5 −5 tests/run-pass/cast-rfc0401-vtable-kinds.rs
+52 −0 tests/run-pass/closures.rs
+4 −4 tests/run-pass/dst-field-align.rs
+4 −4 tests/run-pass/dst-raw.rs
+0 −6 tests/run-pass/fn_item_as_closure_trait_object.rs
+0 −8 tests/run-pass/fn_item_with_args_as_closure_trait_object.rs
+0 −18 tests/run-pass/fn_item_with_multiple_args_as_closure_trait_object.rs
+0 −15 tests/run-pass/fn_ptr_as_closure_trait_object.rs
+5 −5 tests/run-pass/ints.rs
+1 −1 tests/run-pass/issue-20575.rs
+2 −2 tests/run-pass/issue-23261.rs
+1 −1 tests/run-pass/issue-26709.rs
+2 −2 tests/run-pass/issue-30530.rs
+1 −1 tests/run-pass/issue-33387.rs
+1 −1 tests/run-pass/issue-35815.rs
+2 −2 tests/run-pass/issue-3794.rs
+1 −1 tests/run-pass/last-use-in-cap-clause.rs
+5 −5 tests/run-pass/mir_coercions.rs
+1 −1 tests/run-pass/multi_arg_closure.rs
+1 −1 tests/run-pass/non_capture_closure_to_fn_ptr.rs
+8 −5 tests/run-pass/ptr_arith_offset_overflow.rs
+7 −0 tests/run-pass/ptr_int_casts.rs
+39 −3 tests/run-pass/rc.rs
+4 −4 tests/run-pass/regions-lifetime-nonfree-late-bound.rs
+1 −1 tests/run-pass/thread-local.rs
+4 −4 tests/run-pass/traits.rs
+8 −14 travis.sh

0 comments on commit 607aadc

Please sign in to comment.