diff options
| author | bors <bors@rust-lang.org> | 2022-07-08 20:36:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-08 20:36:33 +0000 |
| commit | 06754d8852bea286a3a76d373ccd17e66afb5a8b (patch) | |
| tree | 3d983d3a82d6b58c46625d0287ca749fc395d628 | |
| parent | 052495d0017e2b18b781bcf0469a048e5051f5c0 (diff) | |
| parent | 1cc7139ee04e7c6bb219a0f294e1e523a45890ec (diff) | |
| download | rust-06754d8852bea286a3a76d373ccd17e66afb5a8b.tar.gz rust-06754d8852bea286a3a76d373ccd17e66afb5a8b.zip | |
Auto merge of #99034 - RalfJung:miri, r=Mark-Simulacrum
update Miri Fixes https://github.com/rust-lang/rust/issues/98922 r? `@ghost`
| -rw-r--r-- | Cargo.lock | 1 | ||||
| m--------- | src/tools/miri | 16 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock index 268af59aa89..35fefd2fb24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3480,6 +3480,7 @@ dependencies = [ "proc-macro2", "quote", "rand_core 0.5.1", + "regex", "serde", "serde_json", "smallvec", diff --git a/src/tools/miri b/src/tools/miri -Subproject f76ebd6feb9f59be993336f84ecfdc441ad33d8 +Subproject cde87d18239b8d9afa9c6bf1051bf5573dbf326 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index d7acae2ff2a..22c2d28d9f6 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -79,6 +79,8 @@ crossbeam-utils = { version = "0.8.0", features = ["nightly"] } libc = { version = "0.2.79", features = ["align"] } # Ensure default features of libz-sys, which are disabled in some scenarios. libz-sys = { version = "1.1.2" } +# same for regex +regex = { version = "1.5.5" } proc-macro2 = { version = "1", features = ["default"] } quote = { version = "1", features = ["default"] } rand_core_0_5 = { package = "rand_core", version = "0.5.1", features = ["getrandom", "alloc", "std"] } |