Skip to content

Commit 258e3b3

Browse files
committed
Auto merge of #59974 - Centril:boostrap-to-2019-04-11, r=pietroalbini,Mark-Simulacrum
Bump bootstrap compiler to 2019-04-11 r? @pietroalbini cc @Mark-Simulacrum cc #58702
2 parents c132c96 + f2371e3 commit 258e3b3

File tree

32 files changed

+30
-34
lines changed

32 files changed

+30
-34
lines changed

src/bootstrap/bin/rustc.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,7 @@ fn main() {
290290
}
291291

292292
// This is required for internal lints.
293-
if stage != "0" {
294-
cmd.arg("-Zunstable-options");
295-
}
293+
cmd.arg("-Zunstable-options");
296294

297295
// Force all crates compiled by this compiler to (a) be unstable and (b)
298296
// allow the `rustc_private` feature to link to other unstable crates

src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use build_helper::output;
1313
use crate::Build;
1414

1515
// The version number
16-
pub const CFG_RELEASE_NUM: &str = "1.35.0";
16+
pub const CFG_RELEASE_NUM: &str = "1.36.0";
1717

1818
pub struct GitInfo {
1919
inner: Option<Info>,

src/bootstrap/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,8 +1125,6 @@ impl Build {
11251125
/// `rust.save-toolstates` in `config.toml`. If unspecified, nothing will be
11261126
/// done. The file is updated immediately after this function completes.
11271127
pub fn save_toolstate(&self, tool: &str, state: ToolState) {
1128-
use std::io::{Seek, SeekFrom};
1129-
11301128
if let Some(ref path) = self.config.save_toolstates {
11311129
let mut file = t!(fs::OpenOptions::new()
11321130
.create(true)

src/libarena/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
test(no_crate_inject, attr(deny(warnings))))]
1313

1414
#![deny(rust_2018_idioms)]
15-
#![cfg_attr(not(stage0), deny(internal))]
15+
#![deny(internal)]
1616

1717
#![feature(core_intrinsics)]
1818
#![feature(dropck_eyepatch)]

src/libfmt_macros/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
test(attr(deny(warnings))))]
1010

1111
#![deny(rust_2018_idioms)]
12-
#![cfg_attr(not(stage0), deny(internal))]
12+
#![deny(internal)]
1313

1414
#![feature(nll)]
1515
#![feature(rustc_private)]

src/librustc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
3030

3131
#![deny(rust_2018_idioms)]
32-
#![cfg_attr(not(stage0), deny(internal))]
32+
#![deny(internal)]
3333
#![allow(explicit_outlives_requirements)]
3434

3535
#![feature(arbitrary_self_types)]

src/librustc/ty/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![cfg_attr(not(stage0), allow(usage_of_ty_tykind))]
1+
#![allow(usage_of_ty_tykind)]
22

33
pub use self::Variance::*;
44
pub use self::AssociatedItemContainer::*;

src/librustc_allocator/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![feature(rustc_private)]
33

44
#![deny(rust_2018_idioms)]
5-
#![cfg_attr(not(stage0), deny(internal))]
5+
#![deny(internal)]
66

77
pub mod expand;
88

src/librustc_borrowck/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#![allow(non_camel_case_types)]
44
#![deny(rust_2018_idioms)]
5-
#![cfg_attr(not(stage0), deny(internal))]
5+
#![deny(internal)]
66

77
#![feature(nll)]
88

src/librustc_codegen_ssa/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#![allow(unused_attributes)]
1515
#![allow(dead_code)]
1616
#![deny(rust_2018_idioms)]
17-
#![cfg_attr(not(stage0), deny(internal))]
17+
#![deny(internal)]
1818
#![allow(explicit_outlives_requirements)]
1919

2020
#![recursion_limit="256"]

0 commit comments

Comments
 (0)