Skip to content

Update cargo submodule - #42039

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo
May 17, 2017
Merged

Update cargo submodule#42039
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented May 16, 2017

Copy link
Copy Markdown
Member

This pulls in a fix for #41797 to the master branch, I'll send a separate PR for
the beta branch. Note that the Cargo PR in question to pull in is rust-lang/cargo#4046

@alexcrichton
Update cargo submodule
c9f616c
This pulls in a fix for rust-lang#41797 to the master branch, I'll send a separate PR for
the beta branch.
@rust-highfive

rust-highfive commented May 16, 2017

Copy link
Copy Markdown
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichtonalexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels May 16, 2017
This was referenced May 16, 2017
Merged
Merged
@aturon

aturon commented May 16, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c9f616c has been approved by aturon

@arielb1arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 16, 2017
@Mark-Simulacrum
Rollup merge ofrust-lang#42039- alexcrichton:update-cargo, r=aturon
afb9b20
Update cargo submodule
This pulls in a fix for rust-lang#41797 to the master branch, I'll send a separate PR for
the beta branch. Note that the Cargo PR in question to pull in is rust-lang/cargo#4046
@Mark-SimulacrumMark-Simulacrum mentioned this pull request May 16, 2017
Merged
bors added a commit that referenced this pull request May 17, 2017
@bors
Auto merge of#42049- Mark-Simulacrum:rollup, r=Mark-Simulacrum
d8215fc
Rollup of 5 pull requests
- Successful merges: #41937, #41957, #42017, #42039, #42046
- Failed merges:
@bors
bors merged commit c9f616c into rust-lang:masterMay 17, 2017
@alexcrichton
alexcrichton deleted the update-cargo branch May 18, 2017 16:50
@alexcrichtonalexcrichton mentioned this pull request May 18, 2017
Merged
@brson

brson commented May 23, 2017

Copy link
Copy Markdown
Contributor

Looks to me like this has already been fixed on beta too. @alexcrichton can you confirm?

@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 23, 2017
@alexcrichton

alexcrichton commented May 23, 2017

Copy link
Copy Markdown
MemberAuthor

@brson indeed! Sorry forgot to remove the label

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@aturonaturon

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@alexcrichton@rust-highfive@aturon@bors@brson@arielb1