From 9fe6c19719db8a0f7d49bfea2133858f9b0a1860 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 7 Jul 2022 20:51:58 -0400 Subject: [PATCH 1/2] update Miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index f76ebd6feb9f5..cde87d18239b8 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit f76ebd6feb9f59be993336f84ecfdc441ad33d81 +Subproject commit cde87d18239b8d9afa9c6bf1051bf5573dbf326e From 1cc7139ee04e7c6bb219a0f294e1e523a45890ec Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 8 Jul 2022 00:23:01 -0400 Subject: [PATCH 2/2] add regex to rustc-workspace-hack --- Cargo.lock | 1 + src/tools/rustc-workspace-hack/Cargo.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 86936b25d8ad9..27804137a70db 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/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index d7acae2ff2a88..22c2d28d9f693 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"] }