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

+1-3
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

+1-1
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

-2
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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"]

src/librustc_codegen_utils/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![recursion_limit="256"]
1717

1818
#![deny(rust_2018_idioms)]
19-
#![cfg_attr(not(stage0), deny(internal))]
19+
#![deny(internal)]
2020

2121
#[macro_use]
2222
extern crate rustc;

src/librustc_driver/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#![recursion_limit="256"]
1818

1919
#![deny(rust_2018_idioms)]
20-
#![cfg_attr(not(stage0), deny(internal))]
20+
#![deny(internal)]
2121

2222
pub extern crate getopts;
2323
#[cfg(unix)]

src/librustc_errors/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![feature(nll)]
77
#![feature(optin_builtin_traits)]
88
#![deny(rust_2018_idioms)]
9-
#![cfg_attr(not(stage0), deny(internal))]
9+
#![deny(internal)]
1010

1111
#[allow(unused_extern_crates)]
1212
extern crate serialize as rustc_serialize; // used by deriving

src/librustc_incremental/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![recursion_limit="256"]
99

1010
#![deny(rust_2018_idioms)]
11-
#![cfg_attr(not(stage0), deny(internal))]
11+
#![deny(internal)]
1212

1313
#[macro_use] extern crate rustc;
1414
#[allow(unused_extern_crates)]

src/librustc_interface/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#![cfg_attr(unix, feature(libc))]
88

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

1212
#![allow(unused_imports)]
1313

src/librustc_lint/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#![recursion_limit="256"]
2121

2222
#![deny(rust_2018_idioms)]
23-
#![cfg_attr(not(stage0), deny(internal))]
23+
#![deny(internal)]
2424

2525
#[macro_use]
2626
extern crate rustc;

src/librustc_metadata/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#![recursion_limit="256"]
1515

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

1919
extern crate libc;
2020
#[allow(unused_extern_crates)]

src/librustc_mir/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2828
#![recursion_limit="256"]
2929

3030
#![deny(rust_2018_idioms)]
31-
#![cfg_attr(not(stage0), deny(internal))]
31+
#![deny(internal)]
3232
#![allow(explicit_outlives_requirements)]
3333

3434
#[macro_use] extern crate log;

src/librustc_passes/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#![recursion_limit="256"]
1313

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

1717
#[macro_use]
1818
extern crate rustc;

src/librustc_privacy/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
22

33
#![deny(rust_2018_idioms)]
4-
#![cfg_attr(not(stage0), deny(internal))]
4+
#![deny(internal)]
55

66
#![feature(nll)]
77
#![feature(rustc_diagnostic_macros)]

src/librustc_resolve/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#![recursion_limit="256"]
1010

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

1414
pub use rustc::hir::def::{Namespace, PerNS};
1515

src/librustc_save_analysis/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![feature(custom_attribute)]
33
#![feature(nll)]
44
#![deny(rust_2018_idioms)]
5-
#![cfg_attr(not(stage0), deny(internal))]
5+
#![deny(internal)]
66
#![allow(unused_attributes)]
77

88
#![recursion_limit="256"]

src/librustc_target/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![feature(step_trait)]
1717

1818
#![deny(rust_2018_idioms)]
19-
#![cfg_attr(not(stage0), deny(internal))]
19+
#![deny(internal)]
2020

2121
#[macro_use] extern crate log;
2222

src/librustc_traits/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! the guts are broken up into modules; see the comments in those modules.
33
44
#![deny(rust_2018_idioms)]
5-
#![cfg_attr(not(stage0), deny(internal))]
5+
#![deny(internal)]
66

77
#![feature(crate_visibility_modifier)]
88
#![feature(in_band_lifetimes)]

src/librustc_typeck/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This API is completely unstable and subject to change.
7171
#![recursion_limit="256"]
7272

7373
#![deny(rust_2018_idioms)]
74-
#![cfg_attr(not(stage0), deny(internal))]
74+
#![deny(internal)]
7575
#![allow(explicit_outlives_requirements)]
7676

7777
#[macro_use] extern crate log;

src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![deny(rust_2018_idioms)]
2-
#![cfg_attr(not(stage0), deny(internal))]
2+
#![deny(internal)]
33

44
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/",
55
html_playground_url = "https://play.rust-lang.org/")]

src/libsyntax/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
test(attr(deny(warnings))))]
99

1010
#![deny(rust_2018_idioms)]
11-
#![cfg_attr(not(stage0), deny(internal))]
11+
#![deny(internal)]
1212

1313
#![feature(crate_visibility_modifier)]
1414
#![feature(label_break_value)]

src/libsyntax_ext/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
44

55
#![deny(rust_2018_idioms)]
6-
#![cfg_attr(not(stage0), deny(internal))]
6+
#![deny(internal)]
77

88
#![feature(in_band_lifetimes)]
99
#![feature(proc_macro_diagnostic)]

src/libsyntax_pos/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
88

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

1212
#![feature(const_fn)]
1313
#![feature(crate_visibility_modifier)]

src/stage0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2019-03-20
15+
date: 2019-04-11
1616
rustc: beta
1717
cargo: beta
1818

src/tools/compiletest/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ pub fn run_tests(config: &Config) {
523523

524524
pub fn test_opts(config: &Config) -> test::TestOpts {
525525
test::TestOpts {
526+
exclude_should_panic: false,
526527
filter: config.filter.clone(),
527528
filter_exact: config.filter_exact,
528529
run_ignored: if config.run_ignored {

src/tools/compiletest/src/raise_fd_limit.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#[cfg(any(target_os = "macos", target_os = "ios"))]
88
#[allow(non_camel_case_types)]
99
pub unsafe fn raise_fd_limit() {
10-
use libc;
1110
use std::cmp;
1211
use std::io;
1312
use std::mem::size_of_val;

0 commit comments

Comments
 (0)