Eliminate some needlessly cfg'd Backtrace imports

dtolnay · Mar 20, 2021 · fea4d8a · fea4d8a
1 parent 1631007
commit fea4d8a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/backtrace.rs b/src/backtrace.rs
@@ -7,7 +7,7 @@ pub(crate) enum Backtrace {}
 #[cfg(backtrace)]
 macro_rules! backtrace {
     () => {
-        Some(Backtrace::capture())
+        Some(crate::backtrace::Backtrace::capture())
     };
 }
 
@@ -23,7 +23,7 @@ macro_rules! backtrace_if_absent {
     ($err:expr) => {
         match $err.backtrace() {
             Some(_) => None,
-            None => Some(Backtrace::capture()),
+            None => backtrace!(),
         }
     };
 }

diff --git a/src/kind.rs b/src/kind.rs
@@ -50,9 +50,6 @@ use core::fmt::{Debug, Display};
 #[cfg(feature = "std")]
 use crate::StdError;
 
-#[cfg(backtrace)]
-use std::backtrace::Backtrace;
-
 pub struct Adhoc;
 
 pub trait AdhocKind: Sized {

diff --git a/src/lib.rs b/src/lib.rs
@@ -613,9 +613,6 @@ pub mod private {
     use crate::Error;
     use core::fmt::{Debug, Display};
 
-    #[cfg(backtrace)]
-    use std::backtrace::Backtrace;
-
     pub use core::result::Result::Err;
 
     #[doc(hidden)]