summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-25 18:30:06 +0000
committerbors <bors@rust-lang.org>2018-05-25 18:30:06 +0000
commit827013a31b88e536e85b8e6ceb5b9988042ec335 (patch)
tree2f4527603327f3996eb42813cae163caa0296f70 /src/tools
parenta7756804103447ea4e68a71ccf071e7ad8f7a03e (diff)
parentb3785a31cdae1c164504db6da9c0f8fe6834d4c3 (diff)
downloadrust-1.26.1.tar.gz
rust-1.26.1.zip
Auto merge of #51045 - Mark-Simulacrum:stable-point, r=alexcrichton 1.26.1
Stable point release (1.26.1)

This includes all items on [the wishlist](https://github.com/rust-lang/rust/issues/50756), plus https://github.com/rust-lang/rust/pull/50694, which backported cleanly.

The target date is May 29th, Tuesday next week.

cc @rust-lang/compiler @oli-obk @eddyb  -- I backported https://github.com/rust-lang/rust/pull/50812, but it wasn't a clean patch so review would be appreciated.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/build-manifest/src/main.rs22
m---------src/tools/rls0
m---------src/tools/rustfmt6
3 files changed, 28 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 49b054f8b9e..0f482c95e05 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -356,6 +356,28 @@ impl Builder {
                 target: "*".to_string(),
             });
 
+            // If the components/extensions don't actually exist for this
+            // particular host/target combination then nix it entirely from our
+            // lists.
+            {
+                let has_component = |c: &Component| {
+                    if c.target == "*" {
+                        return true
+                    }
+                    let pkg = match manifest.pkg.get(&c.pkg) {
+                        Some(p) => p,
+                        None => return false,
+                    };
+                    let target = match pkg.target.get(&c.target) {
+                        Some(t) => t,
+                        None => return false,
+                    };
+                    target.available
+                };
+                extensions.retain(&has_component);
+                components.retain(&has_component);
+            }
+
             pkg.target.insert(host.to_string(), Target {
                 available: true,
                 url: Some(self.url(&filename)),
diff --git a/src/tools/rls b/src/tools/rls
-Subproject f5a0c91a39368395b1c1ad322e04be7b6074bc6
+Subproject 5b79fcf75e9485c66cecec465cd66d18d457cbb
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 7a80726258d38b91ebb12144a2c2dd5d422cdfa
+Subproject febbb369372d7ed751fd22242fac7afd04f1a0a