Skip to content

Commit

Permalink
Auto merge of #59974 - Centril:boostrap-to-2019-04-11, r=pietroalbini…
Browse files Browse the repository at this point in the history
…,Mark-Simulacrum

Bump bootstrap compiler to 2019-04-11

r? @pietroalbini
cc @Mark-Simulacrum
cc #58702
  • Loading branch information
bors committed Apr 17, 2019
2 parents c132c96 + f2371e3 commit 258e3b3
Show file tree
Hide file tree
Showing 32 changed files with 30 additions and 34 deletions.
4 changes: 1 addition & 3 deletions src/bootstrap/bin/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Info>,
Expand Down
2 changes: 0 additions & 2 deletions src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/libarena/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/libfmt_macros/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/ty/mod.rs
Original file line number Diff line number Diff line change
@@ -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::*;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_allocator/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![feature(rustc_private)]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

pub mod expand;

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_borrowck/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#![allow(non_camel_case_types)]
#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#![feature(nll)]

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_codegen_ssa/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_codegen_utils/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#![recursion_limit="256"]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#[macro_use]
extern crate rustc;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_errors/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_interface/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#![cfg_attr(unix, feature(libc))]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#![allow(unused_imports)]

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_lint/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#![recursion_limit="256"]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#[macro_use]
extern crate rustc;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_metadata/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_mir/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_passes/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#![recursion_limit="256"]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#[macro_use]
extern crate rustc;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_privacy/lib.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_save_analysis/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_target/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#![feature(step_trait)]

#![deny(rust_2018_idioms)]
#![cfg_attr(not(stage0), deny(internal))]
#![deny(internal)]

#[macro_use] extern crate log;

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_traits/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_typeck/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
@@ -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/")]
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax_ext/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax_pos/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/tools/compiletest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/tools/compiletest/src/raise_fd_limit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 258e3b3

Please sign in to comment.