Skip to content

Adjust Miri to also require return places everywhere#2138

Merged
bors merged 2 commits into
rust-lang:masterfrom
JakobDegen:call-fallout
May 24, 2022
Merged

Adjust Miri to also require return places everywhere#2138
bors merged 2 commits into
rust-lang:masterfrom
JakobDegen:call-fallout

Conversation

@JakobDegen

Copy link
Copy Markdown
Contributor

This is the miri side of rust-lang/rust#96098 . It'll still need a bump to rust-version once the rust PR is merged, but the test suite passes against my local build of rustc.

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label May 21, 2022
Comment thread src/diagnostics.rs Outdated
@RalfJung

Copy link
Copy Markdown
Member

rust-lang/rust#96098 just landed; could you rebase and update the rust-version file? Then this is good to go. :)
@bors delegate+

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

✌️ @JakobDegen can now approve this pull request

@RalfJung

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

📌 Commit 4bbb7d9 has been approved by RalfJung

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

🔒 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 call-fallout (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 call-fallout --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
Auto-merging rust-version
CONFLICT (content): Merge conflict in rust-version
Automatic merge failed; fix conflicts and then commit the result.

@RalfJung

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

📌 Commit e428d29 has been approved by RalfJung

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit e428d29 with merge 22c97b3...

@bors

bors commented May 24, 2022

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 22c97b3 to master...

@bors bors merged commit 22c97b3 into rust-lang:master May 24, 2022
@JakobDegen

Copy link
Copy Markdown
Contributor Author

Ah, apologies, was asleep. Thanks for handling this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-blocked-on-rust Status: Blocked on landing a Rust PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants