Rollup merge of #92579 - RalfJung:miri, r=RalfJung

update Miri Fixes #92527
rust-lang · Jan 5, 2022 · a067346 · a067346
2 parents d83dd85 + e568423
commit a067346
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -368,7 +368,7 @@ version = "0.1.0"
 dependencies = [
  "directories",
  "rustc-workspace-hack",
- "rustc_version 0.3.3",
+ "rustc_version",
  "serde",
  "serde_json",
  "vergen",
@@ -2276,7 +2276,7 @@ dependencies = [
  "measureme 9.1.2",
  "rand 0.8.4",
  "rustc-workspace-hack",
- "rustc_version 0.4.0",
+ "rustc_version",
  "shell-escape",
  "smallvec",
 ]
@@ -4586,15 +4586,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"

diff --git a/src/tools/miri b/src/tools/miri
+4 −31		cargo-miri/Cargo.lock
+1 −1		cargo-miri/Cargo.toml
+1 −1		rust-version
+2 −2		src/eval.rs
+0 −30		src/machine.rs
+1 −1		src/shims/posix/thread.rs
+3 −3		src/shims/tls.rs