diff --git a/build.rs b/build.rs index cd0dc64..94f4e6e 100644 --- a/build.rs +++ b/build.rs @@ -86,7 +86,7 @@ fn main() { } if nightly_backtrace_support || (cfg!(feature = "std") && rustc >= 65) { - println!("cargo:rustc-cfg=backtrace"); + println!("cargo:rustc-cfg=std_backtrace"); } } diff --git a/src/backtrace.rs b/src/backtrace.rs index b792a29..623fab2 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 @@ -45,21 +45,21 @@ macro_rules! backtrace_if_absent { }; } -#[cfg(all(feature = "std", not(error_generic_member_access), any(backtrace, feature = "backtrace")))] +#[cfg(all(feature = "std", not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] macro_rules! backtrace_if_absent { ($err:expr) => { backtrace!() }; } -#[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 d06a2d4..bba8e4f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -99,7 +99,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: object_downcast_mut::, object_drop_rest: object_drop_front::, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: no_backtrace, }; @@ -124,7 +124,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: object_downcast_mut::, object_drop_rest: object_drop_front::, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: no_backtrace, }; @@ -150,7 +150,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: object_downcast_mut::, object_drop_rest: object_drop_front::, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: no_backtrace, }; @@ -178,7 +178,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: context_downcast_mut::, object_drop_rest: context_drop_rest::, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: no_backtrace, }; @@ -204,7 +204,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: object_downcast_mut::>, object_drop_rest: object_drop_front::>, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: no_backtrace, }; @@ -317,7 +317,7 @@ impl Error { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: context_chain_downcast_mut::, object_drop_rest: context_chain_drop_rest::, - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: context_backtrace::, }; @@ -354,7 +354,7 @@ impl Error { /// [dependencies] /// anyhow = { version = "1.0", features = ["backtrace"] } /// ``` - #[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()) } @@ -598,7 +598,7 @@ struct ErrorVTable { #[cfg(anyhow_no_ptr_addr_of)] object_downcast_mut: unsafe fn(Mut, TypeId) -> Option>, object_drop_rest: unsafe fn(Own, TypeId), - #[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] + #[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] object_backtrace: unsafe fn(Ref) -> Option<&Backtrace>, } @@ -703,7 +703,7 @@ where } } -#[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] +#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] fn no_backtrace(e: Ref) -> Option<&Backtrace> { let _ = e; None @@ -824,7 +824,7 @@ where } // Safety: requires layout of *e to match ErrorImpl>. -#[cfg(all(not(error_generic_member_access), any(backtrace, feature = "backtrace")))] +#[cfg(all(not(error_generic_member_access), any(std_backtrace, feature = "backtrace")))] #[allow(clippy::unnecessary_wraps)] unsafe fn context_backtrace(e: Ref) -> Option<&Backtrace> where @@ -895,7 +895,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()));