diff options
| author | bors <bors@rust-lang.org> | 2019-02-21 11:44:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-21 11:44:16 +0000 |
| commit | 0e25a6829c66302dc06c351bb494774e3d075f77 (patch) | |
| tree | 2eb39f1c16e90abcdf37890d8b99a689c2748233 | |
| parent | 1349c84a4fa0fca9b866b2e859d28ee185ca0c1b (diff) | |
| parent | 7f5d50e4758d73f6cf6649a65f93d867ed5687b8 (diff) | |
Auto merge of #58535 - RalfJung:miri, r=oli-obk
update miri r? @oli-obk Fixes https://github.com/rust-lang/rust/issues/58558
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Cargo.lock | 1 | ||||
| m--------- | src/tools/miri | 28 |
3 files changed, 17 insertions, 16 deletions
diff --git a/.gitmodules b/.gitmodules index d603e457515..b75e312dedf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ url = https://github.com/rust-lang-nursery/rustfmt.git [submodule "src/tools/miri"] path = src/tools/miri - url = https://github.com/solson/miri.git + url = https://github.com/rust-lang/miri.git [submodule "src/doc/rust-by-example"] path = src/doc/rust-by-example url = https://github.com/rust-lang/rust-by-example.git @@ -46,4 +46,4 @@ branch = rustc/8.0-2019-01-16 [submodule "src/doc/embedded-book"] path = src/doc/embedded-book - url = https://github.com/rust-embedded/book.git \ No newline at end of file + url = https://github.com/rust-embedded/book.git diff --git a/Cargo.lock b/Cargo.lock index 9d766680609..b93eaade65d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1626,6 +1626,7 @@ dependencies = [ "log 0.4.6 (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)", "vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/tools/miri b/src/tools/miri -Subproject a9505a8fb89ece7fa514cf3c70f1ada3e39baee +Subproject 76138c56575c347207039bdeafb8456bd72116a |