about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2017-02-25 14:13:34 +0200
committerGitHub <noreply@github.com>2017-02-25 14:13:34 +0200
commitf1350408c9d78ebe29074ed44dd5869c7d08fdd7 (patch)
tree63a5424953c40b3d6dd3be59b684c33a3eeeda6b
parentc3075f3d96c964be33d3eb15c0ad05d71a01bbe0 (diff)
parent9ce8bb9f9d1d1513c091841fcc7feb5bd792fe02 (diff)
Rollup merge of #40026 - nrc:analysis-manifest, r=alexcrichton
Add save-analysis data to nightly manifests.

For use by RLS.

r? @alexcrichton
-rw-r--r--src/tools/build-manifest/src/main.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 991cd02d215..6d40dcacdba 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -215,6 +215,10 @@ impl Builder {
         self.package("rust-docs", &mut manifest.pkg, TARGETS);
         self.package("rust-src", &mut manifest.pkg, &["*"]);
 
+        if self.channel == "rust-nightly" {
+            self.package("analysis", &mut manifest.pkg, TARGETS);
+        }
+
         let mut pkg = Package {
             version: self.cached_version("rust").to_string(),
             target: HashMap::new(),
@@ -264,6 +268,12 @@ impl Builder {
                         target: target.to_string(),
                     });
                 }
+                if self.channel == "nightly" {
+                    extensions.push(Component {
+                        pkg: "rust-analysis".to_string(),
+                        target: target.to_string(),
+                    });
+                }
             }
             extensions.push(Component {
                 pkg: "rust-src".to_string(),