Skip to content

Commit

Permalink
Auto merge of #66558 - Aaron1011:update/miri-unwind, r=RalfJung
Browse files Browse the repository at this point in the history 
Bump Miri for panic unwinding support
  • Loading branch information
@bors
bors committed Nov 22, 2019
2 parents 083b5a0 + 45a9d27 commit 5fa0af2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,9 @@ dependencies = [

[[package]]
name = "compiletest_rs"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f75b10a18fb53549fdd090846eb01c7f8593914494d1faabc4d3005c436e417a"
checksum = "d7d8975604ebad8b6660796802377eb6495045c5606168fc1b8d19a4dd9bfa46"
dependencies = [
"diff",
"filetime",
Expand Down Expand Up @@ -4563,9 +4563,9 @@ dependencies = [

[[package]]
name = "tester"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd0d1044cb5ca390e9c93f8c35abd2c55484397dfd786f189321aa34605ee6ab"
checksum = "7647e6d732eb84375d8e7abda37818f81861ddbfc7235e33f4983cb254b71e4f"
dependencies = [
"getopts",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 38 files
+6 −6 Cargo.lock
+1 −1 Cargo.toml
+2 −2 README.md
+1 −1 rust-version
+4 −1 src/bin/miri.rs
+28 −15 src/eval.rs
+38 −31 src/helpers.rs
+1 −0 src/lib.rs
+34 −26 src/machine.rs
+36 −49 src/shims/foreign_items.rs
+25 −8 src/shims/intrinsics.rs
+9 −11 src/shims/mod.rs
+173 −0 src/shims/panic.rs
+1 −1 src/stacked_borrows.rs
+3 −2 test-cargo-miri/test.stdout.ref
+1 −1 test-cargo-miri/test.stdout.ref2
+1 −1 test-cargo-miri/test.stdout.ref3
+11 −0 test-cargo-miri/tests/test.rs
+11 −0 tests/compile-fail/double_panic.rs
+0 −1 tests/compile-fail/never_say_never.rs
+0 −2 tests/compile-fail/never_transmute_humans.rs
+0 −1 tests/compile-fail/never_transmute_void.rs
+0 −5 tests/compile-fail/panic1.rs
+0 −5 tests/compile-fail/panic2.rs
+6 −0 tests/compile-fail/panic_abort1.rs
+7 −0 tests/compile-fail/panic_abort2.rs
+2 −0 tests/compile-fail/panic_abort3.rs
+2 −0 tests/compile-fail/panic_abort4.rs
+0 −2 tests/run-pass/async-fn.rs
+62 −0 tests/run-pass/catch_panic.rs
+1 −1 tests/run-pass/generator.rs
+9 −0 tests/run-pass/intrinsics-math.rs
+2 −5 tests/run-pass/issue-17877.rs
+0 −1 tests/run-pass/loop-break-value.rs
+4 −0 tests/run-pass/panic1.rs
+1 −0 tests/run-pass/panic1.stderr
+5 −0 tests/run-pass/panic2.rs
+1 −0 tests/run-pass/panic2.stderr

0 comments on commit 5fa0af2

Please sign in to comment.