Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` #137455

compiler-errors · 2025-02-23T03:55:08Z

Namely, it defines its own extract_component_with_significant_dtor which is a bit more accurate than Ty::has_significant_drop, since it has a hard-coded list of types from the ecosystem which are opted out of the lint.¹

Also, since we extract the dtors themselves, adopt the same label we use in tail_expr_drop_order to point out the destructor impl. This makes it much clear what's actually being dropped, so it should be clearer to know when it's a false positive.

This conflicts with #137444, but I will rebase whichever lands first.

Side-note, it's kinda a shame that now there are two functions that presumably do the same thing. But this isn't my circus, nor are these my monkeys. ↩

rustbot · 2025-02-23T03:55:16Z

r? @cjgillot

rustbot has assigned @cjgillot.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-02-23T03:55:17Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

bors · 2025-02-24T04:09:30Z

☔ The latest upstream changes (presumably #137497) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2025-02-25T23:59:45Z

☔ The latest upstream changes (presumably #137608) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk · 2025-02-27T07:41:12Z

r? @oli-obk

@bors r+

bors · 2025-02-27T07:41:15Z

📌 Commit 864cca8 has been approved by oli-obk

It is now in the queue for this repository.

…oli-obk Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` Namely, it defines its own `extract_component_with_significant_dtor` which is a bit more accurate than `Ty::has_significant_drop`, since it has a hard-coded list of types from the ecosystem which are opted out of the lint.[^a] Also, since we extract the dtors themselves, adopt the same *label* we use in `tail_expr_drop_order` to point out the destructor impl. This makes it much clear what's actually being dropped, so it should be clearer to know when it's a false positive. This conflicts with rust-lang#137444, but I will rebase whichever lands first. [^a]: Side-note, it's kinda a shame that now there are two functions that presumably do the same thing. But this isn't my circus, nor are these my monkeys.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#136542 ([`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing) - rust-lang#136579 (Fix UB in ThinVec::flat_map_in_place) - rust-lang#136688 (require trait impls to have matching const stabilities as the traits) - rust-lang#136846 (Make `AssocOp` more like `ExprKind`) - rust-lang#137304 (add `IntoBounds::intersect` and `RangeBounds::is_empty`) - rust-lang#137455 (Reuse machinery from `tail_expr_drop_order` for `if_let_rescope`) - rust-lang#137480 (Return unexpected termination error instead of panicing in `Thread::join`) - rust-lang#137694 (Spruce up `AttributeKind` docs) r? `@ghost` `@rustbot` modify labels: rollup

…oli-obk Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` Namely, it defines its own `extract_component_with_significant_dtor` which is a bit more accurate than `Ty::has_significant_drop`, since it has a hard-coded list of types from the ecosystem which are opted out of the lint.[^a] Also, since we extract the dtors themselves, adopt the same *label* we use in `tail_expr_drop_order` to point out the destructor impl. This makes it much clear what's actually being dropped, so it should be clearer to know when it's a false positive. This conflicts with rust-lang#137444, but I will rebase whichever lands first. [^a]: Side-note, it's kinda a shame that now there are two functions that presumably do the same thing. But this isn't my circus, nor are these my monkeys.

Rollup of 4 pull requests Successful merges: - rust-lang#136579 (Fix UB in ThinVec::flat_map_in_place) - rust-lang#137455 (Reuse machinery from `tail_expr_drop_order` for `if_let_rescope`) - rust-lang#137480 (Return unexpected termination error instead of panicing in `Thread::join`) - rust-lang#137694 (Spruce up `AttributeKind` docs) r? `@ghost` `@rustbot` modify labels: rollup try-job: i686-msvc-1

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#136542 ([`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing) - rust-lang#136579 (Fix UB in ThinVec::flat_map_in_place) - rust-lang#136688 (require trait impls to have matching const stabilities as the traits) - rust-lang#136846 (Make `AssocOp` more like `ExprKind`) - rust-lang#137304 (add `IntoBounds::intersect` and `RangeBounds::is_empty`) - rust-lang#137455 (Reuse machinery from `tail_expr_drop_order` for `if_let_rescope`) - rust-lang#137480 (Return unexpected termination error instead of panicing in `Thread::join`) - rust-lang#137694 (Spruce up `AttributeKind` docs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137455 - compiler-errors:drop-lint-dtor, r=oli-obk Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` Namely, it defines its own `extract_component_with_significant_dtor` which is a bit more accurate than `Ty::has_significant_drop`, since it has a hard-coded list of types from the ecosystem which are opted out of the lint.[^a] Also, since we extract the dtors themselves, adopt the same *label* we use in `tail_expr_drop_order` to point out the destructor impl. This makes it much clear what's actually being dropped, so it should be clearer to know when it's a false positive. This conflicts with rust-lang#137444, but I will rebase whichever lands first. [^a]: Side-note, it's kinda a shame that now there are two functions that presumably do the same thing. But this isn't my circus, nor are these my monkeys.

smalis-msft · 2025-02-28T19:55:59Z

Given that #137444 was beta-backported, can/should this PR be too?

compiler-errors · 2025-02-28T19:56:57Z

Nope, this is not really as drastic to warrant backporting.

rustbot assigned cjgillot Feb 23, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 23, 2025

compiler-errors force-pushed the drop-lint-dtor branch from b8b1754 to a348d62 Compare February 24, 2025 04:12

smalis-msft mentioned this pull request Feb 25, 2025

OpenVMM Rust 2024 Compatibility microsoft/openvmm#288

Open

9 tasks

Print out destructor

864cca8

compiler-errors force-pushed the drop-lint-dtor branch from a348d62 to 864cca8 Compare February 26, 2025 19:03

rustbot assigned oli-obk Feb 27, 2025

rustbot unassigned cjgillot Feb 27, 2025

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 Feb 27, 2025

This was referenced Feb 27, 2025

Rollup of 7 pull requests #137709

Closed

Rollup of 8 pull requests #137710

Merged

matthiaskrgr mentioned this pull request Feb 27, 2025

Rollup of 4 pull requests #137717

Closed

bors merged commit 25db95e into rust-lang:master Feb 28, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Feb 28, 2025

smalis-msft mentioned this pull request Feb 28, 2025

[beta] backports #137747

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` #137455

Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` #137455

Uh oh!

compiler-errors commented Feb 23, 2025 •

edited

Loading

Uh oh!

rustbot commented Feb 23, 2025

Uh oh!

rustbot commented Feb 23, 2025

Uh oh!

bors commented Feb 24, 2025

Uh oh!

bors commented Feb 25, 2025

Uh oh!

oli-obk commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

Uh oh!

smalis-msft commented Feb 28, 2025

Uh oh!

compiler-errors commented Feb 28, 2025

Uh oh!

Uh oh!

Reuse machinery from tail_expr_drop_order for if_let_rescope #137455

Reuse machinery from tail_expr_drop_order for if_let_rescope #137455

Uh oh!

Conversation

compiler-errors commented Feb 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Footnotes

Uh oh!

rustbot commented Feb 23, 2025

Uh oh!

rustbot commented Feb 23, 2025

Uh oh!

bors commented Feb 24, 2025

Uh oh!

bors commented Feb 25, 2025

Uh oh!

oli-obk commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

Uh oh!

smalis-msft commented Feb 28, 2025

Uh oh!

compiler-errors commented Feb 28, 2025

Uh oh!

Uh oh!

Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` #137455

Reuse machinery from `tail_expr_drop_order` for `if_let_rescope` #137455

compiler-errors commented Feb 23, 2025 •

edited

Loading