From 87e4b43d518c754cc8c522da04ac3a6ae30eb7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Mon, 15 Apr 2019 13:35:08 +0200 Subject: [PATCH] Deny `internal` in stage0 --- src/bootstrap/bin/rustc.rs | 4 +--- src/libarena/lib.rs | 2 +- src/libfmt_macros/lib.rs | 2 +- src/librustc/lib.rs | 2 +- src/librustc/ty/mod.rs | 2 +- src/librustc_allocator/lib.rs | 2 +- src/librustc_borrowck/lib.rs | 2 +- src/librustc_codegen_ssa/lib.rs | 2 +- src/librustc_codegen_utils/lib.rs | 2 +- src/librustc_driver/lib.rs | 2 +- src/librustc_errors/lib.rs | 2 +- src/librustc_incremental/lib.rs | 2 +- src/librustc_interface/lib.rs | 2 +- src/librustc_lint/lib.rs | 2 +- src/librustc_metadata/lib.rs | 2 +- src/librustc_mir/lib.rs | 2 +- src/librustc_passes/lib.rs | 2 +- src/librustc_privacy/lib.rs | 2 +- src/librustc_resolve/lib.rs | 2 +- src/librustc_save_analysis/lib.rs | 2 +- src/librustc_target/lib.rs | 2 +- src/librustc_traits/lib.rs | 2 +- src/librustc_typeck/lib.rs | 2 +- src/librustdoc/lib.rs | 2 +- src/libsyntax/lib.rs | 2 +- src/libsyntax_ext/lib.rs | 2 +- src/libsyntax_pos/lib.rs | 2 +- 27 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index a76584093fc7..a8f0d24ce63d 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -290,9 +290,7 @@ fn main() { } // This is required for internal lints. - if stage != "0" { - cmd.arg("-Zunstable-options"); - } + cmd.arg("-Zunstable-options"); // Force all crates compiled by this compiler to (a) be unstable and (b) // allow the `rustc_private` feature to link to other unstable crates diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index cfe317a00f90..ce5e5f23a94b 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -12,7 +12,7 @@ test(no_crate_inject, attr(deny(warnings))))] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(core_intrinsics)] #![feature(dropck_eyepatch)] diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs index 2536121c7a32..6fed83021609 100644 --- a/src/libfmt_macros/lib.rs +++ b/src/libfmt_macros/lib.rs @@ -9,7 +9,7 @@ test(attr(deny(warnings))))] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(nll)] #![feature(rustc_private)] diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index c5c2cbfcb894..4cbf8e3ecfc6 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -29,7 +29,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(explicit_outlives_requirements)] #![feature(arbitrary_self_types)] diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index d24395ac9c18..4aca01d9411c 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -1,4 +1,4 @@ -#![cfg_attr(not(stage0), allow(usage_of_ty_tykind))] +#![allow(usage_of_ty_tykind)] pub use self::Variance::*; pub use self::AssociatedItemContainer::*; diff --git a/src/librustc_allocator/lib.rs b/src/librustc_allocator/lib.rs index a9e422fb238b..3aef5a76a3a0 100644 --- a/src/librustc_allocator/lib.rs +++ b/src/librustc_allocator/lib.rs @@ -2,7 +2,7 @@ #![feature(rustc_private)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] pub mod expand; diff --git a/src/librustc_borrowck/lib.rs b/src/librustc_borrowck/lib.rs index 3761a52bcccf..14bc77f380ac 100644 --- a/src/librustc_borrowck/lib.rs +++ b/src/librustc_borrowck/lib.rs @@ -2,7 +2,7 @@ #![allow(non_camel_case_types)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(nll)] diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs index e2917578c0ec..c6e689f2e83c 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -14,7 +14,7 @@ #![allow(unused_attributes)] #![allow(dead_code)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(explicit_outlives_requirements)] #![recursion_limit="256"] diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs index 330cfe154e30..437515f1e9ab 100644 --- a/src/librustc_codegen_utils/lib.rs +++ b/src/librustc_codegen_utils/lib.rs @@ -16,7 +16,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[macro_use] extern crate rustc; diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 66c7c9d0eae7..6a5accc8d7f0 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -17,7 +17,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] pub extern crate getopts; #[cfg(unix)] diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 71bef54cd17a..cb45e13c4d2d 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -6,7 +6,7 @@ #![feature(nll)] #![feature(optin_builtin_traits)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[allow(unused_extern_crates)] extern crate serialize as rustc_serialize; // used by deriving diff --git a/src/librustc_incremental/lib.rs b/src/librustc_incremental/lib.rs index d7db324f3463..eb82885abee0 100644 --- a/src/librustc_incremental/lib.rs +++ b/src/librustc_incremental/lib.rs @@ -8,7 +8,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[macro_use] extern crate rustc; #[allow(unused_extern_crates)] diff --git a/src/librustc_interface/lib.rs b/src/librustc_interface/lib.rs index 353ff6a57a5e..d1e2a1a4ad50 100644 --- a/src/librustc_interface/lib.rs +++ b/src/librustc_interface/lib.rs @@ -7,7 +7,7 @@ #![cfg_attr(unix, feature(libc))] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(unused_imports)] diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 9354f203e4e4..ff5e4f02554c 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -20,7 +20,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[macro_use] extern crate rustc; diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index 4078171733fc..d052e13f9c0a 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -14,7 +14,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] extern crate libc; #[allow(unused_extern_crates)] diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index deeed9a0b984..a16eaf011c86 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.rs @@ -28,7 +28,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment! #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(explicit_outlives_requirements)] #[macro_use] extern crate log; diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs index 20442a4a566e..db8fcaa56938 100644 --- a/src/librustc_passes/lib.rs +++ b/src/librustc_passes/lib.rs @@ -12,7 +12,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[macro_use] extern crate rustc; diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index 44621e5dc95d..ef315c5f9550 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -1,7 +1,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(nll)] #![feature(rustc_diagnostic_macros)] diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 96aac9772979..864fc2ebaec7 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -9,7 +9,7 @@ #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] pub use rustc::hir::def::{Namespace, PerNS}; diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index ce0decaee496..d901fb2bff8c 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -2,7 +2,7 @@ #![feature(custom_attribute)] #![feature(nll)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(unused_attributes)] #![recursion_limit="256"] diff --git a/src/librustc_target/lib.rs b/src/librustc_target/lib.rs index f1812c20dccd..3fcf08adb5c8 100644 --- a/src/librustc_target/lib.rs +++ b/src/librustc_target/lib.rs @@ -16,7 +16,7 @@ #![feature(step_trait)] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #[macro_use] extern crate log; diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs index bc034e1fb162..959130f1cf22 100644 --- a/src/librustc_traits/lib.rs +++ b/src/librustc_traits/lib.rs @@ -2,7 +2,7 @@ //! the guts are broken up into modules; see the comments in those modules. #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(crate_visibility_modifier)] #![feature(in_band_lifetimes)] diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 21d1af229ddc..4320e28d676e 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -71,7 +71,7 @@ This API is completely unstable and subject to change. #![recursion_limit="256"] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![allow(explicit_outlives_requirements)] #[macro_use] extern crate log; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 6cb937d9216a..5b76f6861de7 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -1,5 +1,5 @@ #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/", html_playground_url = "https://play.rust-lang.org/")] diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 9905b981395c..1486909b2769 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -8,7 +8,7 @@ test(attr(deny(warnings))))] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(crate_visibility_modifier)] #![feature(label_break_value)] diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index ee0b86963f31..8371d2720758 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -3,7 +3,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(in_band_lifetimes)] #![feature(proc_macro_diagnostic)] diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index 1ad556bbcfa5..3f09405a5c8c 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -7,7 +7,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![deny(rust_2018_idioms)] -#![cfg_attr(not(stage0), deny(internal))] +#![deny(internal)] #![feature(const_fn)] #![feature(crate_visibility_modifier)]