From df47705cb1735edc42d2fe27840373fc49ee77e5 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 26 Dec 2023 14:50:03 -0800 Subject: [PATCH] Rename cfg(backtrace) -> cfg(std_backtrace) --- build.rs | 2 +- src/backtrace.rs | 20 ++++++++++---------- src/error.rs | 22 +++++++++++----------- src/fmt.rs | 2 +- tests/test_fmt.rs | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build.rs b/build.rs index 2e91bfb..2670a20 100644 --- a/build.rs +++ b/build.rs @@ -51,7 +51,7 @@ fn main() { match compile_probe() { Some(status) if status.success() => { - println!("cargo:rustc-cfg=backtrace"); + println!("cargo:rustc-cfg=std_backtrace"); println!("cargo:rustc-cfg=error_generic_member_access"); } _ => {} diff --git a/src/backtrace.rs b/src/backtrace.rs index cc5298c..65ad1cc 100644 --- a/src/backtrace.rs +++ b/src/backtrace.rs @@ -1,34 +1,34 @@ -#[cfg(backtrace)] +#[cfg(std_backtrace)] pub(crate) use std::backtrace::{Backtrace, BacktraceStatus}; -#[cfg(all(not(backtrace), feature = "backtrace"))] +#[cfg(all(not(std_backtrace), feature = "backtrace"))] pub(crate) use self::capture::{Backtrace, BacktraceStatus}; -#[cfg(not(any(backtrace, feature = "backtrace")))] +#[cfg(not(any(std_backtrace, feature = "backtrace")))] pub(crate) enum Backtrace {} -#[cfg(backtrace)] +#[cfg(std_backtrace)] macro_rules! impl_backtrace { () => { std::backtrace::Backtrace }; } -#[cfg(all(not(backtrace), feature = "backtrace"))] +#[cfg(all(not(std_backtrace), feature = "backtrace"))] macro_rules! impl_backtrace { () => { impl core::fmt::Debug + core::fmt::Display }; } -#[cfg(any(backtrace, feature = "backtrace"))] +#[cfg(any(std_backtrace, feature = "backtrace"))] macro_rules! backtrace { () => { Some(crate::backtrace::Backtrace::capture()) }; } -#[cfg(not(any(backtrace, feature = "backtrace")))] +#[cfg(not(any(std_backtrace, feature = "backtrace")))] macro_rules! backtrace { () => { None @@ -48,7 +48,7 @@ macro_rules! backtrace_if_absent { #[cfg(all( feature = "std", not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] macro_rules! backtrace_if_absent { ($err:expr) => { @@ -56,14 +56,14 @@ macro_rules! backtrace_if_absent { }; } -#[cfg(all(feature = "std", not(backtrace), not(feature = "backtrace")))] +#[cfg(all(feature = "std", not(std_backtrace), not(feature = "backtrace")))] macro_rules! backtrace_if_absent { ($err:expr) => { None }; } -#[cfg(all(not(backtrace), feature = "backtrace"))] +#[cfg(all(not(std_backtrace), feature = "backtrace"))] mod capture { use backtrace::{BacktraceFmt, BytesOrWideString, Frame, PrintFmt, SymbolName}; use core::cell::UnsafeCell; diff --git a/src/error.rs b/src/error.rs index c4289c4..d8b47c3 100644 --- a/src/error.rs +++ b/src/error.rs @@ -101,7 +101,7 @@ impl Error { object_drop_rest: object_drop_front::, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: no_backtrace, }; @@ -129,7 +129,7 @@ impl Error { object_drop_rest: object_drop_front::, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: no_backtrace, }; @@ -158,7 +158,7 @@ impl Error { object_drop_rest: object_drop_front::, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: no_backtrace, }; @@ -189,7 +189,7 @@ impl Error { object_drop_rest: context_drop_rest::, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: no_backtrace, }; @@ -218,7 +218,7 @@ impl Error { object_drop_rest: object_drop_front::>, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: no_backtrace, }; @@ -334,7 +334,7 @@ impl Error { object_drop_rest: context_chain_drop_rest::, #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: context_backtrace::, }; @@ -376,7 +376,7 @@ impl Error { /// ``` /// /// [tracking]: https://github.com/rust-lang/rust/issues/53487 - #[cfg(any(backtrace, feature = "backtrace"))] + #[cfg(any(std_backtrace, feature = "backtrace"))] #[cfg_attr(doc_cfg, doc(cfg(any(nightly, feature = "backtrace"))))] pub fn backtrace(&self) -> &impl_backtrace!() { unsafe { ErrorImpl::backtrace(self.inner.by_ref()) } @@ -622,7 +622,7 @@ struct ErrorVTable { object_drop_rest: unsafe fn(Own, TypeId), #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] object_backtrace: unsafe fn(Ref) -> Option<&Backtrace>, } @@ -730,7 +730,7 @@ where #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] fn no_backtrace(e: Ref) -> Option<&Backtrace> { let _ = e; @@ -854,7 +854,7 @@ where // Safety: requires layout of *e to match ErrorImpl>. #[cfg(all( not(error_generic_member_access), - any(backtrace, feature = "backtrace") + any(std_backtrace, feature = "backtrace") ))] #[allow(clippy::unnecessary_wraps)] unsafe fn context_backtrace(e: Ref) -> Option<&Backtrace> @@ -926,7 +926,7 @@ impl ErrorImpl { return unsafe { (vtable(this.ptr).object_mut)(this) }; } - #[cfg(any(backtrace, feature = "backtrace"))] + #[cfg(any(std_backtrace, feature = "backtrace"))] pub(crate) unsafe fn backtrace(this: Ref) -> &Backtrace { // This unwrap can only panic if the underlying error's backtrace method // is nondeterministic, which would only happen in maliciously diff --git a/src/fmt.rs b/src/fmt.rs index 45209f6..a99649b 100644 --- a/src/fmt.rs +++ b/src/fmt.rs @@ -40,7 +40,7 @@ impl ErrorImpl { } } - #[cfg(any(backtrace, feature = "backtrace"))] + #[cfg(any(std_backtrace, feature = "backtrace"))] { use crate::backtrace::BacktraceStatus; diff --git a/tests/test_fmt.rs b/tests/test_fmt.rs index cc49291..9766d36 100644 --- a/tests/test_fmt.rs +++ b/tests/test_fmt.rs @@ -79,7 +79,7 @@ fn test_altdisplay() { } #[test] -#[cfg_attr(not(backtrace), ignore)] +#[cfg_attr(not(std_backtrace), ignore)] fn test_debug() { assert_eq!(EXPECTED_DEBUG_F, format!("{:?}", f().unwrap_err())); assert_eq!(EXPECTED_DEBUG_G, format!("{:?}", g().unwrap_err()));