diff options
| author | bors <bors@rust-lang.org> | 2019-06-02 21:15:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-02 21:15:35 +0000 |
| commit | 607aadcb77e71e23a049bc37f7e480c1edaa3ea0 (patch) | |
| tree | f58fc66cd8d9597833acbc3d0234f831ae0e7287 | |
| parent | 627486af15d222bcba336b12ea92a05237cc9ab1 (diff) | |
| parent | 4dfed4a0ca65d4214fe9196996f1eb473a708d51 (diff) | |
| download | rust-607aadcb77e71e23a049bc37f7e480c1edaa3ea0.tar.gz rust-607aadcb77e71e23a049bc37f7e480c1edaa3ea0.zip | |
Auto merge of #61295 - RalfJung:miri, r=oli-obk
update miri r? @oli-obk Fixes https://github.com/rust-lang/rust/issues/60533
| -rw-r--r-- | Cargo.lock | 1 | ||||
| m--------- | src/tools/miri | 24 |
2 files changed, 20 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0eee3461ed6..ea0087de839 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1646,6 +1646,7 @@ dependencies = [ "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)", + "num-traits 0.2.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)", diff --git a/src/tools/miri b/src/tools/miri -Subproject 0c85dbf3df0f545133dca24eccfc9f0f6107c7f +Subproject e1a0f66373a1a185334a6e3be24e94161e3b4a4 |