about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-05-13 20:29:19 +0200
committerGitHub <noreply@github.com>2024-05-13 20:29:19 +0200
commit472391dbf63ae49f459fc2f6c6bd7c060dfda9df (patch)
treec6c252d9756180c1317e2be7b2927b5e58ba5c5c
parentb0cbd4e5f37a02397e617d3f7fe55105858633c2 (diff)
parentb98b8d76b1228999dd97058ea4e4a4719fe2f287 (diff)
downloadrust-472391dbf63ae49f459fc2f6c6bd7c060dfda9df.tar.gz
rust-472391dbf63ae49f459fc2f6c6bd7c060dfda9df.zip
Rollup merge of #125063 - tbu-:pr_set_ice_hook_env, r=michaelwoerister
Don't call `env::set_var` in `rustc_driver::install_ice_hook`

Modifying an environment variable would make the function unsafe to call.
-rw-r--r--compiler/rustc_driver_impl/src/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index b2d38a00f0b..ba6b9ef0784 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -11,6 +11,7 @@
 #![allow(internal_features)]
 #![feature(decl_macro)]
 #![feature(let_chains)]
+#![feature(panic_backtrace_config)]
 #![feature(panic_update_hook)]
 #![feature(result_flattening)]
 
@@ -1317,8 +1318,8 @@ pub fn install_ice_hook(
     // by the user. Compiler developers and other rustc users can
     // opt in to less-verbose backtraces by manually setting "RUST_BACKTRACE"
     // (e.g. `RUST_BACKTRACE=1`)
-    if std::env::var_os("RUST_BACKTRACE").is_none() {
-        std::env::set_var("RUST_BACKTRACE", "full");
+    if env::var_os("RUST_BACKTRACE").is_none() {
+        panic::set_backtrace_style(panic::BacktraceStyle::Full);
     }
 
     let using_internal_features = Arc::new(std::sync::atomic::AtomicBool::default());