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 https://github.com/rust-lang/rust/pull/58702

3 files changed, 2 insertions, 6 deletions

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index a76584093fc..a8f0d24ce63 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/bootstrap/channel.rs b/src/bootstrap/channel.rs
index e42b073322e..a6da4f5385a 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<Info>,
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index bcd28e9cf5e..fb60b470a36 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)