Rollup merge of rust-lang#40026 - nrc:analysis-manifest, r=alexcrichton

Add save-analysis data to nightly manifests. For use by RLS. r? @alexcrichton
eddyb · Feb 25, 2017 · b0b29ef · b0b29ef
2 parents a7a349a + 9ce8bb9
commit b0b29ef
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -217,6 +217,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(),
@@ -266,6 +270,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(),