bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adding backtrace off option for fuchsia targets

Browse source
This commit is contained in:
Andrew Pollack 2022-09-08 05:14:03 +00:00
parent 78a891d364
commit 88baf8f6f5
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/std/src/panic.rs
View file

@ -295,12 +295,7 @@ pub fn get_backtrace_style() -> Option<BacktraceStyle> {
return Some(style); return Some(style);
} }
// Setting environment variables for Fuchsia components isn't a standard let format = crate::env::var_os("RUST_BACKTRACE")
// or easily supported workflow. For now, display backtraces by default.
let format = if cfg!(target_os = "fuchsia") {
BacktraceStyle::Full
} else {
crate::env::var_os("RUST_BACKTRACE")
.map(|x| { .map(|x| {
if &x == "0" { if &x == "0" {
BacktraceStyle::Off BacktraceStyle::Off
@ -310,8 +305,12 @@ pub fn get_backtrace_style() -> Option<BacktraceStyle> {
BacktraceStyle::Short BacktraceStyle::Short
} }
}) })
.unwrap_or(BacktraceStyle::Off) .unwrap_or(if cfg!(target_os = "fuchsia") {
}; // Fuchsia components default to full backtrace.
BacktraceStyle::Full
} else {
BacktraceStyle::Off
});
set_backtrace_style(format); set_backtrace_style(format);
Some(format) Some(format)
} }