diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index af24cbe1c5c..030f4f1d12c 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -75,7 +75,6 @@ #![feature(concat_idents)] #![feature(const_fn)] #![feature(const_fn_union)] -#![feature(custom_attribute)] #![feature(doc_cfg)] #![feature(doc_spotlight)] #![feature(extern_types)] diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 0fdd326a188..8391f02fc69 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -10,7 +10,6 @@ #![feature(box_syntax)] #![feature(const_cstr_unchecked)] #![feature(crate_visibility_modifier)] -#![feature(custom_attribute)] #![feature(extern_types)] #![feature(in_band_lifetimes)] #![allow(unused_attributes)] diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs index 4d7af7a643b..97de0d823b3 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -3,7 +3,6 @@ #![feature(box_patterns)] #![feature(box_syntax)] #![feature(core_intrinsics)] -#![feature(custom_attribute)] #![feature(libc)] #![feature(rustc_diagnostic_macros)] #![feature(stmt_expr_attributes)] diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs index ea1d0835452..38d1719e776 100644 --- a/src/librustc_codegen_utils/lib.rs +++ b/src/librustc_codegen_utils/lib.rs @@ -8,7 +8,6 @@ #![feature(box_patterns)] #![feature(box_syntax)] #![feature(core_intrinsics)] -#![feature(custom_attribute)] #![feature(never_type)] #![feature(nll)] #![allow(unused_attributes)] diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 1831d58e736..cc3180c783b 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -1,6 +1,5 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] -#![feature(custom_attribute)] #![allow(unused_attributes)] #![cfg_attr(unix, feature(libc))] #![feature(nll)] diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index cca5682d90a..a695a90f2ae 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -1,5 +1,4 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] -#![feature(custom_attribute)] #![feature(nll)] #![deny(rust_2018_idioms)] #![deny(internal)] diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index 24aa82184ce..8f5595968a7 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -11,7 +11,6 @@ #![feature(const_fn)] #![feature(crate_visibility_modifier)] -#![feature(custom_attribute)] #![feature(nll)] #![feature(non_exhaustive)] #![feature(optin_builtin_traits)] diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index 711716d9b92..3b5ac7baf20 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -38,9 +38,6 @@ #![deny(rust_2018_idioms)] #![cfg_attr(windows, feature(libc))] -// Handle rustfmt skips -#![feature(custom_attribute)] -#![allow(unused_attributes)] use std::io::prelude::*; use std::io::{self, Stdout, Stderr}; diff --git a/src/test/run-pass/check-static-recursion-foreign.rs b/src/test/run-pass/check-static-recursion-foreign.rs index c423bf666e5..361f8a1d340 100644 --- a/src/test/run-pass/check-static-recursion-foreign.rs +++ b/src/test/run-pass/check-static-recursion-foreign.rs @@ -6,7 +6,7 @@ // pretty-expanded FIXME #23616 -#![feature(custom_attribute, rustc_private)] +#![feature(rustc_private)] extern crate check_static_recursion_foreign_helper; extern crate libc; diff --git a/src/test/run-pass/macros/macro-attributes.rs b/src/test/run-pass/macros/macro-attributes.rs index 953f6be53c5..d382e8b7197 100644 --- a/src/test/run-pass/macros/macro-attributes.rs +++ b/src/test/run-pass/macros/macro-attributes.rs @@ -1,5 +1,4 @@ // run-pass -#![feature(custom_attribute)] macro_rules! compiles_fine { (#[$at:meta]) => { diff --git a/src/test/ui/attr-eq-token-tree.rs b/src/test/ui/attr-eq-token-tree.rs index 6aacb9d572a..c301492b9e2 100644 --- a/src/test/ui/attr-eq-token-tree.rs +++ b/src/test/ui/attr-eq-token-tree.rs @@ -1,4 +1,2 @@ -#![feature(custom_attribute)] - #[my_attr = !] //~ ERROR unexpected token: `!` fn main() {} diff --git a/src/test/ui/attr-eq-token-tree.stderr b/src/test/ui/attr-eq-token-tree.stderr index 571779dfa1a..bb37c2e0cc4 100644 --- a/src/test/ui/attr-eq-token-tree.stderr +++ b/src/test/ui/attr-eq-token-tree.stderr @@ -1,5 +1,5 @@ error: unexpected token: `!` - --> $DIR/attr-eq-token-tree.rs:3:13 + --> $DIR/attr-eq-token-tree.rs:1:13 | LL | #[my_attr = !] | ^ diff --git a/src/test/ui/custom-attribute-multisegment.rs b/src/test/ui/custom-attribute-multisegment.rs index 95cefe53938..24349213902 100644 --- a/src/test/ui/custom-attribute-multisegment.rs +++ b/src/test/ui/custom-attribute-multisegment.rs @@ -1,7 +1,5 @@ // Unresolved multi-segment attributes are not treated as custom. -#![feature(custom_attribute)] - mod existent {} #[existent::nonexistent] //~ ERROR failed to resolve: could not find `nonexistent` in `existent` diff --git a/src/test/ui/custom-attribute-multisegment.stderr b/src/test/ui/custom-attribute-multisegment.stderr index 9ba9c00e55b..57eca211ed1 100644 --- a/src/test/ui/custom-attribute-multisegment.stderr +++ b/src/test/ui/custom-attribute-multisegment.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve: could not find `nonexistent` in `existent` - --> $DIR/custom-attribute-multisegment.rs:7:13 + --> $DIR/custom-attribute-multisegment.rs:5:13 | LL | #[existent::nonexistent] | ^^^^^^^^^^^ could not find `nonexistent` in `existent` diff --git a/src/test/ui/expanded-cfg.rs b/src/test/ui/expanded-cfg.rs index fbae093f2ac..c98fd7ffea8 100644 --- a/src/test/ui/expanded-cfg.rs +++ b/src/test/ui/expanded-cfg.rs @@ -1,6 +1,6 @@ // skip-codegen // compile-pass -#![feature(custom_attribute)] + macro_rules! mac { {} => { #[cfg(attr)]