Rollup merge of #39598 - alexcrichton:cargo-branch, r=brson

Fix branch name Cargo's downloaded from

This landed on beta in #39546 and this is bringing the patch back to master.
This commit is contained in:
Corey Farwell 2017-02-08 23:55:45 -05:00 committed by GitHub
commit a7017b582c

View File

@ -515,9 +515,7 @@ pub fn cargo(build: &Build, stage: u32, target: &str) {
let branch = match &build.config.channel[..] {
"stable" |
"beta" => {
build.release.split(".").take(2).collect::<Vec<_>>().join(".")
}
"beta" => format!("rust-{}", build.release_num),
_ => "master".to_string(),
};