Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17732 - lnicola:sync-from-rust, r=lnicola
minor: sync from downstream
bors 2024-07-28
parent cdb97b8 · parent 900db35 · commit fd74511
-rw-r--r--crates/stdx/src/panic_context.rs1
-rw-r--r--rust-version2
2 files changed, 2 insertions, 1 deletions
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() {
diff --git a/rust-version b/rust-version
index 18e32e5c65..001b900b20 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-a91f7d72f12efcc00ecf71591f066c534d45ddf7
+1b51d80027919563004918eaadfa0d890ac0eb93