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 miri #56305

Merged
merged 2 commits into from
Dec 3, 2018
Merged

update miri #56305

merged 2 commits into from
Dec 3, 2018

Conversation

RalfJung
Copy link
Member

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk

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

Tests will fail, something else that got merged into miri in the mean time is not compatible with barriers... I will have to investigate.

@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member Author

Okay, tests should be good now.

@RalfJung
Copy link
Member Author

Updated to miri master.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 30, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2018

📌 Commit 113ae0f 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 Nov 30, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Nov 30, 2018
@kennytm
Rollup merge of rust-lang#56305 - RalfJung:miri, r=oli-obk
5afb113 
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
@kennytm kennytm mentioned this pull request Nov 30, 2018
Closed
@kennytm kennytm mentioned this pull request Nov 30, 2018
Merged
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 1, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#56305 - RalfJung:miri, r=oli-obk
83be646 
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Dec 1, 2018
Closed
bors added a commit that referenced this pull request Dec 1, 2018
@bors
Auto merge of #56408 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
5a0257f 
Rollup of 9 pull requests

Successful merges:

 - #55010 (Add template parameter debuginfo to generic types)
 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56402 (Improve the unstable book example for #56408 [marker] trait)
 - #56406 (Update RLS and Rustfmt)
 - #56366 (Stabilize self_in_typedefs feature)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Dec 1, 2018

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2018
@Centril
Rollup merge of rust-lang#56305 - RalfJung:miri, r=oli-obk
e19a94d 
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
@Centril Centril mentioned this pull request Dec 1, 2018
Closed
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 2, 2018
@Centril
Rollup merge of rust-lang#56305 - RalfJung:miri, r=oli-obk
07504b2 
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
@Centril Centril mentioned this pull request Dec 2, 2018
Closed
bors added a commit that referenced this pull request Dec 2, 2018
@bors
Auto merge of #56437 - Centril:rollup, r=Centril
1a8b4e9 
Rollup of 14 pull requests

Successful merges:

 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56424 (Mention raw-ident syntax)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)

Failed merges:

r? @ghost
@pietroalbini
Copy link
Member

@bors rollup-

@bors
Copy link
Contributor

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

RalfJung commented Dec 3, 2018

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 3, 2018

📌 Commit 27b9a94 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 Dec 3, 2018
@bors
Copy link
Contributor

bors commented Dec 3, 2018

⌛ Testing commit 27b9a94 with merge 7139e1c...

bors added a commit that referenced this pull request Dec 3, 2018
@bors
Auto merge of #56305 - RalfJung:miri, r=oli-obk
7139e1c 
update miri

This should make miri green again :)
(Includes rust-lang/miri#553)

r? @oli-obk
@RalfJung RalfJung mentioned this pull request Dec 3, 2018
Merged
@nikic nikic mentioned this pull request Dec 3, 2018
Merged
@bors
Copy link
Contributor

bors commented Dec 3, 2018

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

@bors bors merged commit 27b9a94 into rust-lang:master Dec 3, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #56305!

Tested on commit 7139e1c.
Direct link to PR: #56305

🎉 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).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 3, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#56305!
77b8518 
Tested on commit rust-lang/rust@7139e1c.
Direct link to PR: <rust-lang/rust#56305>

🎉 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).
@bors bors mentioned this pull request Dec 3, 2018
Merged
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
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
@RalfJung @rust-highfive @oli-obk @bors @Centril @pietroalbini