about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-29 20:54:25 +0000
committerbors <bors@rust-lang.org>2020-08-29 20:54:25 +0000
commit5c27700b88ba2accfca978c3f6b0c35333e9e778 (patch)
tree78850c351b6ef39a327b8d7f4a3d2380e5b6f47e
parent2a2be9a2c34903b5a2de7f0337c9e0e08f700ccf (diff)
parentd150cd2c30fa7095c344c46a08332c346b44885b (diff)
downloadrust-5c27700b88ba2accfca978c3f6b0c35333e9e778.tar.gz
rust-5c27700b88ba2accfca978c3f6b0c35333e9e778.zip
Auto merge of #76016 - RalfJung:miri, r=RalfJung
bump Miri

Fixes https://github.com/rust-lang/rust/issues/75970
Cc @rust-lang/miri r? @ghost
-rw-r--r--Cargo.lock15
m---------src/tools/miri16
2 files changed, 9 insertions, 22 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4bf46643e47..494b7b5963e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -342,7 +342,7 @@ dependencies = [
 name = "cargo-miri"
 version = "0.1.0"
 dependencies = [
- "cargo_metadata 0.9.1",
+ "cargo_metadata 0.11.1",
  "directories",
  "rustc-workspace-hack",
  "rustc_version",
@@ -393,18 +393,6 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
-dependencies = [
- "semver 0.9.0",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "cargo_metadata"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89fec17b16f1ac67908af82e47d0a90a7afd0e1827b181cd77504323d3263d35"
@@ -1991,7 +1979,6 @@ dependencies = [
 name = "miri"
 version = "0.1.0"
 dependencies = [
- "byteorder",
  "colored",
  "compiletest_rs",
  "env_logger 0.7.1",
diff --git a/src/tools/miri b/src/tools/miri
-Subproject 2d6d73fafe2f087354f7cea37297cd81316cae9
+Subproject c2a2e25d0b050d70d6a355f9b7545a991fc8783