Skip to content

Remove NullOp::Box - #90102

Merged
bors merged 2 commits into
rust-lang:masterfrom
nbdd0121:box3
Jan 3, 2022
Merged

Remove NullOp::Box#90102
bors merged 2 commits into
rust-lang:masterfrom
nbdd0121:box3

Conversation

@nbdd0121

@nbdd0121nbdd0121 commented Oct 20, 2021•
edited
Loading

Copy link
Copy Markdown
Member

Follow up of #89030 and MCP rust-lang/compiler-team#460.

~1 month later nothing seems to be broken, apart from a small regression that #89332 (1aac85bb716c09304b313d69d30d74fe7e8e1a8e) shows could be regained by remvoing the diverging path, so it shall be safe to continue and remove NullOp::Box completely.

r? @jonas-schievink
@rustbot label T-compiler

@rust-highfive

rust-highfive commented Oct 20, 2021

Copy link
Copy Markdown
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Oct 20, 2021
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/step.rs Outdated
RalfJung
RalfJung reviewed Oct 20, 2021
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/transform/check_consts/check.rs Outdated
oli-obk
oli-obk reviewed Oct 20, 2021
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/lib.rs Outdated
@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 26, 2021
@JohnCSimonJohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2021
@JohnCSimonJohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2021
@jonas-schievink

jonas-schievink commented Jan 3, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 037e189 has been approved by jonas-schievink

@borsbors 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 3, 2022
@matthiaskrgrmatthiaskrgr mentioned this pull request Jan 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2022
@bors
Auto merge ofrust-lang#92518- matthiaskrgr:rollup-fl8z4e7, r=matthi…
ddabe07
…askrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#90102 (Remove `NullOp::Box`)
- rust-lang#92011 (Use field span in `rustc_macros` when emitting decode call)
- rust-lang#92402 (Suggest while let x = y when encountering while x = y)
- rust-lang#92409 (Couple of libtest cleanups)
- rust-lang#92418 (Fix spacing in pretty printed PatKind::Struct with no fields)
- rust-lang#92444 (Consolidate Result's and Option's methods into fewer impl blocks)
Failed merges:
- rust-lang#92483 (Stabilize `result_cloned` and `result_copied`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 57a4f4a into rust-lang:masterJan 3, 2022
@rustbotrustbot added this to the 1.59.0 milestone Jan 3, 2022
@RalfJungRalfJung mentioned this pull request Jan 4, 2022
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 4, 2022
@matthiaskrgr
Rollup merge ofrust-lang#92551- RalfJung:stack-pop-cleanup, r=oli-obk
e525e6a
rename StackPopClean::None to Root
With rust-lang#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`
@nbdd0121
nbdd0121 deleted the box3 branch January 9, 2022 20:47
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 13, 2022
@matthiaskrgr
Rollup merge ofrust-lang#90102- nbdd0121:box3, r=jonas-schievink
6975071
Remove `NullOp::Box`
Follow up of rust-lang#89030 and MCP rust-lang/compiler-team#460.
~1 month later nothing seems to be broken, apart from a small regression that rust-lang#89332 (1aac85bb716c09304b313d69d30d74fe7e8e1a8e) shows could be regained by remvoing the diverging path, so it shall be safe to continue and remove `NullOp::Box` completely.
r? `@jonas-schievink`
`@rustbot` label T-compiler
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Feb 23, 2022
@matthiaskrgr
Rollup merge ofrust-lang#90102- nbdd0121:box3, r=jonas-schievink
1da0071
Remove `NullOp::Box`
Follow up of rust-lang#89030 and MCP rust-lang/compiler-team#460.
~1 month later nothing seems to be broken, apart from a small regression that rust-lang#89332 (1aac85bb716c09304b313d69d30d74fe7e8e1a8e) shows could be regained by remvoing the diverging path, so it shall be safe to continue and remove `NullOp::Box` completely.
r? `@jonas-schievink`
`@rustbot` label T-compiler
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@oli-obkoli-obkoli-obk approved these changes

Assignees

@jonas-schievinkjonas-schievink

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.59.0

Development

Successfully merging this pull request may close these issues.

9 participants

@nbdd0121@rust-highfive@rust-log-analyzer@jonas-schievink@bors@RalfJung@oli-obk@JohnCSimon@rustbot