Skip to content

Commit

Permalink
Rollup merge of rust-lang#39598 - alexcrichton:cargo-branch, r=brson
Browse files Browse the repository at this point in the history
Fix branch name Cargo's downloaded from

This landed on beta in rust-lang#39546 and this is bringing the patch back to master.
  • Loading branch information
frewsxcv committed Feb 9, 2017
2 parents 4f6868a + 19bbd85 commit a7017b5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
};

Expand Down

0 comments on commit a7017b5

Please sign in to comment.