Skip to content

update miri#59929

Merged
bors merged 1 commit intorust-lang:masterfrom
RalfJung:miri
Apr 14, 2019
Merged

update miri#59929
bors merged 1 commit intorust-lang:masterfrom
RalfJung:miri

Conversation

@RalfJung
Copy link
Copy Markdown
Member

@RalfJung RalfJung commented Apr 12, 2019

Fixes #59901

@rust-highfive
Copy link
Copy Markdown
Contributor

rust-highfive commented Apr 12, 2019

r? @nikomatsakis

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

@rust-highfive
Copy link
Copy Markdown
Contributor

rust-highfive commented Apr 12, 2019

⚠️ 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 Apr 12, 2019
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 12, 2019

r? @oli-obk

@oli-obk
Copy link
Copy Markdown
Contributor

oli-obk commented Apr 13, 2019

@bors r+ p=1

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 13, 2019

📌 Commit f6118e9a0b0b9f883a1f05fd0e449c711f346492 has been approved by oli-obk

@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 Apr 13, 2019
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 13, 2019

🔒 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 miri (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 miri --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: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in 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 Apr 13, 2019
@RalfJung
Copy link
Copy Markdown
Member Author

RalfJung commented Apr 14, 2019

Rebased.

@bors r=oli-obk

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 14, 2019

📌 Commit 3f85851 has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 14, 2019
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 14, 2019

⌛ Testing commit 3f85851 with merge d70c5a9...

bors added a commit that referenced this pull request Apr 14, 2019
@bors
Auto merge of #59929 - RalfJung:miri, r=oli-obk
d70c5a9 
update miri

Fixes #59901
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 14, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing d70c5a9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2019
@bors bors merged commit 3f85851 into rust-lang:master Apr 14, 2019
@rust-highfive
Copy link
Copy Markdown
Contributor

rust-highfive commented Apr 14, 2019

📣 Toolstate changed by #59929!

Tested on commit d70c5a9.
Direct link to PR: #59929

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 14, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#59929!
f25d367 
Tested on commit rust-lang/rust@d70c5a9.
Direct link to PR: <rust-lang/rust#59929>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
@tesuji tesuji mentioned this pull request Sep 29, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obk oli-obk

Labels

merged-by-bors This PR was explicitly merged by bors. 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.

miri no longer builds after rust-lang/rust#59227

5 participants

@RalfJung @rust-highfive @oli-obk @bors @nikomatsakis