Skip to content

Update miri #54249

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
Merged
merged 1 commit into from
Sep 17, 2018
Merged

Update miri #54249

merged 1 commit into from
Sep 17, 2018

Conversation

RalfJung
Copy link
Member

No description provided.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

⚠️ 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 Sep 15, 2018
@eddyb
Copy link
Member

eddyb commented Sep 16, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 16, 2018

📌 Commit be0c2298bf449628ed84d35cdfeadae0f460bf74 has been approved by eddyb

@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 Sep 16, 2018
@bors
Copy link
Collaborator

bors commented Sep 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 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: 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 Sep 17, 2018
@RalfJung
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Sep 17, 2018

📌 Commit 4d4123e7046f376ad1b14ecf20bb2c9450986194 has been approved by eddyb

@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 Sep 17, 2018
@RalfJung
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Sep 17, 2018

📌 Commit 8d908b5 has been approved by eddyb

@bors
Copy link
Collaborator

bors commented Sep 17, 2018

⌛ Testing commit 8d908b5 with merge f1aefb4...

bors added a commit that referenced this pull request Sep 17, 2018
@bors
Auto merge of #54249 - RalfJung:miri, r=eddyb
f1aefb4 
Update miri
@bors
Copy link
Collaborator

bors commented Sep 17, 2018

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

@bors bors merged commit 8d908b5 into rust-lang:master Sep 17, 2018
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #54249!

Tested on commit f1aefb4.
Direct link to PR: #54249

🎉 miri on windows: build-fail → test-pass.
🎉 miri on linux: build-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 17, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#54249!
d666356 
Tested on commit rust-lang/rust@f1aefb4.
Direct link to PR: <rust-lang/rust#54249>

🎉 miri on windows: build-fail → test-pass.
🎉 miri on linux: build-fail → test-pass.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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.
5 participants
@RalfJung @rust-highfive @eddyb @bors @nikomatsakis