diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-06-22 09:48:43 -0600 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-06-30 13:17:49 -0700 |
| commit | ad97f8b491422d947c1c97d8e9f1bfecdb7f47ba (patch) | |
| tree | 46206c7145336f073d6928bf97dde3941c0a3bbc /src/libstd/lib.rs | |
| parent | 5d95db34a472dc09a90737c83ab533b840dcd224 (diff) | |
| download | rust-ad97f8b491422d947c1c97d8e9f1bfecdb7f47ba.tar.gz rust-ad97f8b491422d947c1c97d8e9f1bfecdb7f47ba.zip | |
Bootstrap from 1.28.0-beta.3
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] |