about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-27 18:18:17 +0000
committerbors <bors@rust-lang.org>2019-01-27 18:18:17 +0000
commit8611577360e66f90470bd40c498cf8d194f67926 (patch)
treebdbfc4b5805e1c9943247c6e846fa9ff0fb83787 /src/tools
parent71c365c38085c3c6e82bc6bcad823d9926dd3942 (diff)
parentcd39cf748e3a5ab7cc4449ba9acfddb969c79209 (diff)
downloadrust-8611577360e66f90470bd40c498cf8d194f67926.tar.gz
rust-8611577360e66f90470bd40c498cf8d194f67926.zip
Auto merge of #57765 - Mark-Simulacrum:bootstrap-bump, r=alexcrichton
Bump bootstrap compiler to 1.33 beta

r? @alexcrichton or @pietroalbini

cc @rust-lang/release
Diffstat (limited to 'src/tools')
m---------src/tools/cargo0
-rw-r--r--src/tools/remote-test-server/src/main.rs4
-rw-r--r--src/tools/tidy/src/features.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 907c0febe7045fa02dff2a35c5e36d3bd59ea50
+Subproject 245818076052dd7178f5bb7585f5aec5b6c1e03
diff --git a/src/tools/remote-test-server/src/main.rs b/src/tools/remote-test-server/src/main.rs
index 74dde8bf0e2..3f56d4da6a3 100644
--- a/src/tools/remote-test-server/src/main.rs
+++ b/src/tools/remote-test-server/src/main.rs
@@ -20,7 +20,7 @@ use std::os::unix::prelude::*;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::str;
-use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
 use std::thread;
 
@@ -31,7 +31,7 @@ macro_rules! t {
     })
 }
 
-static TEST: AtomicUsize = ATOMIC_USIZE_INIT;
+static TEST: AtomicUsize = AtomicUsize::new(0);
 
 struct Config {
     pub remote: bool,
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 16f2e3ba27d..7126c0c2f6e 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
             }
 
             let mut parts = line.split(',');
-            let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) {
+            let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) {
                 Some("active") => Status::Unstable,
                 Some("removed") => Status::Removed,
                 Some("accepted") => Status::Stable,