about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--Cargo.lock1
m---------src/tools/miri28
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