diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-05-24 19:50:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 19:50:02 -0600 |
| commit | 8bac98a25285f8855315e802afdfd22fd0c4ddc4 (patch) | |
| tree | 3dc422eeb7c8f6ac0f23ac03e967b1be04552afe /src/libstd/thread/mod.rs | |
| parent | 00c87a6486428b072199809b051beea1124f616f (diff) | |
| parent | 66237afce454db9235525dc715238568c492f54b (diff) | |
| download | rust-8bac98a25285f8855315e802afdfd22fd0c4ddc4.tar.gz rust-8bac98a25285f8855315e802afdfd22fd0c4ddc4.zip | |
Rollup merge of #42141 - ids1024:nobacktrace, r=aturon
Fix building std without backtrace feature, which was broken in ca8b754 Fixes #42139
Diffstat (limited to 'src/libstd/thread/mod.rs')
| -rw-r--r-- | src/libstd/thread/mod.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index c67f2770190..d0e3b00d75f 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -359,9 +359,12 @@ impl Builder { } unsafe { thread_info::set(imp::guard::current(), their_thread); + #[cfg(feature = "backtrace")] let try_result = panic::catch_unwind(panic::AssertUnwindSafe(|| { ::sys_common::backtrace::__rust_begin_short_backtrace(f) })); + #[cfg(not(feature = "backtrace"))] + let try_result = panic::catch_unwind(panic::AssertUnwindSafe(f)); *their_packet.get() = Some(try_result); } }; |