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.

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

bump Miri, update for cargo-miri being a separate project #72779

Merged
merged 1 commit into from
Jun 1, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented May 30, 2020

r? @oli-obk

Fixes #72801

@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 May 30, 2020
src/bootstrap/tool.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2020

@bors r+

@bors
Copy link
Contributor

bors commented May 30, 2020

📌 Commit 1f38fef8eae5a370b682cbfd5a97c9c3f7f3ecf8 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 May 30, 2020
@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2020

@bors p=1

@RalfJung
Copy link
Member Author

This is actually not particularly urgent, and the queue is big enough already.
@bors p=0

@RalfJung
Copy link
Member Author

Blocking this on rust-lang/miri#1441 which fixes a critical bug.
@bors r-

@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 May 30, 2020
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented May 31, 2020

📌 Commit 840d2f71511337560a4afb1da6250979898147a6 has been approved by RalfJung

@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 May 31, 2020
@RalfJung
Copy link
Member Author

Eh
@bors r- r=oli-obk

@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 May 31, 2020
@bors
Copy link
Contributor

bors commented May 31, 2020

📌 Commit 840d2f71511337560a4afb1da6250979898147a6 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 May 31, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Jun 1, 2020

@bors r=oli-obk p=1

@bors
Copy link
Contributor

bors commented Jun 1, 2020

📌 Commit aa5d29f has been approved by oli-obk

RalfJung added a commit to RalfJung/rust that referenced this pull request Jun 1, 2020
bump Miri, update for cargo-miri being a separate project

r? @oli-obk

Fixes rust-lang#72801
@RalfJung
Copy link
Member Author

RalfJung commented Jun 1, 2020

@bors r-
broken by the TLS revamp

@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 Jun 1, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Jun 1, 2020

@bors r=oli-obk p=1

@bors
Copy link
Contributor

bors commented Jun 1, 2020

📌 Commit 759e495 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 Jun 1, 2020
@bors
Copy link
Contributor

bors commented Jun 1, 2020

⌛ Testing commit 759e495 with merge ad4bc33...

@bors
Copy link
Contributor

bors commented Jun 1, 2020

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing ad4bc33 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 1, 2020
@bors bors merged commit ad4bc33 into rust-lang:master Jun 1, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #72779!

Tested on commit ad4bc33.
Direct link to PR: #72779

🎉 miri on windows: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 1, 2020
Tested on commit rust-lang/rust@ad4bc33.
Direct link to PR: <rust-lang/rust#72779>

🎉 miri on windows: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@RalfJung RalfJung deleted the miri branch June 1, 2020 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#72794
5 participants