From d1712f49d72c3455abf275f1fb1d5b7653d02e2c Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Sun, 5 Mar 2023 18:55:30 -0800 Subject: [PATCH 1/2] move default backtrace setting to sys --- library/std/src/panic.rs | 3 +-- library/std/src/sys/mod.rs | 9 +++++++++ src/tools/tidy/src/pal.rs | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs index 9fa8f5702a843..c827205f80bd7 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -308,8 +308,7 @@ pub fn get_backtrace_style() -> Option { BacktraceStyle::Short } }) - .unwrap_or(if cfg!(target_os = "fuchsia") { - // Fuchsia components default to full backtrace. + .unwrap_or(if crate::sys::BACKTRACE_DEFAULT { BacktraceStyle::Full } else { BacktraceStyle::Off diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index c080c176a2ace..3864a5195f34b 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -76,3 +76,12 @@ cfg_if::cfg_if! { pub mod c; } } + +cfg_if::cfg_if! { + // Fuchsia components default to full backtrace. + if #[cfg(target_os = "fuchsia")] { + pub const BACKTRACE_DEFAULT: bool = true; + } else { + pub const BACKTRACE_DEFAULT: bool = false; + } +} diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 868579b4b1a8c..6b7b27fd526c3 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -59,7 +59,6 @@ const EXCEPTION_PATHS: &[&str] = &[ "library/std/src/path.rs", "library/std/src/sys_common", // Should only contain abstractions over platforms "library/std/src/net/test.rs", // Utility helpers for tests - "library/std/src/panic.rs", // fuchsia-specific panic backtrace handling "library/std/src/personality.rs", "library/std/src/personality/", ]; From 3ae03c7aee740eda1f18ec7c189bc705cfb44964 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Fri, 17 Mar 2023 21:00:10 -0700 Subject: [PATCH 2/2] review --- library/std/src/panic.rs | 2 +- library/std/src/sys/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs index c827205f80bd7..345d72ef8678e 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -308,7 +308,7 @@ pub fn get_backtrace_style() -> Option { BacktraceStyle::Short } }) - .unwrap_or(if crate::sys::BACKTRACE_DEFAULT { + .unwrap_or(if crate::sys::FULL_BACKTRACE_DEFAULT { BacktraceStyle::Full } else { BacktraceStyle::Off diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 3864a5195f34b..e767b2866cb9b 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -80,8 +80,8 @@ cfg_if::cfg_if! { cfg_if::cfg_if! { // Fuchsia components default to full backtrace. if #[cfg(target_os = "fuchsia")] { - pub const BACKTRACE_DEFAULT: bool = true; + pub const FULL_BACKTRACE_DEFAULT: bool = true; } else { - pub const BACKTRACE_DEFAULT: bool = false; + pub const FULL_BACKTRACE_DEFAULT: bool = false; } }