hir_typeck: Don't ICE on closures without drop location in closure capture lint by malezjaa · Pull Request #161548 · rust-lang/rust

malezjaa · 2026-08-22T16:48:27Z

drop_location_span assumed that every closure had a valid drop location, which could cause an ICE for closures in unsupported contexts. This changes drop_location_span to return Option<Span>. If there is no valid drop location, the migration lint is not emitted because its drop-order diagnostic would be misleading. The span is computed before creating MigrationLint and stored there so it can be reused for the drop-order labels.

rustbot · 2026-08-22T16:48:33Z

r? @Enselic

rustbot has assigned @Enselic.
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

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 75 candidates
Random selection from 20 candidates

rustbot · 2026-08-25T04:26:52Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

malezjaa · 2026-08-26T21:33:04Z

@rustbot ready

rustbot · 2026-08-26T22:33:42Z

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

rustbot · 2026-08-26T22:33:44Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

malezjaa · 2026-08-27T09:36:40Z

@rustbot ready

Enselic

Some more comments. I'd also like to ask you to have a more descriptive commit title. My suggestion is something along the lines of:

hir_typeck: Don't ICE on closures without drop location in closure capture lint

View changes since this review

malezjaa · 2026-08-31T21:14:44Z

@rustbot ready

Enselic

Just a quick comment. (I didn't have time for a full and detailed review, but figured you might want to look into this one already now. Feel free to wait for more review comments before you push new code, if you prefer.)

View changes since this review

…pture lint `drop_location_span` assumed that every closure had a valid drop location, which could cause an ICE for closures in unsupported contexts. This changes `drop_location_span` to return `Option<Span>`. If there is no valid drop location, the migration lint is not emitted because its drop-order diagnostic would be misleading. The span is computed before creating `MigrationLint` and stored there so it can be reused for the drop-order labels.

malezjaa · 2026-09-13T08:30:51Z

@rustbot ready

Enselic

This looks good now, thanks!

@bors r+ rollup

View changes since this review

rust-bors · 2026-09-15T04:03:00Z

📌 Commit 1699fba has been approved by Enselic

It is now in the queue for this repository.

…e, r=Enselic hir_typeck: Don't ICE on closures without drop location in closure capture lint Resolves rust-lang#156288. `drop_location_span` assumed that every closure had a valid drop location, which could cause an ICE for closures in unsupported contexts. This changes `drop_location_span` to return `Option<Span>`. If there is no valid drop location, the migration lint is not emitted because its drop-order diagnostic would be misleading. The span is computed before creating `MigrationLint` and stored there so it can be reused for the drop-order labels.

Rollup of 10 pull requests Successful merges: - #160911 (Remove d32 feature from 32-bit Arm targets) - #162771 (Filter do_not_recommend impls before handling a single candidate) - #162779 (rustdoc: Revert "fix bare urls split text") - #161548 (hir_typeck: Don't ICE on closures without drop location in closure capture lint) - #161612 (std: make a lot of items crate private) - #162204 (Suggest keyword order for `extern "C" const unsafe fn`) - #162372 (Clean up `test/rustdoc-html` folder by moving tests where appropriate) - #162638 (dont suggest changing the mutability of a borrow that comes from a macro) - #162643 (Fix `path_trailing_sep` methods for Windows verbatim paths) - #162784 (AGENTS.md: Permit local experimentation, per the online policy.)

…uwer Rollup of 12 pull requests Successful merges: - #160911 (Remove d32 feature from 32-bit Arm targets) - #161868 (libtest: never iterate over all tests in `--exact` mode) - #162771 (Filter do_not_recommend impls before handling a single candidate) - #162779 (rustdoc: Revert "fix bare urls split text") - #161548 (hir_typeck: Don't ICE on closures without drop location in closure capture lint) - #161612 (std: make a lot of items crate private) - #162204 (Suggest keyword order for `extern "C" const unsafe fn`) - #162372 (Clean up `test/rustdoc-html` folder by moving tests where appropriate) - #162638 (dont suggest changing the mutability of a borrow that comes from a macro) - #162643 (Fix `path_trailing_sep` methods for Windows verbatim paths) - #162654 (Improve Armv7-R documentation) - #162784 (AGENTS.md: Permit local experimentation, per the online policy.)

Rollup merge of #161548 - malezjaa:fix-drop-location-span-ice, r=Enselic hir_typeck: Don't ICE on closures without drop location in closure capture lint Resolves #156288. `drop_location_span` assumed that every closure had a valid drop location, which could cause an ICE for closures in unsupported contexts. This changes `drop_location_span` to return `Option<Span>`. If there is no valid drop location, the migration lint is not emitted because its drop-order diagnostic would be misleading. The span is computed before creating `MigrationLint` and stored there so it can be reused for the drop-order labels.

…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#160911 (Remove d32 feature from 32-bit Arm targets) - rust-lang/rust#161868 (libtest: never iterate over all tests in `--exact` mode) - rust-lang/rust#162771 (Filter do_not_recommend impls before handling a single candidate) - rust-lang/rust#162779 (rustdoc: Revert "fix bare urls split text") - rust-lang/rust#161548 (hir_typeck: Don't ICE on closures without drop location in closure capture lint) - rust-lang/rust#161612 (std: make a lot of items crate private) - rust-lang/rust#162204 (Suggest keyword order for `extern "C" const unsafe fn`) - rust-lang/rust#162372 (Clean up `test/rustdoc-html` folder by moving tests where appropriate) - rust-lang/rust#162638 (dont suggest changing the mutability of a borrow that comes from a macro) - rust-lang/rust#162643 (Fix `path_trailing_sep` methods for Windows verbatim paths) - rust-lang/rust#162654 (Improve Armv7-R documentation) - rust-lang/rust#162784 (AGENTS.md: Permit local experimentation, per the online policy.)

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2026

rustbot assigned Enselic Aug 22, 2026

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 22, 2026

Enselic requested changes Aug 25, 2026

View reviewed changes

Comment thread compiler/rustc_hir_typeck/src/upvar.rs Outdated

Comment thread tests/ui/closures/2229_closure_analysis/incompatible-captures-without-drop-location.rs

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 25, 2026

malezjaa force-pushed the fix-drop-location-span-ice branch 2 times, most recently from d1439d4 to 21060d4 Compare August 26, 2026 21:32

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 26, 2026

This comment has been minimized.

Sign in to view

malezjaa force-pushed the fix-drop-location-span-ice branch from 21060d4 to 5280e63 Compare August 26, 2026 22:33

Enselic requested changes Aug 27, 2026

View reviewed changes

Comment thread tests/ui/closures/2229_closure_analysis/rust_2021_incompatible_closure_captures.stderr Outdated

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 27, 2026

malezjaa force-pushed the fix-drop-location-span-ice branch from 5280e63 to 623f6f7 Compare August 27, 2026 09:19

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 27, 2026

Enselic requested changes Aug 31, 2026

View reviewed changes

Comment thread compiler/rustc_hir_typeck/src/upvar.rs Outdated

Comment thread compiler/rustc_hir_typeck/src/upvar.rs Outdated

Comment thread tests/ui/closures/2229_closure_analysis/incompatible-captures-without-drop-location.rs

Comment thread compiler/rustc_hir_typeck/src/upvar.rs

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2026

malezjaa force-pushed the fix-drop-location-span-ice branch from 623f6f7 to 158a310 Compare August 31, 2026 21:07

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 31, 2026

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2026

Enselic requested changes Sep 3, 2026

View reviewed changes

Comment thread compiler/rustc_hir_typeck/src/upvar.rs Outdated

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 3, 2026

malezjaa force-pushed the fix-drop-location-span-ice branch from 158a310 to 20cbc85 Compare September 3, 2026 19:38

Enselic requested changes Sep 8, 2026

View reviewed changes

Comment thread compiler/rustc_hir_typeck/src/upvar.rs Outdated

Enselic changed the title ~~fix drop_location_span ICE~~ hir_typeck: Don't ICE on closures without drop location in closure capture lint Sep 9, 2026

malezjaa force-pushed the fix-drop-location-span-ice branch from 20cbc85 to 1699fba Compare September 11, 2026 05:59

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 13, 2026

Enselic approved these changes Sep 15, 2026

View reviewed changes

rust-bors Bot 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 Sep 15, 2026

jhpratt mentioned this pull request Sep 15, 2026

Rollup of 10 pull requests #162792

Closed

JonathanBrouwer mentioned this pull request Sep 15, 2026

Rollup of 12 pull requests #162798

Merged

rust-bors Bot merged commit 0f31e2c into rust-lang:main Sep 15, 2026
13 checks passed

rustbot added this to the 1.100.0 milestone Sep 15, 2026

Uh oh!

Conversation

malezjaa commented Aug 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 22, 2026

Uh oh!

Uh oh!

Uh oh!

rustbot commented Aug 25, 2026

Uh oh!

malezjaa commented Aug 26, 2026

Uh oh!

This comment has been minimized.

rustbot commented Aug 26, 2026

Uh oh!

rustbot commented Aug 26, 2026

Uh oh!

Uh oh!

malezjaa commented Aug 27, 2026

Uh oh!

Enselic left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

malezjaa commented Aug 31, 2026

Uh oh!

Enselic left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

malezjaa commented Sep 13, 2026

Uh oh!

Enselic left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-bors Bot commented Sep 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

malezjaa commented Aug 22, 2026 •

edited

Loading

Enselic left a comment •

edited by rustbot

Loading

Enselic left a comment •

edited

Loading

Enselic left a comment •

edited by rustbot

Loading