Skip to content

Commit

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

Fixes rust-lang#66862

r? @ghost
  • Loading branch information
@bors
bors committed Dec 3, 2019
2 parents 7afe6d9 + 6b7f634 commit 2f04472
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 54 files
+19 −27 CONTRIBUTING.md
+3 −3 benches/helpers/miri_helper.rs
+1 −1 rust-version
+46 −0 rustup-toolchain
+3 −3 src/bin/miri-rustc-tests.rs
+3 −3 src/bin/miri.rs
+101 −109 src/eval.rs
+39 −0 src/helpers.rs
+3 −2 src/lib.rs
+28 −31 src/machine.rs
+1 −1 src/shims/env.rs
+14 −9 src/shims/foreign_items.rs
+2 −3 src/shims/intrinsics.rs
+1 −1 src/shims/mod.rs
+60 −22 src/shims/panic.rs
+3 −11 src/shims/tls.rs
+12 −2 src/stacked_borrows.rs
+4 −0 test-cargo-miri/run-test.py
+3 −2 test-cargo-miri/test.stdout.ref
+1 −1 test-cargo-miri/test.stdout.ref2
+1 −1 test-cargo-miri/test.stdout.ref3
+13 −4 test-cargo-miri/tests/test.rs
+0 −5 tests/compile-fail/div-by-zero-2.rs
+1 −1 tests/compile-fail/double_panic.rs
+1 −1 tests/compile-fail/exact_div3.rs
+0 −6 tests/compile-fail/overflowing-lsh-neg.rs
+0 −5 tests/compile-fail/overflowing-rsh-1.rs
+0 −0 tests/compile-fail/panic/panic_abort1.rs
+0 −0 tests/compile-fail/panic/panic_abort2.rs
+0 −0 tests/compile-fail/panic/panic_abort3.rs
+0 −0 tests/compile-fail/panic/panic_abort4.rs
+0 −9 tests/run-pass/catch_panic.stderr
+10 −12 tests/run-pass/coerce_non_capture_closure_to_fn_ptr.rs
+6 −0 tests/run-pass/issue-miri-1075.rs
+23 −19 tests/run-pass/panic/catch_panic.rs
+19 −0 tests/run-pass/panic/catch_panic.stderr
+6 −0 tests/run-pass/panic/div-by-zero-2.rs
+1 −0 tests/run-pass/panic/div-by-zero-2.stderr
+7 −0 tests/run-pass/panic/overflowing-lsh-neg.rs
+1 −0 tests/run-pass/panic/overflowing-lsh-neg.stderr
+6 −0 tests/run-pass/panic/overflowing-rsh-1.rs
+1 −0 tests/run-pass/panic/overflowing-rsh-1.stderr
+2 −1 tests/run-pass/panic/overflowing-rsh-2.rs
+1 −0 tests/run-pass/panic/overflowing-rsh-2.stderr
+4 −0 tests/run-pass/panic/panic1.rs
+1 −0 tests/run-pass/panic/panic1.stderr
+4 −0 tests/run-pass/panic/panic2.rs
+1 −0 tests/run-pass/panic/panic2.stderr
+4 −0 tests/run-pass/panic/panic3.rs
+1 −0 tests/run-pass/panic/panic3.stderr
+4 −0 tests/run-pass/panic/panic4.rs
+1 −0 tests/run-pass/panic/panic4.stderr
+2 −1 tests/run-pass/panic/transmute_fat2.rs
+1 −0 tests/run-pass/panic/transmute_fat2.stderr

0 comments on commit 2f04472

Please sign in to comment.