Skip to content

Commit

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

r? @ghost Cc @oli-obk
  • Loading branch information
@bors
bors committed Nov 17, 2019
2 parents 5966d9b + 2bfa622 commit 4b6cef1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ dependencies = [
"serde_derive",
"serde_json",
"tempfile",
"tester",
"winapi 0.3.8",
]

Expand Down Expand Up @@ -4563,6 +4564,17 @@ dependencies = [
"term 0.0.0",
]

[[package]]
name = "tester"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd0d1044cb5ca390e9c93f8c35abd2c55484397dfd786f189321aa34605ee6ab"
dependencies = [
"getopts",
"libc",
"term 0.6.0",
]

[[package]]
name = "textwrap"
version = "0.11.0"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 18 files
+32 −0 Cargo.lock
+1 −1 Cargo.toml
+1 −1 rust-version
+0 −10 src/bin/miri-rustc-tests.rs
+0 −10 src/bin/miri.rs
+1 −1 src/eval.rs
+13 −4 src/machine.rs
+1 −1 src/shims/foreign_items.rs
+91 −88 src/shims/fs.rs
+13 −11 src/shims/intrinsics.rs
+1 −1 src/shims/mod.rs
+8 −8 src/stacked_borrows.rs
+20 −17 test-cargo-miri/Cargo.lock
+0 −1 test-cargo-miri/tests/test.rs
+6 −0 tests/compile-fail/stacked_borrows/issue-miri-1050-1.rs
+7 −0 tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs
+12 −0 tests/run-pass/floats.rs
+0 −0 tests/run-pass/issue-miri-133.rs

0 comments on commit 4b6cef1

Please sign in to comment.