Skip to content

update miri#71917

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri
May 8, 2020
Merged

update miri#71917
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri

Conversation

@RalfJung

@RalfJung RalfJung commented May 5, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

In particular this includes the change to yield on spin_loop_hint, which is needed for #71737.
r? @ghost Cc @rust-lang/miri

Fixes #71963

@RalfJung

RalfJung commented May 5, 2020

Copy link
Copy Markdown
Member Author

@bors r+ (no priority, toolstate is green)

@bors

bors commented May 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 99f53c7dca2a67cedac231a5f40a60df41b8040f has been approved by RalfJung

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 5, 2020
@RalfJung

RalfJung commented May 5, 2020

Copy link
Copy Markdown
Member Author

Included another PR.
@bors r+

@bors

bors commented May 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fa5d7221b3490cae4f2f57d70ef2f7b215f164e4 has been approved by RalfJung

@RalfJung

RalfJung commented May 7, 2020

Copy link
Copy Markdown
Member Author

@bors r-
Miri broke

@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 7, 2020
@RalfJung

RalfJung commented May 7, 2020

Copy link
Copy Markdown
Member Author

Fixes toolstate.
@bors r+ p=1

@bors

bors commented May 7, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit e583a5c has been approved by RalfJung

@bors

bors commented May 7, 2020

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@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 7, 2020
@RalfJung

RalfJung commented May 8, 2020

Copy link
Copy Markdown
Member Author

The python issue seems to be fixed I think... let's see
@bors p=1001

@bors

bors commented May 8, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e583a5c with merge a51e004...

@emilyalbini

emilyalbini commented May 8, 2020

Copy link
Copy Markdown
Member

@bors treeclosed=500

Temporary treeclose, I need to re-enable the gate on GHA after this PR merges.

@bors

bors commented May 8, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing a51e004 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 8, 2020
@RalfJung

RalfJung commented May 8, 2020

Copy link
Copy Markdown
Member Author

Sorry for that @pietroalbini, I hope letting bors work on this PR won't cause problems!

@bors bors merged commit a51e004 into rust-lang:master May 8, 2020
@rust-highfive

rust-highfive commented May 8, 2020

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #71917!

Tested on commit a51e004.
Direct link to PR: #71917

🎉 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 May 8, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#71917!
f6227d7 
Tested on commit rust-lang/rust@a51e004.
Direct link to PR: <rust-lang/rust#71917>

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

emilyalbini commented May 8, 2020

Copy link
Copy Markdown
Member

@RalfJung it didn't! Don't worry about it :)

@RalfJung RalfJung deleted the miri branch May 8, 2020 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

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

4 participants

@RalfJung @bors @emilyalbini @rust-highfive