summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-06-01 17:11:07 +0200
committerGitHub <noreply@github.com>2022-06-01 17:11:07 +0200
commit89e765fb5683a7305371e9918e57d14213b66c06 (patch)
tree9a118c6f4377c32cc88d30d01f2539496ea38a97
parent1730b62c45ef0108bcc9e304c8d1a17c9e66053a (diff)
parent9f2b69d344bf78426957af44a4c24c7434e1bb4d (diff)
downloadrust-89e765fb5683a7305371e9918e57d14213b66c06.tar.gz
Rollup merge of #97621 - RalfJung:miri, r=RalfJung
update Miri Fixes https://github.com/rust-lang/rust/issues/97563 Cc ``@rust-lang/miri`` r? ``@ghost``
-rw-r--r--Cargo.lock2
m---------src/tools/miri19
2 files changed, 11 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 3610d603767..7ed327e9f4c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5509,6 +5509,8 @@ dependencies = [
"pretty_assertions 1.2.1",
"regex",
"rustc_version",
+ "serde",
+ "serde_json",
]
[[package]]
diff --git a/src/tools/miri b/src/tools/miri
-Subproject 065ff89e33b67b3527fcdd56cf8b432e593e32d
+Subproject 749efd29565a9b8f47afb441aaacfcc10bc145d