about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2022-06-25 22:21:49 -0400
committerRalf Jung <post@ralfj.de>2022-06-25 22:23:12 -0400
commit61a986a015d977d2da986fd3a34985810c12ad36 (patch)
treecfa6804b75ed45ebe33def51ab8ebb301c220fad
parent1aabd8a4a6e1871f14e804302bd60dfcbffd5761 (diff)
downloadrust-61a986a015d977d2da986fd3a34985810c12ad36.tar.gz
rust-61a986a015d977d2da986fd3a34985810c12ad36.zip
update Miri
-rw-r--r--Cargo.lock22
m---------src/tools/miri21
2 files changed, 17 insertions, 26 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1108c1f4d4c..e269c7efb29 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2367,20 +2367,6 @@ dependencies = [
 
 [[package]]
 name = "measureme"
-version = "9.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d"
-dependencies = [
- "log",
- "memmap2",
- "parking_lot 0.11.2",
- "perf-event-open-sys",
- "rustc-hash",
- "smallvec",
-]
-
-[[package]]
-name = "measureme"
 version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd460fad6e55ca82fa0cd9dab0d315294188fd9ec6efbf4105e5635d4872ef9c"
@@ -2477,7 +2463,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "measureme 9.1.2",
+ "measureme",
  "rand 0.8.5",
  "regex",
  "rustc-workspace-hack",
@@ -3700,7 +3686,7 @@ dependencies = [
  "cstr",
  "libc",
  "libloading",
- "measureme 10.0.0",
+ "measureme",
  "rustc-demangle",
  "rustc_ast",
  "rustc_attr",
@@ -3798,7 +3784,7 @@ dependencies = [
  "indexmap",
  "jobserver",
  "libc",
- "measureme 10.0.0",
+ "measureme",
  "memmap2",
  "parking_lot 0.11.2",
  "rustc-hash",
@@ -4354,7 +4340,7 @@ dependencies = [
 name = "rustc_query_impl"
 version = "0.0.0"
 dependencies = [
- "measureme 10.0.0",
+ "measureme",
  "rustc-rayon-core",
  "rustc_ast",
  "rustc_data_structures",
diff --git a/src/tools/miri b/src/tools/miri
-Subproject 655eed35b7ca7cae08f21ead6151b9dfb69794f
+Subproject 9e2dac4787e5470ecd9e245420e8da9528620ed