diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-07-17 09:32:08 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-07-25 07:03:19 -0700 |
| commit | 9010567dcc0aba772525841aee67c030ea3450c6 (patch) | |
| tree | 26b11fb6639fcde4477f8f0db8f04af1b5984a7c /src/libstd/lib.rs | |
| parent | 7c46c6c59dbee8d6385f8924fe27cc5a7893841f (diff) | |
Bump master to 1.21.0
This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index a012f2f42c1..7584d753240 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -318,8 +318,7 @@ #![feature(vec_push_all)] #![cfg_attr(test, feature(update_panic_count))] -#![cfg_attr(not(stage0), default_lib_allocator)] -#![cfg_attr(stage0, feature(associated_consts))] +#![default_lib_allocator] // Explicitly import the prelude. The compiler uses this same unstable attribute // to import the prelude implicitly when building crates that depend on std. |