From f410a2d02ffcdb4cf972d61ddb6f5d9f87359394 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Sat, 20 Jul 2024 15:51:58 -0400
Subject: [PATCH 1/2] Allow deprecated temporarily to unblock version bump

---
 crates/stdx/src/panic_context.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/stdx/src/panic_context.rs b/crates/stdx/src/panic_context.rs
index cf3d85b4da..4ec74c0742 100644
--- a/crates/stdx/src/panic_context.rs
+++ b/crates/stdx/src/panic_context.rs
@@ -21,6 +21,7 @@ impl PanicContext {
     #[allow(clippy::print_stderr)]
     fn init() {
         let default_hook = panic::take_hook();
+        #[allow(deprecated)]
         let hook = move |panic_info: &panic::PanicInfo<'_>| {
             with_ctx(|ctx| {
                 if !ctx.is_empty() {

From 3e55b5b18fabe6eb750ddb7674b52001ed39c040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Sun, 28 Jul 2024 17:19:12 +0300
Subject: [PATCH 2/2] 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 18e32e5c65..001b900b20 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-a91f7d72f12efcc00ecf71591f066c534d45ddf7
+1b51d80027919563004918eaadfa0d890ac0eb93