diff options
| author | bors <bors@rust-lang.org> | 2017-07-07 18:42:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-07 18:42:14 +0000 |
| commit | 13157c4ebcca735a0842bd03c3dad1de7c429f9f (patch) | |
| tree | f19fcd32fb92b89f0a3c5a8efadb07557bf3d9dc /src/libstd | |
| parent | c0ec385caca94e0940ae1680a5504acd12835657 (diff) | |
| parent | 74b2d693589add69cf03588ae0eb336c1be7d52b (diff) | |
| download | rust-13157c4ebcca735a0842bd03c3dad1de7c429f9f.tar.gz rust-13157c4ebcca735a0842bd03c3dad1de7c429f9f.zip | |
Auto merge of #42809 - seanmonstar:stable-associated-consts, r=nikomatsakis
remove associated_consts feature gate Currently struggling to run tests locally (something about jemalloc target missing). cc #29646
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index c4bdf7c5b82..2fc107c663b 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -245,7 +245,6 @@ #![feature(allocator_internals)] #![feature(allow_internal_unstable)] #![feature(asm)] -#![feature(associated_consts)] #![feature(box_syntax)] #![feature(cfg_target_has_atomic)] #![feature(cfg_target_thread_local)] @@ -320,6 +319,7 @@ #![cfg_attr(test, feature(float_bits_conv))] #![cfg_attr(not(stage0), default_lib_allocator)] +#![cfg_attr(stage0, feature(associated_consts))] // Explicitly import the prelude. The compiler uses this same unstable attribute // to import the prelude implicitly when building crates that depend on std. |