diff options
| author | bors <bors@rust-lang.org> | 2019-12-08 13:10:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-08 13:10:52 +0000 |
| commit | 4abb0ad2731e9ac6fd5d64d4cf15b7c82e4b5a81 (patch) | |
| tree | 47bebaa781a80be547e3dd91d34d2e8b0d91cc50 | |
| parent | e862c01aadb2d029864f7bb256cf6c85bbb5d7e4 (diff) | |
| parent | 3d05a2705f191dd6bd594a877a08b3c7dc581e95 (diff) | |
| download | rust-4abb0ad2731e9ac6fd5d64d4cf15b7c82e4b5a81.tar.gz rust-4abb0ad2731e9ac6fd5d64d4cf15b7c82e4b5a81.zip | |
Auto merge of #67147 - RalfJung:miri, r=RalfJung
update Miri Fixes https://github.com/rust-lang/rust/issues/67124
| -rw-r--r-- | Cargo.lock | 1 | ||||
| m--------- | src/tools/miri | 16 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 26727c5c1db..161c9d3aade 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2213,6 +2213,7 @@ dependencies = [ "rand 0.7.0", "rustc-workspace-hack", "rustc_version", + "serde", "shell-escape", "vergen", ] diff --git a/src/tools/miri b/src/tools/miri -Subproject a0ba079b6af0f8c07c33dd8af72a51c997e5896 +Subproject 048af409232fc2d7f8fbe5469080dc8bb702c49 |