Skip to content

Commit 74b2d69

Browse files
committed
remove associated_consts feature gate
1 parent ccf401f commit 74b2d69

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

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/libcore/lib.rs

Lines changed: 2 additions & 1 deletion
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::*;

src/librustc/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
html_root_url = "https://doc.rust-lang.org/nightly/")]
2323
#![deny(warnings)]
2424

25-
#![feature(associated_consts)]
2625
#![feature(box_patterns)]
2726
#![feature(box_syntax)]
2827
#![feature(conservative_impl_trait)]
@@ -42,6 +41,8 @@
4241
#![feature(trace_macros)]
4342
#![feature(test)]
4443

44+
#![cfg_attr(stage0, feature(associated_consts))]
45+
4546
#![recursion_limit="256"]
4647

4748
extern crate arena;

src/librustc_bitflags/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010

1111

1212
#![crate_name = "rustc_bitflags"]
13-
#![feature(associated_consts)]
1413
#![crate_type = "rlib"]
1514
#![no_std]
1615
#![deny(warnings)]
1716

17+
#![cfg_attr(stage0, feature(associated_consts))]
18+
1819
//! A typesafe bitmask flag generator.
1920
2021
#[cfg(test)]
@@ -31,7 +32,6 @@ extern crate std;
3132
///
3233
/// ```{.rust}
3334
/// #![feature(rustc_private)]
34-
/// #![feature(associated_consts)]
3535
/// #[macro_use] extern crate rustc_bitflags;
3636
///
3737
/// bitflags! {

src/librustc_borrowck/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
#![feature(quote)]
2222
#![feature(rustc_diagnostic_macros)]
23-
#![feature(associated_consts)]
23+
24+
#![cfg_attr(stage0, feature(associated_consts))]
2425

2526
#[macro_use] extern crate log;
2627
#[macro_use] extern crate syntax;

src/librustc_data_structures/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
#![feature(nonzero)]
3030
#![feature(unboxed_closures)]
3131
#![feature(fn_traits)]
32-
#![feature(associated_consts)]
3332
#![feature(unsize)]
3433
#![feature(i128_type)]
3534
#![feature(conservative_impl_trait)]
3635
#![feature(discriminant_value)]
3736
#![feature(specialization)]
3837
#![feature(manually_drop)]
3938

39+
#![cfg_attr(stage0, feature(associated_consts))]
4040
#![cfg_attr(stage0, feature(struct_field_attributes))]
4141

4242
#![cfg_attr(unix, feature(libc))]

src/librustc_llvm/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
html_root_url = "https://doc.rust-lang.org/nightly/")]
2222
#![deny(warnings)]
2323

24-
#![feature(associated_consts)]
2524
#![feature(box_syntax)]
2625
#![feature(concat_idents)]
2726
#![feature(libc)]
2827
#![feature(link_args)]
2928
#![feature(static_nobundle)]
3029

30+
#![cfg_attr(stage0, feature(associated_consts))]
31+
3132
extern crate libc;
3233
#[macro_use]
3334
#[no_link]

src/librustc_mir/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
1919
#![crate_type = "dylib"]
2020
#![deny(warnings)]
2121

22-
#![feature(associated_consts)]
2322
#![feature(box_patterns)]
2423
#![feature(box_syntax)]
2524
#![feature(i128_type)]
@@ -28,6 +27,8 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2827
#![feature(collection_placement)]
2928
#![feature(nonzero)]
3029

30+
#![cfg_attr(stage0, feature(associated_consts))]
31+
3132
#[macro_use] extern crate log;
3233
extern crate graphviz as dot;
3334
#[macro_use]

src/librustc_resolve/diagnostics.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,8 +1320,6 @@ match the name of any associated constant in the trait.
13201320
Erroneous code example:
13211321
13221322
```compile_fail,E0438
1323-
#![feature(associated_consts)]
1324-
13251323
trait Foo {}
13261324
13271325
impl Foo for i32 {

src/librustc_resolve/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
html_root_url = "https://doc.rust-lang.org/nightly/")]
1717
#![deny(warnings)]
1818

19-
#![feature(associated_consts)]
2019
#![feature(rustc_diagnostic_macros)]
2120

21+
#![cfg_attr(stage0, feature(associated_consts))]
22+
2223
#[macro_use]
2324
extern crate log;
2425
#[macro_use]

0 commit comments

Comments
 (0)