about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-14 12:55:21 +0000
committerbors <bors@rust-lang.org>2019-04-14 12:55:21 +0000
commitd70c5a912edbeca55a84e4185e8fe22918aef8dc (patch)
tree3a69cad04513b4ace685d5188133033c25c96462
parent60076bb8f7e7ca7fc98ca432cda86dbdce7c0417 (diff)
parent3f858516c03a156f3b60dbc941bbcdc0cbdd48aa (diff)
downloadrust-d70c5a912edbeca55a84e4185e8fe22918aef8dc.tar.gz
rust-d70c5a912edbeca55a84e4185e8fe22918aef8dc.zip
Auto merge of #59929 - RalfJung:miri, r=oli-obk
update miri

Fixes https://github.com/rust-lang/rust/issues/59901
-rw-r--r--Cargo.lock2
m---------src/tools/miri28
2 files changed, 16 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9841f9d502c..13364cb2a24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1613,7 +1613,9 @@ dependencies = [
  "compiletest_rs 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
+ "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)",
  "shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/miri b/src/tools/miri
-Subproject 28f2e5b17a9a4c33a810dffda8eaaf55a1b8b70
+Subproject 7c06679f93df53f83bbf61b197f2e5c39f5d763