diff options
| author | Gus Caplan <me@gus.host> | 2023-03-05 18:55:30 -0800 |
|---|---|---|
| committer | Gus Caplan <me@gus.host> | 2023-03-17 20:59:28 -0700 |
| commit | d1712f49d72c3455abf275f1fb1d5b7653d02e2c (patch) | |
| tree | 0ac0279257e0af3d75c0e0ade3626e98c0b2225c | |
| parent | 13afbdaa0655dda23d7129e59ac48f1ec88b2084 (diff) | |
| download | rust-d1712f49d72c3455abf275f1fb1d5b7653d02e2c.tar.gz rust-d1712f49d72c3455abf275f1fb1d5b7653d02e2c.zip | |
move default backtrace setting to sys
| -rw-r--r-- | library/std/src/panic.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 9 | ||||
| -rw-r--r-- | 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 9fa8f5702a8..c827205f80b 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -308,8 +308,7 @@ pub fn get_backtrace_style() -> Option<BacktraceStyle> { 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 c080c176a2a..3864a5195f3 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 868579b4b1a..6b7b27fd526 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/", ]; |