From 64221ac9ca8b13f274d44a42daf45c5b3b28aea7 Mon Sep 17 00:00:00 2001
From: Michael Ciraci <michaelciraci@hotmail.com>
Date: Fri, 23 Feb 2024 10:07:45 -0600
Subject: [PATCH 1/2] Updating rustfmt and tidy to cargo_metadata 0.18

---
 Cargo.lock                   | 4 ++--
 src/tools/rustfmt/Cargo.toml | 2 +-
 src/tools/tidy/Cargo.toml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b19c4a721eba..f2364186e339f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4774,7 +4774,7 @@ dependencies = [
  "annotate-snippets 0.9.2",
  "anyhow",
  "bytecount",
- "cargo_metadata 0.15.4",
+ "cargo_metadata 0.18.1",
  "clap",
  "clap-cargo",
  "diff",
@@ -5459,7 +5459,7 @@ name = "tidy"
 version = "0.1.0"
 dependencies = [
  "cargo-platform",
- "cargo_metadata 0.15.4",
+ "cargo_metadata 0.18.1",
  "ignore",
  "lazy_static",
  "miropt-test-tools",
diff --git a/src/tools/rustfmt/Cargo.toml b/src/tools/rustfmt/Cargo.toml
index 032b9b548104b..b21a4599c863c 100644
--- a/src/tools/rustfmt/Cargo.toml
+++ b/src/tools/rustfmt/Cargo.toml
@@ -36,7 +36,7 @@ generic-simd = ["bytecount/generic-simd"]
 annotate-snippets = { version = "0.9", features = ["color"] }
 anyhow = "1.0"
 bytecount = "0.6.4"
-cargo_metadata = "0.15.4"
+cargo_metadata = "0.18"
 clap = { version = "4.4.2", features = ["derive"] }
 clap-cargo = "0.12.0"
 diff = "0.1"
diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml
index 8c6b1eb22ecbb..d288ce81d75c9 100644
--- a/src/tools/tidy/Cargo.toml
+++ b/src/tools/tidy/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 autobins = false
 
 [dependencies]
-cargo_metadata = "0.15"
+cargo_metadata = "0.18"
 cargo-platform = "0.1.2"
 regex = "1"
 miropt-test-tools = { path = "../miropt-test-tools" }

From 5a333a93fd951af9f365f13ef94e5c00040363a3 Mon Sep 17 00:00:00 2001
From: Michael Ciraci <michaelciraci@hotmail.com>
Date: Fri, 23 Feb 2024 10:20:04 -0600
Subject: [PATCH 2/2] Unpinning memchr=2.5.0 in toml

---
 compiler/rustc_ast/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/rustc_ast/Cargo.toml b/compiler/rustc_ast/Cargo.toml
index 087f6a192b5c8..3daa3edc1c985 100644
--- a/compiler/rustc_ast/Cargo.toml
+++ b/compiler/rustc_ast/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # FIXME: bumping memchr to 2.7.1 causes linker errors in MSVC thin-lto
 # tidy-alphabetical-start
 bitflags = "2.4.1"
-memchr = "=2.5.0"
+memchr = "2.5"
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_index = { path = "../rustc_index" }
 rustc_lexer = { path = "../rustc_lexer" }