Auto merge of #39600 - alexcrichton:cargo-tarball-name2, r=brson

bors · bors · commit 4076f73b55e1 · 2017-02-11T02:36:42.000Z
[beta] Fix a manifest-generation bug on beta This is a beta backport of #39599
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -317,6 +317,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
`@@ -317,6 +317,8 @@ impl Builder {`
`317`	`317`	`fn filename(&self, component: &str, target: &str) -> String {`
`318`	`318`	`if component == "rust-src" {`
`319`	`319`	`format!("rust-src-{}.tar.gz", self.channel)`
	`320`	`+ } else if component == "cargo" {`
	`321`	`+ format!("cargo-nightly-{}.tar.gz", target)`
`320`	`322`	`} else {`
`321`	`323`	`format!("{}-{}-{}.tar.gz", component, self.channel, target)`
`322`	`324`	`}`