about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-04-04 07:16:25 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-04-05 07:13:45 -0700
commit8958815916201421b0a6648c68d7eb31bd3197ee (patch)
treef9363ac15783a2e4817cb9979c57162b559c5bda /src/bootstrap
parent01d0be99257f5942ddc1168db1a7b5a472cf2c31 (diff)
downloadrust-8958815916201421b0a6648c68d7eb31bd3197ee.tar.gz
rust-8958815916201421b0a6648c68d7eb31bd3197ee.zip
Bump the bootstrap compiler to 1.26.0 beta
Holy cow that's a lot of `cfg(stage0)` removed and a lot of new stable language
features!
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/lib.rs5
-rw-r--r--src/bootstrap/tool.rs1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 2eeb2691eae..6c46f3e58cf 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -114,8 +114,7 @@
 //! also check out the `src/bootstrap/README.md` file for more information.
 
 #![deny(warnings)]
-#![feature(conservative_impl_trait, fs_read_write, core_intrinsics)]
-#![feature(slice_concat_ext)]
+#![feature(core_intrinsics)]
 
 #[macro_use]
 extern crate build_helper;
@@ -1149,7 +1148,7 @@ impl Build {
 
     fn read(&self, path: &Path) -> String {
         if self.config.dry_run { return String::new(); }
-        t!(fs::read_string(path))
+        t!(fs::read_to_string(path))
     }
 
     fn create_dir(&self, dir: &Path) {
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 93b6153fcb2..5fc92611e65 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -12,7 +12,6 @@ use std::fs;
 use std::env;
 use std::path::PathBuf;
 use std::process::{Command, exit};
-use std::slice::SliceConcatExt;
 
 use Mode;
 use Compiler;