about summary refs log tree commit diff
path: root/src/libstd/thread/mod.rs
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-09-14 10:23:10 +0200
committerRalf Jung <post@ralfj.de>2019-09-14 10:23:51 +0200
commitb60954757eb1acd4069ddbc28a51f4a5bb7d42c9 (patch)
treededa1c332a73e20c428ae5ea31893ff7d110136c /src/libstd/thread/mod.rs
parent3287a65fc05028dce3b521765f4643384ebc4346 (diff)
downloadrust-b60954757eb1acd4069ddbc28a51f4a5bb7d42c9.tar.gz
rust-b60954757eb1acd4069ddbc28a51f4a5bb7d42c9.zip
std: always depend on backtrace, but only enable its features on demand
Diffstat (limited to 'src/libstd/thread/mod.rs')
-rw-r--r--src/libstd/thread/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 764041d2f42..85fd80e16af 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -465,11 +465,11 @@ impl Builder {
             }
 
             thread_info::set(imp::guard::current(), their_thread);
-            #[cfg(feature = "backtrace")]
+            #[cfg(feature = "backtrace_support")]
             let try_result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
                 crate::sys_common::backtrace::__rust_begin_short_backtrace(f)
             }));
-            #[cfg(not(feature = "backtrace"))]
+            #[cfg(not(feature = "backtrace_support"))]
             let try_result = panic::catch_unwind(panic::AssertUnwindSafe(f));
             *their_packet.get() = Some(try_result);
         };