about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-17 10:45:37 +0000
committerbors <bors@rust-lang.org>2019-11-17 10:45:37 +0000
commit4b6cef1e32b4f2fa44b7d8ebd7ddef0bdeaf51a2 (patch)
tree65d17e9fcc64d3b688df18ec199a43ff64a199a1
parent5966d9b4d987f3b3c4a270bc0b23ef5fadac51bb (diff)
parent2bfa622a991b45ae33a4881cd00e91f459c0bee0 (diff)
downloadrust-4b6cef1e32b4f2fa44b7d8ebd7ddef0bdeaf51a2.tar.gz
rust-4b6cef1e32b4f2fa44b7d8ebd7ddef0bdeaf51a2.zip
Auto merge of #66488 - RalfJung:miri, r=RalfJung
update Miri

r? @ghost Cc @oli-obk
-rw-r--r--Cargo.lock12
m---------src/tools/miri16
2 files changed, 21 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 83b64a9df1f..c7334ceda12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -603,6 +603,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "tempfile",
+ "tester",
  "winapi 0.3.8",
 ]
 
@@ -4564,6 +4565,17 @@ dependencies = [
 ]
 
 [[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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/src/tools/miri b/src/tools/miri
-Subproject 8355437d5d0e747b7e7239cd0a2af8a3825bd91
+Subproject 67a63f89d8c0e5b22fb52cc33274283819f4179