From 1b473ed74cb13b64900169c3c7692e5c8bdefc9f Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 22 Jul 2024 22:06:16 -0400
Subject: [PATCH 1/3] step cfg(bootstrap)

---
 crates/salsa/tests/macros.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/salsa/tests/macros.rs b/crates/salsa/tests/macros.rs
index 3d818e53c8..9b07740e7d 100644
--- a/crates/salsa/tests/macros.rs
+++ b/crates/salsa/tests/macros.rs
@@ -5,6 +5,7 @@ trait MyDatabase: salsa::Database {
 }
 
 mod another_module {
+    #[allow(dead_code)]
     pub(crate) fn another_name(_: &dyn crate::MyDatabase, (): ()) {}
 }
 

From 459e395519716b2aba90e88a9852c9821810dfb5 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Wed, 20 Mar 2024 22:51:29 +0100
Subject: [PATCH 2/3] Fixes in various places

---
 crates/hir-ty/src/mir/eval/shim.rs | 1 +
 crates/hir-ty/src/mir/lower.rs     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/hir-ty/src/mir/eval/shim.rs b/crates/hir-ty/src/mir/eval/shim.rs
index bd43a62341..d76f538187 100644
--- a/crates/hir-ty/src/mir/eval/shim.rs
+++ b/crates/hir-ty/src/mir/eval/shim.rs
@@ -27,6 +27,7 @@ macro_rules! from_bytes {
     ($ty:tt, $value:expr) => {
         ($ty::from_le_bytes(match ($value).try_into() {
             Ok(it) => it,
+            #[allow(unreachable_patterns)]
             Err(_) => return Err(MirEvalError::InternalError("mismatched size".into())),
         }))
     };
diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 057f553380..9aa2eeebc1 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs
@@ -1161,6 +1161,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
                                     ProjectionElem::OpaqueCast(it) => {
                                         ProjectionElem::OpaqueCast(it)
                                     }
+                                    #[allow(unreachable_patterns)]
                                     ProjectionElem::Index(it) => match it {},
                                 })
                                 .collect(),

From 30d5c8653889ffa56c18fdad1a03fd2ad1619b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Tue, 13 Aug 2024 17:56:37 +0300
Subject: [PATCH 3/3] Preparing for merge from rust-lang/rust

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index 001b900b20..d4f1703d85 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1b51d80027919563004918eaadfa0d890ac0eb93
+80eb5a8e910e5185d47cdefe3732d839c78a5e7e