Rollup merge of rust-lang#39599 - alexcrichton:cargo-tarball-name, r=brson

frewsxcv · web-flow · commit 9f2795f7bdc0 · 2017-02-08T23:55:47.000-05:00
Fix a manifest-generation bug on beta

Right now all Cargo release tarballs are 'nightly', they're not on the standard
channels yet.
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -326,6 +326,8 @@ impl Builder {
     fn filename(&self, component: &str, target: &str) -> String {
         if component == "rust-src" {
             format!("rust-src-{}.tar.gz", self.channel)
+        } else if component == "cargo" {
+            format!("cargo-nightly-{}.tar.gz", target)
         } else {
             format!("{}-{}-{}.tar.gz", component, self.channel, target)
         }

Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,8 @@ impl Builder {`
`326`	`326`	`fn filename(&self, component: &str, target: &str) -> String {`
`327`	`327`	`if component == "rust-src" {`
`328`	`328`	`format!("rust-src-{}.tar.gz", self.channel)`
	`329`	`+ } else if component == "cargo" {`
	`330`	`+ format!("cargo-nightly-{}.tar.gz", target)`
`329`	`331`	`} else {`
`330`	`332`	`format!("{}-{}-{}.tar.gz", component, self.channel, target)`
`331`	`333`	`}`