Merge remote-tracking branch 'upstream/master'

7 files changed, 33 insertions, 17 deletions

diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 0e91fa9c602..db957a7a0fc 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -50,6 +50,7 @@ static TARGETS: &'static [&'static str] = &[
     "aarch64-unknown-fuchsia",
     "aarch64-linux-android",
     "aarch64-unknown-linux-gnu",
+    "aarch64-unknown-linux-musl",
     "arm-linux-androideabi",
     "arm-unknown-linux-gnueabi",
     "arm-unknown-linux-gnueabihf",
@@ -108,6 +109,7 @@ struct Manifest {
     manifest_version: String,
     date: String,
     pkg: BTreeMap<String, Package>,
+    renames: BTreeMap<String, Rename>
 }
 
 #[derive(Serialize)]
@@ -118,6 +120,11 @@ struct Package {
 }
 
 #[derive(Serialize)]
+struct Rename {
+    to: String,
+}
+
+#[derive(Serialize)]
 struct Target {
     available: bool,
     url: Option<String>,
@@ -236,6 +243,7 @@ impl Builder {
             manifest_version: "2".to_string(),
             date: self.date.to_string(),
             pkg: BTreeMap::new(),
+            renames: BTreeMap::new(),
         };
 
         self.package("rustc", &mut manifest.pkg, HOSTS);
@@ -244,14 +252,11 @@ impl Builder {
         self.package("rust-std", &mut manifest.pkg, TARGETS);
         self.package("rust-docs", &mut manifest.pkg, TARGETS);
         self.package("rust-src", &mut manifest.pkg, &["*"]);
-        let rls_package_name = if self.rust_release == "nightly" {
-            "rls"
-        } else {
-            "rls-preview"
-        };
-        self.package(rls_package_name, &mut manifest.pkg, HOSTS);
+        self.package("rls-preview", &mut manifest.pkg, HOSTS);
         self.package("rust-analysis", &mut manifest.pkg, TARGETS);
 
+        manifest.renames.insert("rls".to_owned(), Rename { to: "rls-preview".to_owned() });
+
         let mut pkg = Package {
             version: self.cached_version("rust").to_string(),
             git_commit_hash: self.cached_git_commit_hash("rust").clone(),
@@ -287,7 +292,7 @@ impl Builder {
             }
 
             extensions.push(Component {
-                pkg: rls_package_name.to_string(),
+                pkg: "rls-preview".to_string(),
                 target: host.to_string(),
             });
             extensions.push(Component {
@@ -319,7 +324,7 @@ impl Builder {
         }
         manifest.pkg.insert("rust".to_string(), pkg);
 
-        return manifest
+        return manifest;
     }
 
     fn package(&mut self,
@@ -452,6 +457,7 @@ impl Builder {
         cmd.arg("--no-tty")
             .arg("--yes")
             .arg("--passphrase-fd").arg("0")
+            .arg("--personal-digest-preferences").arg("SHA512")
             .arg("--armor")
             .arg("--output").arg(&asc)
             .arg("--detach-sign").arg(path)
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 8118b02ac5ce49b22e049ff03316d5e1574852c
+Subproject e447ac7e94b7f56ab13e361f9e324dafe3eb0a3
diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
index 012ee835494..0a9da26d996 100644
--- a/src/tools/cargotest/main.rs
+++ b/src/tools/cargotest/main.rs
@@ -49,7 +49,7 @@ const TEST_REPOS: &'static [Test] = &[
     Test {
         name: "xsv",
         repo: "https://github.com/BurntSushi/xsv",
-        sha: "a9a7163f2a2953cea426fee1216bec914fe2f56a",
+        sha: "4b308adbe48ac81657fd124b90b44f7c3263f771",
         lock: None,
     },
 ];
diff --git a/src/tools/rls b/src/tools/rls
-Subproject 7221e38023c41ff2532ebbf54a7da296fd488b5
+Subproject 93b47d14cef5720bba7cfb4dcb8078fbf1f706c
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject a1fd68da464fc51585f351c81fc2b867211c197
+Subproject 22eb5241c0ee5bb7eaf95e270a2b1500e82bf76
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index e9e4b55402c..38df6577694 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -35,8 +35,11 @@ static EXCEPTIONS: &'static [&'static str] = &[
     "thread-id", // Apache-2.0, mdbook
     "cssparser", // MPL-2.0, rustdoc
     "smallvec", // MPL-2.0, rustdoc
+    // FIXME: remove magenta references when "everything" has moved over to using the zircon name.
     "magenta-sys", // BSD-3-Clause, rustdoc
     "magenta", // BSD-3-Clause, rustdoc
+    "zircon-sys", // BSD-3-Clause, rustdoc
+    "zircon", // BSD-3-Clause, rustdoc
     "cssparser-macros", // MPL-2.0, rustdoc
     "selectors", // MPL-2.0, rustdoc
 ];
diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml
index 707b316190d..1700daa0aff 100644
--- a/src/tools/toolstate.toml
+++ b/src/tools/toolstate.toml
@@ -23,7 +23,14 @@
 # Each tool has a list of people to ping
 
 # ping @oli-obk @RalfJung @eddyb
-miri = "Testing"
+miri = "Broken"
 
 # ping @Manishearth @llogiq @mcarton @oli-obk
 clippy = "Broken"
+
+# ping @nrc
+rls = "Testing"
+
+# ping @nrc
+rustfmt = "Testing"
+