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 #55999

Merged
merged 1 commit into from
Nov 18, 2018
Merged

Update Cargo submodule #55999

merged 1 commit into from
Nov 18, 2018

Conversation

alexcrichton
Copy link
Member

Brings in some fixes and stabilizations!

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2018
@alexcrichton
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Nov 16, 2018

📌 Commit ec358693fcd56df0b34e5d8b05541adfb1f59035 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2018
@alexcrichton
Copy link
Member Author

Er wrong PR r+'d!

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned aturon Nov 16, 2018
@nrc
Copy link
Member

nrc commented Nov 16, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 16, 2018

📌 Commit 7613bbb42c77544c98cee5d92d8364c41bf84c08 has been approved by nrc

@bors
Copy link
Contributor

bors commented Nov 17, 2018

⌛ Testing commit 7613bbb42c77544c98cee5d92d8364c41bf84c08 with merge 80095388e836bcf9375e8295f839797d0f32bb8c...

@ehuss ehuss mentioned this pull request Nov 17, 2018
Merged
@bors
Copy link
Contributor

bors commented Nov 17, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 17, 2018
@alexcrichton
Copy link
Member Author

@bors: retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 17, 2018
@bors
Copy link
Contributor

bors commented Nov 17, 2018

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update-cargo (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-cargo --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 17, 2018
@alexcrichton
Update Cargo submodule
01127ca 
Brings in some fixes and stabilizations!
@alexcrichton
Copy link
Member Author

@bors: r=nrc

@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 17, 2018
@alexcrichton
Copy link
Member Author

@bors: retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 17, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Nov 17, 2018
@kennytm
Rollup merge of rust-lang#55999 - alexcrichton:update-cargo, r=nrc
bc7d2cf 
Update Cargo submodule

Brings in some fixes and stabilizations!
@kennytm kennytm mentioned this pull request Nov 17, 2018
Closed
@bors
Copy link
Contributor

bors commented Nov 17, 2018

⌛ Testing commit 01127ca with merge b6e9531b52b472d3ba8ab3dd313640101c5236ca...

@bors
Copy link
Contributor

bors commented Nov 17, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 17, 2018
@kennytm
Copy link
Member

kennytm commented Nov 18, 2018

@bors retry #56034

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2018
@bors
Copy link
Contributor

bors commented Nov 18, 2018

⌛ Testing commit 01127ca with merge f6d457dcfd7a80d6a7b0244a37c85f2222f96651...

@bors
Copy link
Contributor

bors commented Nov 18, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2018
@kennytm
Copy link
Member

kennytm commented Nov 18, 2018

@bors retry #56034

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2018
@ehuss ehuss mentioned this pull request Nov 18, 2018
Closed
@kennytm
Copy link
Member

kennytm commented Nov 18, 2018

@bors p=11

@bors
Copy link
Contributor

bors commented Nov 18, 2018

⌛ Testing commit 01127ca with merge d1c2cbf...

bors added a commit that referenced this pull request Nov 18, 2018
@bors
Auto merge of #55999 - alexcrichton:update-cargo, r=nrc
d1c2cbf 
Update Cargo submodule

Brings in some fixes and stabilizations!
@bors
Copy link
Contributor

bors commented Nov 18, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing d1c2cbf to master...

@bors bors merged commit 01127ca into rust-lang:master Nov 18, 2018
@alexcrichton alexcrichton deleted the update-cargo branch November 26, 2018 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
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 @bors @nrc @kennytm @aturon