diff options
| author | bors <bors@rust-lang.org> | 2018-06-30 21:01:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-30 21:01:05 +0000 |
| commit | 48af7714d81bfa9a30d2f0175968ca5232fa23b5 (patch) | |
| tree | f0ec71c2c5f643d95dc69df02cbbc5b8cb72d11a /src/libstd/lib.rs | |
| parent | 74c89b023020e4c6b04acfc877a115c95ec7747b (diff) | |
| parent | 3d6877496866472e1e9af9495d6989ee7ae866ef (diff) | |
| download | rust-48af7714d81bfa9a30d2f0175968ca5232fa23b5.tar.gz rust-48af7714d81bfa9a30d2f0175968ca5232fa23b5.zip | |
Auto merge of #51717 - Mark-Simulacrum:snap, r=alexcrichton
Bootstrap from 1.28.0 beta
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index caad924ea5b..d73cb1f8349 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -322,7 +322,7 @@ #![feature(doc_keyword)] #![feature(float_internals)] #![feature(panic_info_message)] -#![cfg_attr(not(stage0), feature(panic_implementation))] +#![feature(panic_implementation)] #![default_lib_allocator] @@ -332,9 +332,6 @@ // `force_alloc_system` is *only* intended as a workaround for local rebuilds // with a rustc without jemalloc. // FIXME(#44236) shouldn't need MSVC logic -#![cfg_attr(all(not(target_env = "msvc"), - any(all(stage0, not(test)), feature = "force_alloc_system")), - feature(global_allocator))] #[cfg(all(not(target_env = "msvc"), any(all(stage0, not(test)), feature = "force_alloc_system")))] #[global_allocator] |