Skip to content

Commit 13157c4

Browse files
committedJul 7, 2017
Auto merge of rust-lang#42809 - seanmonstar:stable-associated-consts, r=nikomatsakis
remove associated_consts feature gate Currently struggling to run tests locally (something about jemalloc target missing). cc rust-lang#29646
2 parents c0ec385 + 74b2d69 commit 13157c4

File tree

87 files changed

+64
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+64
-266
lines changed
 

‎src/doc/unstable-book/src/language-features/associated-consts.md

-85
This file was deleted.

‎src/libcore/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
#![feature(allow_internal_unstable)]
7171
#![feature(asm)]
7272
#![feature(associated_type_defaults)]
73-
#![feature(associated_consts)]
7473
#![feature(cfg_target_feature)]
7574
#![feature(cfg_target_has_atomic)]
7675
#![feature(concat_idents)]
@@ -94,6 +93,8 @@
9493
#![feature(untagged_unions)]
9594
#![feature(unwind_attributes)]
9695

96+
#![cfg_attr(stage0, feature(associated_consts))]
97+
9798
#[prelude_import]
9899
#[allow(unused)]
99100
use prelude::v1::*;

0 commit comments

Comments
 (0)