Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cargo submodule #42039

Merged
merged 1 commit into from
May 17, 2017
Merged

Update cargo submodule #42039

merged 1 commit into from
May 17, 2017

Conversation

alexcrichton
Copy link
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
Copy link
Collaborator

r? @aturon

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

@alexcrichton alexcrichton 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
Copy link
Member

aturon commented May 16, 2017

@bors r+

@bors
Copy link
Contributor

bors commented May 16, 2017

📌 Commit c9f616c has been approved by aturon

@arielb1 arielb1 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 of rust-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-Simulacrum Mark-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:master May 17, 2017
@alexcrichton alexcrichton deleted the update-cargo branch May 18, 2017 16:50
@alexcrichton alexcrichton mentioned this pull request May 18, 2017
Merged
@brson
Copy link
Contributor

brson commented May 23, 2017

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

@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 23, 2017
@alexcrichton
Copy link
Member Author

@brson indeed! Sorry forgot to remove the label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: 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