From 6a1ca0ba17e5719afb077d64326d2e9ea81d887e Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Sun, 14 Apr 2019 22:35:42 +0200 Subject: [PATCH 1/6] bump bootstrap => 2019-04-11 --- src/stage0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stage0.txt b/src/stage0.txt index 43610f9068f57..17dba63054eac 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,7 +12,7 @@ # source tarball for a stable release you'll likely see `1.x.0` for rustc and # `0.x.0` for Cargo where they were released on `date`. -date: 2019-03-20 +date: 2019-04-11 rustc: beta cargo: beta From d6cc8551903e79bc3874e6d89f042f9691f95995 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Sun, 14 Apr 2019 23:29:22 +0200 Subject: [PATCH 2/6] bump bootstrap; remove redundant imports. --- src/bootstrap/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index bcd28e9cf5e70..fb60b470a36f2 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1125,8 +1125,6 @@ impl Build { /// `rust.save-toolstates` in `config.toml`. If unspecified, nothing will be /// done. The file is updated immediately after this function completes. pub fn save_toolstate(&self, tool: &str, state: ToolState) { - use std::io::{Seek, SeekFrom}; - if let Some(ref path) = self.config.save_toolstates { let mut file = t!(fs::OpenOptions::new() .create(true) From 26e9a81c487f63c734bb7ac1739cdae2da2cb9b1 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Mon, 15 Apr 2019 04:05:37 +0200 Subject: [PATCH 3/6] bump bootstrap; fix compiletest wrt. exclude_should_panic --- src/tools/compiletest/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 9e3c49119deaf..431fd7969be06 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -523,6 +523,7 @@ pub fn run_tests(config: &Config) { pub fn test_opts(config: &Config) -> test::TestOpts { test::TestOpts { + exclude_should_panic: false, filter: config.filter.clone(), filter_exact: config.filter_exact, run_ignored: if config.run_ignored { From 531a9bdbe6dd03943089075fe72d57a6f3ee0456 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Mon, 15 Apr 2019 04:37:47 +0200 Subject: [PATCH 4/6] bump bootstrap; nightly => 1.36. --- src/bootstrap/channel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index e42b073322e28..a6da4f5385a5b 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -13,7 +13,7 @@ use build_helper::output; use crate::Build; // The version number -pub const CFG_RELEASE_NUM: &str = "1.35.0"; +pub const CFG_RELEASE_NUM: &str = "1.36.0"; pub struct GitInfo { inner: Option, 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 5/6] 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 a76584093fc76..a8f0d24ce63db 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 cfe317a00f906..ce5e5f23a94b8 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 2536121c7a324..6fed83021609d 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 c5c2cbfcb8940..4cbf8e3ecfc66 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 d24395ac9c182..4aca01d9411c7 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 a9e422fb238b8..3aef5a76a3a05 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 3761a52bcccf2..14bc77f380acc 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 e2917578c0ece..c6e689f2e83c3 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 330cfe154e302..437515f1e9ab4 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 66c7c9d0eae7e..6a5accc8d7f05 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 71bef54cd17a1..cb45e13c4d2dc 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 d7db324f3463e..eb82885abee06 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 353ff6a57a5ef..d1e2a1a4ad506 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 9354f203e4e4e..ff5e4f02554cc 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 4078171733fc3..d052e13f9c0a7 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 deeed9a0b9846..a16eaf011c86e 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 20442a4a566ec..db8fcaa569389 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 44621e5dc95d1..ef315c5f95502 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 96aac97729797..864fc2ebaec77 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 ce0decaee496f..d901fb2bff8c7 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 f1812c20dccde..3fcf08adb5c8e 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 bc034e1fb1627..959130f1cf228 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 21d1af229ddc2..4320e28d676ed 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 6cb937d9216ac..5b76f6861de79 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 9905b981395c0..1486909b27692 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 ee0b86963f31d..8371d27207589 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 1ad556bbcfa56..3f09405a5c8c6 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)] From f2371e3b7daa43d8ea267e07c52a057fc08dc708 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Wed, 17 Apr 2019 05:45:37 +0200 Subject: [PATCH 6/6] bump bootstrap; remove redundant 'use libc;' on macOS. --- src/tools/compiletest/src/raise_fd_limit.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tools/compiletest/src/raise_fd_limit.rs b/src/tools/compiletest/src/raise_fd_limit.rs index 7f1d7e0d3cdd4..e9c91094104e9 100644 --- a/src/tools/compiletest/src/raise_fd_limit.rs +++ b/src/tools/compiletest/src/raise_fd_limit.rs @@ -7,7 +7,6 @@ #[cfg(any(target_os = "macos", target_os = "ios"))] #[allow(non_camel_case_types)] pub unsafe fn raise_fd_limit() { - use libc; use std::cmp; use std::io; use std::mem::size_of_val;