diff options
| author | bors <bors@rust-lang.org> | 2016-08-11 01:58:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 01:58:48 -0700 |
| commit | 695b3d8279e17689b988e000203ba95ffeb4a91c (patch) | |
| tree | 2ead4208b3bcc7c6f990b8f34ecb83e4a96f9e1f /src/libstd/lib.rs | |
| parent | 1222f5d52ba0586d67c32a5bc4a3097eb9574aae (diff) | |
| parent | ea2216cba88f225c758070fd457e321a58c63951 (diff) | |
| download | rust-695b3d8279e17689b988e000203ba95ffeb4a91c.tar.gz rust-695b3d8279e17689b988e000203ba95ffeb4a91c.zip | |
Auto merge of #34866 - cynicaldevil:panic-counter, r=alexcrichton
Refactored code to access TLS only in case of panic (II) Fixes #34787 r? @alexcrichton Do it **very** carefully this time!
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index c6272012d66..c05e0c3ca68 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -278,6 +278,7 @@ #![feature(unwind_attributes)] #![feature(vec_push_all)] #![feature(zero_one)] +#![cfg_attr(test, feature(update_panic_count))] // Issue# 30592: Systematically use alloc_system during stage0 since jemalloc // might be unavailable or disabled |