Rollup merge of rust-lang#124116 - RalfJung:miri-rust-backtrace, r=Nilstrieb

workingjubilee · web-flow · commit e32c184903f4 · 2024-04-18T21:38:57.000-07:00
when suggesting RUST_BACKTRACE=1, add a special note for Miri's env var isolation Fixes rust-lang/miri#2855
diff --git a/std/src/panicking.rs b/std/src/panicking.rs
@@ -277,6 +277,13 @@ fn default_hook(info: &PanicInfo<'_>) {
                         "note: run with `RUST_BACKTRACE=1` environment variable to display a \
                              backtrace"
                     );
+                    if cfg!(miri) {
+                        let _ = writeln!(
+                            err,
+                            "note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` \
+                                for the environment variable to have an effect"
+                        );
+                    }
                 }
             }
             // If backtraces aren't supported or are forced-off, do nothing.

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,13 @@ fn default_hook(info: &PanicInfo<'_>) {`
`277`	`277`	"note: run with `RUST_BACKTRACE=1` environment variable to display a \
`278`	`278`	`backtrace"`
`279`	`279`	`);`
	`280`	`+ if cfg!(miri) {`
	`281`	`+ let _ = writeln!(`
	`282`	`+ err,`
	`283`	+ "note: in Miri, you may have to set `-Zmiri-env-forward=RUST_BACKTRACE` \
	`284`	`+ for the environment variable to have an effect"`
	`285`	`+ );`
	`286`	`+ }`
`280`	`287`	`}`
`281`	`288`	`}`
`282`	`289`	`// If backtraces aren't supported or are forced-off, do nothing.`