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

rename StackPopClean::None to Root #92551

Merged
merged 1 commit into from
Jan 5, 2022
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jan 4, 2022

With #90102, StackPopClean::None is now only used for the "root" frame of the stack, so adjust its name accordingly and add an assertion.

r? @oli-obk

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 4, 2022
@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 4, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jan 4, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 4, 2022

📌 Commit d60018b 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 Jan 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2022
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#91587 (core::ops::unsize: improve docs for DispatchFromDyn)
 - rust-lang#91907 (Allow `_` as the length of array types and repeat expressions)
 - rust-lang#92515 (RustWrapper: adapt for an LLVM API change)
 - rust-lang#92516 (Do not use deprecated -Zsymbol-mangling-version in bootstrap)
 - rust-lang#92530 (Move `contains` method of Option and Result lower in docs)
 - rust-lang#92546 (Update books)
 - rust-lang#92551 (rename StackPopClean::None to Root)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e525e6a into rust-lang:master Jan 5, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 5, 2022
bors added a commit to rust-lang/miri that referenced this pull request Jan 5, 2022
adjust for StackPopCleanup::None rename

This is the Miri side of rust-lang/rust#92551
@RalfJung RalfJung deleted the stack-pop-cleanup branch January 5, 2022 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants