remove associated_consts feature gate

73 files changed, 43 insertions, 136 deletions

diff --git a/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
index 7024c9dad7c..9a6d176d088 100644
--- a/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub use self::sub::{Bar, Baz};
 
diff --git a/src/test/compile-fail/E0164.rs b/src/test/compile-fail/E0164.rs
index 8d21cde84da..cf6cf15115a 100644
--- a/src/test/compile-fail/E0164.rs
+++ b/src/test/compile-fail/E0164.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 enum Foo {}
 
diff --git a/src/test/compile-fail/E0438.rs b/src/test/compile-fail/E0438.rs
index 2e2df4bee5a..99e0dbbcea8 100644
--- a/src/test/compile-fail/E0438.rs
+++ b/src/test/compile-fail/E0438.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Bar {}
 
diff --git a/src/test/compile-fail/associated-const-ambiguity-report.rs b/src/test/compile-fail/associated-const-ambiguity-report.rs
index 22292a6da9d..5051e78d1ba 100644
--- a/src/test/compile-fail/associated-const-ambiguity-report.rs
+++ b/src/test/compile-fail/associated-const-ambiguity-report.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32;
diff --git a/src/test/compile-fail/associated-const-array-len.rs b/src/test/compile-fail/associated-const-array-len.rs
index 7f77ae2ec1f..2cc10f0f956 100644
--- a/src/test/compile-fail/associated-const-array-len.rs
+++ b/src/test/compile-fail/associated-const-array-len.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: usize;
diff --git a/src/test/compile-fail/associated-const-dead-code.rs b/src/test/compile-fail/associated-const-dead-code.rs
index 1ed156d45f5..42db13f4f3b 100644
--- a/src/test/compile-fail/associated-const-dead-code.rs
+++ b/src/test/compile-fail/associated-const-dead-code.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![deny(dead_code)]
 
 struct MyFoo;
diff --git a/src/test/compile-fail/associated-const-generic-obligations.rs b/src/test/compile-fail/associated-const-generic-obligations.rs
index 90afe8d7336..45f53418dca 100644
--- a/src/test/compile-fail/associated-const-generic-obligations.rs
+++ b/src/test/compile-fail/associated-const-generic-obligations.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     type Out: Sized;
diff --git a/src/test/compile-fail/associated-const-impl-wrong-lifetime.rs b/src/test/compile-fail/associated-const-impl-wrong-lifetime.rs
index 834f3460694..51681a4bb88 100644
--- a/src/test/compile-fail/associated-const-impl-wrong-lifetime.rs
+++ b/src/test/compile-fail/associated-const-impl-wrong-lifetime.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const NAME: &'static str;
diff --git a/src/test/compile-fail/associated-const-impl-wrong-type.rs b/src/test/compile-fail/associated-const-impl-wrong-type.rs
index ec495c87b1a..e38851ccd6f 100644
--- a/src/test/compile-fail/associated-const-impl-wrong-type.rs
+++ b/src/test/compile-fail/associated-const-impl-wrong-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const BAR: u32; //~ NOTE type in trait
diff --git a/src/test/compile-fail/associated-const-no-item.rs b/src/test/compile-fail/associated-const-no-item.rs
index 89d1ac13087..f9a57cd6d75 100644
--- a/src/test/compile-fail/associated-const-no-item.rs
+++ b/src/test/compile-fail/associated-const-no-item.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32;
diff --git a/src/test/compile-fail/associated-const-private-impl.rs b/src/test/compile-fail/associated-const-private-impl.rs
index 6ebe80b5701..b5accfff5bb 100644
--- a/src/test/compile-fail/associated-const-private-impl.rs
+++ b/src/test/compile-fail/associated-const-private-impl.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 mod bar1 {
     pub use self::bar2::Foo;
diff --git a/src/test/compile-fail/associated-const-type-parameter-arms.rs b/src/test/compile-fail/associated-const-type-parameter-arms.rs
index f564157b498..52bb4a1b463 100644
--- a/src/test/compile-fail/associated-const-type-parameter-arms.rs
+++ b/src/test/compile-fail/associated-const-type-parameter-arms.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub enum EFoo { A, B, C, D }
 
diff --git a/src/test/compile-fail/associated-const-type-parameter-arrays-2.rs b/src/test/compile-fail/associated-const-type-parameter-arrays-2.rs
index e284a61eb2d..d196cf22156 100644
--- a/src/test/compile-fail/associated-const-type-parameter-arrays-2.rs
+++ b/src/test/compile-fail/associated-const-type-parameter-arrays-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait Foo {
     const Y: usize;
diff --git a/src/test/compile-fail/associated-const-type-parameter-arrays.rs b/src/test/compile-fail/associated-const-type-parameter-arrays.rs
index 848ea65a9cf..0b24cab2a68 100644
--- a/src/test/compile-fail/associated-const-type-parameter-arrays.rs
+++ b/src/test/compile-fail/associated-const-type-parameter-arrays.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait Foo {
     const Y: usize;
diff --git a/src/test/compile-fail/associated-const-upper-case-lint.rs b/src/test/compile-fail/associated-const-upper-case-lint.rs
index 752691fa1c5..497ff426b2f 100644
--- a/src/test/compile-fail/associated-const-upper-case-lint.rs
+++ b/src/test/compile-fail/associated-const-upper-case-lint.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![deny(non_upper_case_globals)]
 #![allow(dead_code)]
 
diff --git a/src/test/compile-fail/associated-item-duplicate-names-2.rs b/src/test/compile-fail/associated-item-duplicate-names-2.rs
index ab903591fbb..85ea949b9c8 100644
--- a/src/test/compile-fail/associated-item-duplicate-names-2.rs
+++ b/src/test/compile-fail/associated-item-duplicate-names-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/compile-fail/associated-item-duplicate-names.rs b/src/test/compile-fail/associated-item-duplicate-names.rs
index 85868f5c020..a2fc1bc0177 100644
--- a/src/test/compile-fail/associated-item-duplicate-names.rs
+++ b/src/test/compile-fail/associated-item-duplicate-names.rs
@@ -10,7 +10,6 @@
 
 // Test for issue #23969
 
-#![feature(associated_consts)]
 
 trait Foo {
     type Ty;
diff --git a/src/test/compile-fail/associated-types-overridden-default.rs b/src/test/compile-fail/associated-types-overridden-default.rs
index 19f13f5fc2f..946a4b2f73a 100644
--- a/src/test/compile-fail/associated-types-overridden-default.rs
+++ b/src/test/compile-fail/associated-types-overridden-default.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![feature(associated_type_defaults)]
 
 pub trait Tr {
diff --git a/src/test/compile-fail/auxiliary/issue_41549.rs b/src/test/compile-fail/auxiliary/issue_41549.rs
index 77b203997b4..5a6db789282 100644
--- a/src/test/compile-fail/auxiliary/issue_41549.rs
+++ b/src/test/compile-fail/auxiliary/issue_41549.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait Trait {
     const CONST: u32;
diff --git a/src/test/compile-fail/auxiliary/use_from_trait_xc.rs b/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
index 7024c9dad7c..9a6d176d088 100644
--- a/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
+++ b/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub use self::sub::{Bar, Baz};
 
diff --git a/src/test/compile-fail/gated-associated_consts.rs b/src/test/compile-fail/gated-associated_consts.rs
deleted file mode 100644
index ee4422faf3a..00000000000
--- a/src/test/compile-fail/gated-associated_consts.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// gate-test-associated_consts
-
-trait MyTrait {
-    const C: bool;
-    //~^ associated constants are experimental
-}
-
-struct Foo;
-
-impl Foo {
-    const C: bool = true;
-    //~^ associated constants are experimental
-}
diff --git a/src/test/compile-fail/issue-28992-empty.rs b/src/test/compile-fail/issue-28992-empty.rs
index 48aabce708e..536784508b7 100644
--- a/src/test/compile-fail/issue-28992-empty.rs
+++ b/src/test/compile-fail/issue-28992-empty.rs
@@ -10,7 +10,6 @@
 
 // Can't use constants as tuple struct patterns
 
-#![feature(associated_consts)]
 
 const C1: i32 = 0;
 
diff --git a/src/test/compile-fail/issue-31910.rs b/src/test/compile-fail/issue-31910.rs
index aac8b89e882..7524049c5df 100644
--- a/src/test/compile-fail/issue-31910.rs
+++ b/src/test/compile-fail/issue-31910.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 enum Enum<T: Trait> {
     X = Trait::Number,
diff --git a/src/test/compile-fail/issue-41549.rs b/src/test/compile-fail/issue-41549.rs
index c4aab4bcabf..67be194c8ed 100644
--- a/src/test/compile-fail/issue-41549.rs
+++ b/src/test/compile-fail/issue-41549.rs
@@ -10,7 +10,6 @@
 
 // aux-build:issue_41549.rs
 
-#![feature(associated_consts)]
 
 extern crate issue_41549;
 
diff --git a/src/test/compile-fail/object-safety-associated-consts.rs b/src/test/compile-fail/object-safety-associated-consts.rs
index c442cd40836..ebb52face06 100644
--- a/src/test/compile-fail/object-safety-associated-consts.rs
+++ b/src/test/compile-fail/object-safety-associated-consts.rs
@@ -11,7 +11,6 @@
 // Check that we correctly prevent users from making trait objects
 // from traits with associated consts.
 
-#![feature(associated_consts)]
 
 trait Bar {
     const X: usize;
diff --git a/src/test/compile-fail/privacy-sanity.rs b/src/test/compile-fail/privacy-sanity.rs
index 063848f62aa..933ec3837df 100644
--- a/src/test/compile-fail/privacy-sanity.rs
+++ b/src/test/compile-fail/privacy-sanity.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![feature(optin_builtin_traits)]
 
 trait MarkerTr {}
diff --git a/src/test/compile-fail/private-in-public-warn.rs b/src/test/compile-fail/private-in-public-warn.rs
index 92d96595fd7..f030012b172 100644
--- a/src/test/compile-fail/private-in-public-warn.rs
+++ b/src/test/compile-fail/private-in-public-warn.rs
@@ -11,7 +11,6 @@
 // Private types and traits are not allowed in public interfaces.
 // This test also ensures that the checks are performed even inside private modules.
 
-#![feature(associated_consts)]
 #![feature(associated_type_defaults)]
 #![deny(private_in_public)]
 #![allow(unused)]
diff --git a/src/test/compile-fail/private-in-public.rs b/src/test/compile-fail/private-in-public.rs
index b819ef116ef..b865e391d29 100644
--- a/src/test/compile-fail/private-in-public.rs
+++ b/src/test/compile-fail/private-in-public.rs
@@ -11,7 +11,6 @@
 // Private types and traits are not allowed in public interfaces.
 // This test also ensures that the checks are performed even inside private modules.
 
-#![feature(associated_consts)]
 #![feature(associated_type_defaults)]
 
 mod types {
diff --git a/src/test/compile-fail/stmt_expr_attrs_no_feature.rs b/src/test/compile-fail/stmt_expr_attrs_no_feature.rs
index 2fda2ee0900..d8626dfd39e 100644
--- a/src/test/compile-fail/stmt_expr_attrs_no_feature.rs
+++ b/src/test/compile-fail/stmt_expr_attrs_no_feature.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![feature(custom_attribute)]
-#![feature(associated_consts)]
 
 macro_rules! stmt_mac {
     () => {
diff --git a/src/test/compile-fail/trait-impl-can-not-have-untraitful-items.rs b/src/test/compile-fail/trait-impl-can-not-have-untraitful-items.rs
index 0ed4e62778e..cc143a6209d 100644
--- a/src/test/compile-fail/trait-impl-can-not-have-untraitful-items.rs
+++ b/src/test/compile-fail/trait-impl-can-not-have-untraitful-items.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait A { }
 
diff --git a/src/test/compile-fail/trait-item-privacy.rs b/src/test/compile-fail/trait-item-privacy.rs
index e915ca05f67..b8d83e5adf2 100644
--- a/src/test/compile-fail/trait-item-privacy.rs
+++ b/src/test/compile-fail/trait-item-privacy.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![feature(associated_type_defaults)]
 
 struct S;
diff --git a/src/test/compile-fail/use-from-trait.rs b/src/test/compile-fail/use-from-trait.rs
index 58e37bbfa3e..33adc2b5bfe 100644
--- a/src/test/compile-fail/use-from-trait.rs
+++ b/src/test/compile-fail/use-from-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 use Trait::foo;
 //~^ ERROR `foo` is not directly importable
diff --git a/src/test/incremental/hashes/trait_defs.rs b/src/test/incremental/hashes/trait_defs.rs
index 61a2be054a5..e47556a790b 100644
--- a/src/test/incremental/hashes/trait_defs.rs
+++ b/src/test/incremental/hashes/trait_defs.rs
@@ -30,7 +30,6 @@
 #![crate_type="rlib"]
 #![feature(associated_type_defaults)]
 #![feature(intrinsics)]
-#![feature(associated_consts)]
 
 
 // Change trait visibility --------------------------------------------------------
diff --git a/src/test/run-pass/associated-const-const-eval.rs b/src/test/run-pass/associated-const-const-eval.rs
index 0b230df4146..9c36a42527f 100644
--- a/src/test/run-pass/associated-const-const-eval.rs
+++ b/src/test/run-pass/associated-const-const-eval.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const NUM: usize;
diff --git a/src/test/run-pass/associated-const-cross-crate-const-eval.rs b/src/test/run-pass/associated-const-cross-crate-const-eval.rs
index 7d31bb5b1a5..c2758b1aed7 100644
--- a/src/test/run-pass/associated-const-cross-crate-const-eval.rs
+++ b/src/test/run-pass/associated-const-cross-crate-const-eval.rs
@@ -10,7 +10,6 @@
 
 // aux-build:associated-const-cc-lib.rs
 
-#![feature(associated_consts)]
 
 extern crate associated_const_cc_lib as foolib;
 
diff --git a/src/test/run-pass/associated-const-cross-crate-defaults.rs b/src/test/run-pass/associated-const-cross-crate-defaults.rs
index 92d2aae61c8..084c448ba2a 100644
--- a/src/test/run-pass/associated-const-cross-crate-defaults.rs
+++ b/src/test/run-pass/associated-const-cross-crate-defaults.rs
@@ -10,7 +10,6 @@
 
 // aux-build:associated-const-cc-lib.rs
 
-#![feature(associated_consts)]
 
 extern crate associated_const_cc_lib as foolib;
 
diff --git a/src/test/run-pass/associated-const-cross-crate.rs b/src/test/run-pass/associated-const-cross-crate.rs
index 73d5dc5df96..a882d6ae23d 100644
--- a/src/test/run-pass/associated-const-cross-crate.rs
+++ b/src/test/run-pass/associated-const-cross-crate.rs
@@ -10,7 +10,6 @@
 
 // aux-build:associated-const-cc-lib.rs
 
-#![feature(associated_consts)]
 
 extern crate associated_const_cc_lib as foolib;
 
diff --git a/src/test/run-pass/associated-const-in-global-const.rs b/src/test/run-pass/associated-const-in-global-const.rs
index e3a1e29d20f..b7fb4d73259 100644
--- a/src/test/run-pass/associated-const-in-global-const.rs
+++ b/src/test/run-pass/associated-const-in-global-const.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/run-pass/associated-const-inherent-impl.rs b/src/test/run-pass/associated-const-inherent-impl.rs
index 5c9abf982b1..86454a4a091 100644
--- a/src/test/run-pass/associated-const-inherent-impl.rs
+++ b/src/test/run-pass/associated-const-inherent-impl.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/run-pass/associated-const-marks-live-code.rs b/src/test/run-pass/associated-const-marks-live-code.rs
index ea91a953129..bfeb78ddfe5 100644
--- a/src/test/run-pass/associated-const-marks-live-code.rs
+++ b/src/test/run-pass/associated-const-marks-live-code.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 #![deny(dead_code)]
 
diff --git a/src/test/run-pass/associated-const-match-patterns.rs b/src/test/run-pass/associated-const-match-patterns.rs
index 01d1b27bfc9..54603e6e0d9 100644
--- a/src/test/run-pass/associated-const-match-patterns.rs
+++ b/src/test/run-pass/associated-const-match-patterns.rs
@@ -10,7 +10,6 @@
 
 // aux-build:empty-struct.rs
 
-#![feature(associated_consts)]
 
 extern crate empty_struct;
 use empty_struct::XEmpty2 as XFoo;
diff --git a/src/test/run-pass/associated-const-outer-ty-refs.rs b/src/test/run-pass/associated-const-outer-ty-refs.rs
index 2e6fb11a12d..987c64dbff5 100644
--- a/src/test/run-pass/associated-const-outer-ty-refs.rs
+++ b/src/test/run-pass/associated-const-outer-ty-refs.rs
@@ -7,7 +7,6 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![feature(associated_consts)]
 
 trait Lattice {
     const BOTTOM: Self;
diff --git a/src/test/run-pass/associated-const-overwrite-default.rs b/src/test/run-pass/associated-const-overwrite-default.rs
index 0846ad9a571..bb594cfa0f9 100644
--- a/src/test/run-pass/associated-const-overwrite-default.rs
+++ b/src/test/run-pass/associated-const-overwrite-default.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32 = 2;
diff --git a/src/test/run-pass/associated-const-public-impl.rs b/src/test/run-pass/associated-const-public-impl.rs
index b1d071799e1..5ff363844a1 100644
--- a/src/test/run-pass/associated-const-public-impl.rs
+++ b/src/test/run-pass/associated-const-public-impl.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 mod bar1 {
     pub use self::bar2::Foo;
diff --git a/src/test/run-pass/associated-const-range-match-patterns.rs b/src/test/run-pass/associated-const-range-match-patterns.rs
index d38ccca6891..d72e1efc4d7 100644
--- a/src/test/run-pass/associated-const-range-match-patterns.rs
+++ b/src/test/run-pass/associated-const-range-match-patterns.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/run-pass/associated-const-resolution-order.rs b/src/test/run-pass/associated-const-resolution-order.rs
index 98b7164ab74..5fa49b48200 100644
--- a/src/test/run-pass/associated-const-resolution-order.rs
+++ b/src/test/run-pass/associated-const-resolution-order.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct MyType;
 
diff --git a/src/test/run-pass/associated-const-self-type.rs b/src/test/run-pass/associated-const-self-type.rs
index d3add976b5a..16ccb5b3955 100644
--- a/src/test/run-pass/associated-const-self-type.rs
+++ b/src/test/run-pass/associated-const-self-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait MyInt {
     const ONE: Self;
diff --git a/src/test/run-pass/associated-const-type-parameters.rs b/src/test/run-pass/associated-const-type-parameters.rs
index df208353064..7859a87e014 100644
--- a/src/test/run-pass/associated-const-type-parameters.rs
+++ b/src/test/run-pass/associated-const-type-parameters.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const X: i32;
diff --git a/src/test/run-pass/associated-const-ufcs-infer-trait.rs b/src/test/run-pass/associated-const-ufcs-infer-trait.rs
index aa3e14a9397..b2263067824 100644
--- a/src/test/run-pass/associated-const-ufcs-infer-trait.rs
+++ b/src/test/run-pass/associated-const-ufcs-infer-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32;
diff --git a/src/test/run-pass/associated-const-use-default.rs b/src/test/run-pass/associated-const-use-default.rs
index 5813d867425..5ed9a6dea3d 100644
--- a/src/test/run-pass/associated-const-use-default.rs
+++ b/src/test/run-pass/associated-const-use-default.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32 = 1;
diff --git a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs
index 62658470baa..986f160f3cb 100644
--- a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs
+++ b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 // The main purpose of this test is to ensure that different impls of the same
 // trait can refer to each other without setting off the static recursion check
diff --git a/src/test/run-pass/associated-const.rs b/src/test/run-pass/associated-const.rs
index d9065445009..3c84f4a8335 100644
--- a/src/test/run-pass/associated-const.rs
+++ b/src/test/run-pass/associated-const.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Foo {
     const ID: i32;
diff --git a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
index 1fd8fee0117..e4cada40db3 100644
--- a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
+++ b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 #![crate_type="lib"]
 
diff --git a/src/test/run-pass/issue-23808.rs b/src/test/run-pass/issue-23808.rs
index 0302b11fdbb..1435a1b5d38 100644
--- a/src/test/run-pass/issue-23808.rs
+++ b/src/test/run-pass/issue-23808.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 #![deny(dead_code)]
 
 // use different types / traits to test all combinations
diff --git a/src/test/run-pass/issue-24947.rs b/src/test/run-pass/issue-24947.rs
index 2b0c90c4d15..19a364a93fd 100644
--- a/src/test/run-pass/issue-24947.rs
+++ b/src/test/run-pass/issue-24947.rs
@@ -10,7 +10,6 @@
 
 // #24947 ICE using a trait-associated const in an array size
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/run-pass/issue-25145.rs b/src/test/run-pass/issue-25145.rs
index 6f02f278381..d5d23012e04 100644
--- a/src/test/run-pass/issue-25145.rs
+++ b/src/test/run-pass/issue-25145.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 struct S;
 
diff --git a/src/test/run-pass/issue-26095.rs b/src/test/run-pass/issue-26095.rs
index f34685c6936..9d8d9c3ff2e 100644
--- a/src/test/run-pass/issue-26095.rs
+++ b/src/test/run-pass/issue-26095.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait HasNumber<T> {
     const Number: usize;
diff --git a/src/test/run-pass/issue-31267-additional.rs b/src/test/run-pass/issue-31267-additional.rs
index a6b42525887..06ab310f6d2 100644
--- a/src/test/run-pass/issue-31267-additional.rs
+++ b/src/test/run-pass/issue-31267-additional.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 #[derive(Clone, Copy, Debug)]
 struct Bar;
diff --git a/src/test/run-pass/issue-31267.rs b/src/test/run-pass/issue-31267.rs
index 90eb0f6c841..9cbdde40491 100644
--- a/src/test/run-pass/issue-31267.rs
+++ b/src/test/run-pass/issue-31267.rs
@@ -10,7 +10,6 @@
 
 // Regression test for issue #31267
 
-#![feature(associated_consts)]
 
 struct Foo;
 
diff --git a/src/test/run-pass/issue-40136.rs b/src/test/run-pass/issue-40136.rs
index db642812b4b..488754af06f 100644
--- a/src/test/run-pass/issue-40136.rs
+++ b/src/test/run-pass/issue-40136.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 macro_rules! m { () => { 0 } }
 
diff --git a/src/test/rustdoc/assoc-consts.rs b/src/test/rustdoc/assoc-consts.rs
index 8720d419a4d..2edf61288f5 100644
--- a/src/test/rustdoc/assoc-consts.rs
+++ b/src/test/rustdoc/assoc-consts.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait Foo {
     // @has assoc_consts/trait.Foo.html '//*[@class="rust trait"]' \
diff --git a/src/test/rustdoc/auxiliary/issue-36031.rs b/src/test/rustdoc/auxiliary/issue-36031.rs
index 6b8a4b9f137..6611cc428b0 100644
--- a/src/test/rustdoc/auxiliary/issue-36031.rs
+++ b/src/test/rustdoc/auxiliary/issue-36031.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait Foo {
     const FOO: usize;
diff --git a/src/test/rustdoc/const-doc.rs b/src/test/rustdoc/const-doc.rs
index 9f70fe43175..9884e3d2c19 100644
--- a/src/test/rustdoc/const-doc.rs
+++ b/src/test/rustdoc/const-doc.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 use std::marker::PhantomData;
 
diff --git a/src/test/rustdoc/issue-28478.rs b/src/test/rustdoc/issue-28478.rs
index 493c08693e9..c1141cb031e 100644
--- a/src/test/rustdoc/issue-28478.rs
+++ b/src/test/rustdoc/issue-28478.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![feature(associated_type_defaults)]
-#![feature(associated_consts)]
 
 // @has issue_28478/trait.Bar.html
 pub trait Bar {
diff --git a/src/test/rustdoc/issue-31808.rs b/src/test/rustdoc/issue-31808.rs
index 46be8229d7c..20105babfd9 100644
--- a/src/test/rustdoc/issue-31808.rs
+++ b/src/test/rustdoc/issue-31808.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts, associated_types)]
-
 // Test that associated item impls on primitive types don't crash rustdoc
 
 pub trait Foo {
diff --git a/src/test/rustdoc/issue-33302.rs b/src/test/rustdoc/issue-33302.rs
index a34ee908ef2..a6ff001b96f 100644
--- a/src/test/rustdoc/issue-33302.rs
+++ b/src/test/rustdoc/issue-33302.rs
@@ -11,7 +11,6 @@
 // Ensure constant and array length values are not taken from source
 // code, which wreaks havoc with macros.
 
-#![feature(associated_consts)]
 
 macro_rules! make {
     ($n:expr) => {
diff --git a/src/test/ui/missing-items/auxiliary/m1.rs b/src/test/ui/missing-items/auxiliary/m1.rs
index f8389692267..49fc586d6b5 100644
--- a/src/test/ui/missing-items/auxiliary/m1.rs
+++ b/src/test/ui/missing-items/auxiliary/m1.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 pub trait X {
     const CONSTANT: u32;
diff --git a/src/test/ui/missing-items/m2.rs b/src/test/ui/missing-items/m2.rs
index fc09039640b..ffd7ff7f432 100644
--- a/src/test/ui/missing-items/m2.rs
+++ b/src/test/ui/missing-items/m2.rs
@@ -10,7 +10,6 @@
 
 // aux-build:m1.rs
 
-#![feature(associated_consts)]
 
 extern crate m1;
 
diff --git a/src/test/ui/missing-items/m2.stderr b/src/test/ui/missing-items/m2.stderr
index 51afb95b896..ce061bd167a 100644
--- a/src/test/ui/missing-items/m2.stderr
+++ b/src/test/ui/missing-items/m2.stderr
@@ -1,10 +1,10 @@
 error[E0601]: main function not found
 
 error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method`
-  --> $DIR/m2.rs:20:1
+  --> $DIR/m2.rs:19:1
    |
-20 | / impl m1::X for X {
-21 | | }
+19 | / impl m1::X for X {
+20 | | }
    | |_^ missing `CONSTANT`, `Type`, `method` in implementation
    |
    = note: `CONSTANT` from trait: `const CONSTANT: u32;`
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.rs b/src/test/ui/span/impl-wrong-item-for-trait.rs
index 54ed42af5d5..091df1d5dc8 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.rs
+++ b/src/test/ui/span/impl-wrong-item-for-trait.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 use std::fmt::Debug;
 
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/src/test/ui/span/impl-wrong-item-for-trait.stderr
index 2c4c6a148d7..5812cab0d05 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.stderr
+++ b/src/test/ui/span/impl-wrong-item-for-trait.stderr
@@ -1,86 +1,86 @@
 error[E0437]: type `bar` is not a member of trait `Foo`
-  --> $DIR/impl-wrong-item-for-trait.rs:47:5
+  --> $DIR/impl-wrong-item-for-trait.rs:46:5
    |
-47 |     type bar = u64;
+46 |     type bar = u64;
    |     ^^^^^^^^^^^^^^^ not a member of trait `Foo`
 
 error[E0323]: item `bar` is an associated const, which doesn't match its trait `Foo`
-  --> $DIR/impl-wrong-item-for-trait.rs:25:5
+  --> $DIR/impl-wrong-item-for-trait.rs:24:5
    |
-16 |     fn bar(&self);
+15 |     fn bar(&self);
    |     -------------- item in trait
 ...
-25 |     const bar: u64 = 1;
+24 |     const bar: u64 = 1;
    |     ^^^^^^^^^^^^^^^^^^^ does not match trait
 
 error[E0046]: not all trait items implemented, missing: `bar`
-  --> $DIR/impl-wrong-item-for-trait.rs:22:1
+  --> $DIR/impl-wrong-item-for-trait.rs:21:1
    |
-16 |       fn bar(&self);
+15 |       fn bar(&self);
    |       -------------- `bar` from trait
 ...
-22 | / impl Foo for FooConstForMethod {
-23 | |     //~^ ERROR E0046
-24 | |     //~| NOTE missing `bar` in implementation
-25 | |     const bar: u64 = 1;
+21 | / impl Foo for FooConstForMethod {
+22 | |     //~^ ERROR E0046
+23 | |     //~| NOTE missing `bar` in implementation
+24 | |     const bar: u64 = 1;
 ...  |
-28 | |     const MY_CONST: u32 = 1;
-29 | | }
+27 | |     const MY_CONST: u32 = 1;
+28 | | }
    | |_^ missing `bar` in implementation
 
 error[E0324]: item `MY_CONST` is an associated method, which doesn't match its trait `Foo`
-  --> $DIR/impl-wrong-item-for-trait.rs:37:5
+  --> $DIR/impl-wrong-item-for-trait.rs:36:5
    |
-17 |     const MY_CONST: u32;
+16 |     const MY_CONST: u32;
    |     -------------------- item in trait
 ...
-37 |     fn MY_CONST() {}
+36 |     fn MY_CONST() {}
    |     ^^^^^^^^^^^^^^^^ does not match trait
 
 error[E0046]: not all trait items implemented, missing: `MY_CONST`
-  --> $DIR/impl-wrong-item-for-trait.rs:33:1
+  --> $DIR/impl-wrong-item-for-trait.rs:32:1
    |
-17 |       const MY_CONST: u32;
+16 |       const MY_CONST: u32;
    |       -------------------- `MY_CONST` from trait
 ...
-33 | / impl Foo for FooMethodForConst {
-34 | |     //~^ ERROR E0046
-35 | |     //~| NOTE missing `MY_CONST` in implementation
-36 | |     fn bar(&self) {}
+32 | / impl Foo for FooMethodForConst {
+33 | |     //~^ ERROR E0046
+34 | |     //~| NOTE missing `MY_CONST` in implementation
+35 | |     fn bar(&self) {}
 ...  |
-39 | |     //~| NOTE does not match trait
-40 | | }
+38 | |     //~| NOTE does not match trait
+39 | | }
    | |_^ missing `MY_CONST` in implementation
 
 error[E0325]: item `bar` is an associated type, which doesn't match its trait `Foo`
-  --> $DIR/impl-wrong-item-for-trait.rs:47:5
+  --> $DIR/impl-wrong-item-for-trait.rs:46:5
    |
-16 |     fn bar(&self);
+15 |     fn bar(&self);
    |     -------------- item in trait
 ...
-47 |     type bar = u64;
+46 |     type bar = u64;
    |     ^^^^^^^^^^^^^^^ does not match trait
 
 error[E0046]: not all trait items implemented, missing: `bar`
-  --> $DIR/impl-wrong-item-for-trait.rs:44:1
+  --> $DIR/impl-wrong-item-for-trait.rs:43:1
    |
-16 |       fn bar(&self);
+15 |       fn bar(&self);
    |       -------------- `bar` from trait
 ...
-44 | / impl Foo for FooTypeForMethod {
-45 | |     //~^ ERROR E0046
-46 | |     //~| NOTE missing `bar` in implementation
-47 | |     type bar = u64;
+43 | / impl Foo for FooTypeForMethod {
+44 | |     //~^ ERROR E0046
+45 | |     //~| NOTE missing `bar` in implementation
+46 | |     type bar = u64;
 ...  |
-50 | |     const MY_CONST: u32 = 1;
-51 | | }
+49 | |     const MY_CONST: u32 = 1;
+50 | | }
    | |_^ missing `bar` in implementation
 
 error[E0046]: not all trait items implemented, missing: `fmt`
-  --> $DIR/impl-wrong-item-for-trait.rs:53:1
+  --> $DIR/impl-wrong-item-for-trait.rs:52:1
    |
-53 | / impl Debug for FooTypeForMethod {
-54 | | }
+52 | / impl Debug for FooTypeForMethod {
+53 | | }
    | |_^ missing `fmt` in implementation
    |
    = note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
diff --git a/src/test/ui/span/issue-29595.rs b/src/test/ui/span/issue-29595.rs
index 79704619ccd..ed7f2d1a92e 100644
--- a/src/test/ui/span/issue-29595.rs
+++ b/src/test/ui/span/issue-29595.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(associated_consts)]
 
 trait Tr {
     const C: Self;
diff --git a/src/test/ui/span/issue-29595.stderr b/src/test/ui/span/issue-29595.stderr
index abbac245f89..81ba0057d71 100644
--- a/src/test/ui/span/issue-29595.stderr
+++ b/src/test/ui/span/issue-29595.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `u8: Tr` is not satisfied
-  --> $DIR/issue-29595.rs:18:17
+  --> $DIR/issue-29595.rs:17:17
    |
-18 |     let a: u8 = Tr::C; //~ ERROR the trait bound `u8: Tr` is not satisfied
+17 |     let a: u8 = Tr::C; //~ ERROR the trait bound `u8: Tr` is not satisfied
    |                 ^^^^^ the trait `Tr` is not implemented for `u8`
    |
    = note: required by `Tr::C`