Auto merge of #85866 - Aaron1011:miriup-const-err, r=RalfJung

Bump Miri for const_err changes Fixes #85861 r? `@RalfJung`
rust-lang · May 31, 2021 · d209114 · d209114
2 parents 657bc01 + a258feb
commit d209114
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -2135,9 +2135,9 @@ dependencies = [
 
 [[package]]
 name = "measureme"
-version = "9.1.1"
+version = "9.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cf14eb7d2eea897d9949b68f19e165638755e3a1a3c0941b6b6c3e00141f2c"
+checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d"
 dependencies = [
  "log",
  "memmap2",
@@ -2289,6 +2289,7 @@ dependencies = [
  "hex 0.4.2",
  "libc",
  "log",
+ "measureme",
  "rand 0.8.3",
  "rustc-workspace-hack",
  "rustc_version",

diff --git a/src/tools/miri b/src/tools/miri
+88 −0		Cargo.lock
+1 −0		Cargo.toml
+4 −0		README.md
+1 −1		rust-version
+4 −0		src/bin/miri.rs
+4 −2		src/diagnostics.rs
+5 −1		src/eval.rs
+54 −11		src/machine.rs
+2 −3		tests/compile-fail/erroneous_const.rs