fix: break inside async closure has incorrect span for enclosing closure #125078

linyihai · 2024-05-13T14:46:25Z

rustbot · 2024-05-13T14:46:33Z

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

compiler-errors · 2024-05-13T19:57:25Z

compiler/rustc_passes/src/loops.rs

@@ -91,6 +91,10 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
 }) => {
 let cx = match kind {
 hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(kind, source)) => {
+ let fn_decl_span = match self.cx {


This seems like a bit too specific of a case here. I think we should just fix the fn_decl_span for the hir::Closure from an async closure.

compiler-errors

Pls look into fixing this in a more general way

linyihai · 2024-05-16T14:11:37Z

@rustbot ready

compiler-errors

Sorry, I wasn't clear when I meant that this should be made more general. I think this needs to be fixed when the hir::Closure is constructed, somewhere in rustc_ast_lowering.

See https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_ast_lowering/expr.rs.html#1056-1122 or somewhere nearby.

linyihai · 2024-05-27T13:35:24Z

@rustbot ready

linyihai · 2024-06-05T15:28:54Z

I think it's ready to review. Would you @compiler-errors leave some feadback? I will be very appreciate for it

compiler-errors · 2024-06-18T15:32:16Z

@bors r+

bors · 2024-06-18T15:32:19Z

📌 Commit 05b7b46 has been approved by compiler-errors

It is now in the queue for this repository.

…errors fix: break inside async closure has incorrect span for enclosing closure Fixes rust-lang#124496

Rollup of 10 pull requests Successful merges: - rust-lang#124135 (delegation: Implement glob delegation) - rust-lang#125078 (fix: break inside async closure has incorrect span for enclosing closure) - rust-lang#125293 (Place tail expression behind terminating scope) - rust-lang#126422 (Suggest using a standalone doctest for non-local impl defs) - rust-lang#126493 (safe transmute: support non-ZST, variantful, uninhabited enums) - rust-lang#126504 (Sync fuchsia test runner with clang test runner) - rust-lang#126558 (hir_typeck: be more conservative in making "note caller chooses ty param" note) - rust-lang#126586 (Add `@badboy` and `@BlackHoleFox` as Mac Catalyst maintainers) - rust-lang#126615 (Add `rustc-ice*` to `.gitignore`) - rust-lang#126632 (Replace `move||` with `move ||`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125078 - linyihai:issue-124496, r=compiler-errors fix: break inside async closure has incorrect span for enclosing closure Fixes rust-lang#124496

…s, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? `@estebank` or `@oli-obk` or someone else on wg-diag or compiler i dont really care lol

…s, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? ``@estebank`` or ``@oli-obk`` or someone else on wg-diag or compiler i dont really care lol

…s, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? ```@estebank``` or ```@oli-obk``` or someone else on wg-diag or compiler i dont really care lol

…s, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? ````@estebank```` or ````@oli-obk```` or someone else on wg-diag or compiler i dont really care lol

Rollup merge of rust-lang#127058 - compiler-errors:tighten-async-spans, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? ````@estebank```` or ````@oli-obk```` or someone else on wg-diag or compiler i dont really care lol

…s, r=oli-obk Tighten `fn_decl_span` for async blocks Tightens the span of `async {}` blocks in diagnostics, and subsequently async closures and async fns, by actually setting the `fn_decl_span` correctly. This is kinda a follow-up on rust-lang#125078, but it fixes the problem in a more general way. I think the diagnostics are significantly improved, since we no longer have a bunch of overlapping spans. I'll point out one caveat where I think the diagnostic may get a bit more confusing, but where I don't think it matters. r? ````@estebank```` or ````@oli-obk```` or someone else on wg-diag or compiler i dont really care lol

rustbot assigned davidtwco May 13, 2024

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 May 13, 2024

compiler-errors reviewed May 13, 2024

View reviewed changes

compiler-errors requested changes May 13, 2024

View reviewed changes

compiler-errors assigned compiler-errors and unassigned davidtwco May 13, 2024

linyihai force-pushed the issue-124496 branch from 4687e24 to 1bc7a04 Compare May 14, 2024 06:22

This comment was marked as resolved.

Sign in to view

compiler-errors requested changes May 20, 2024

View reviewed changes

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 May 20, 2024

linyihai force-pushed the issue-124496 branch from 1bc7a04 to 0568d18 Compare May 27, 2024 03:12

This comment has been minimized.

Sign in to view

linyihai force-pushed the issue-124496 branch from 0568d18 to 1ecf1a2 Compare May 27, 2024 06: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 May 27, 2024

linyihai force-pushed the issue-124496 branch from 1ecf1a2 to b8cade7 Compare June 5, 2024 10:09

This comment has been minimized.

Sign in to view

fix: break inside async closure has incorrect span for enclosing closure

05b7b46

linyihai force-pushed the issue-124496 branch from b8cade7 to 05b7b46 Compare June 5, 2024 11:23

compiler-errors approved these changes Jun 18, 2024

View reviewed changes

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 Jun 18, 2024

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024

Rollup merge of rust-lang#125078 - linyihai:issue-124496, r=compiler-…

c5009dd

…errors fix: break inside async closure has incorrect span for enclosing closure Fixes rust-lang#124496

This was referenced Jun 19, 2024

Rollup of 20 pull requests #126653

Closed

Rollup of 10 pull requests #126655

Merged

bors merged commit c9a9d5c into rust-lang:master Jun 19, 2024
6 checks passed

rustbot added this to the 1.81.0 milestone Jun 19, 2024

compiler-errors mentioned this pull request Jun 27, 2024

Tighten fn_decl_span for async blocks #127058

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: break inside async closure has incorrect span for enclosing closure #125078

fix: break inside async closure has incorrect span for enclosing closure #125078

linyihai commented May 13, 2024

rustbot commented May 13, 2024

compiler-errors May 13, 2024

This comment was marked as off-topic.

compiler-errors left a comment

This comment was marked as resolved.

linyihai commented May 16, 2024

compiler-errors left a comment

This comment has been minimized.

linyihai commented May 27, 2024

This comment has been minimized.

linyihai commented Jun 5, 2024

compiler-errors commented Jun 18, 2024

bors commented Jun 18, 2024

fix: break inside async closure has incorrect span for enclosing closure #125078

fix: break inside async closure has incorrect span for enclosing closure #125078

Conversation

linyihai commented May 13, 2024

rustbot commented May 13, 2024

compiler-errors May 13, 2024

Choose a reason for hiding this comment

This comment was marked as off-topic.

compiler-errors left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

linyihai commented May 16, 2024

compiler-errors left a comment

Choose a reason for hiding this comment

This comment has been minimized.

linyihai commented May 27, 2024

This comment has been minimized.

linyihai commented Jun 5, 2024

compiler-errors commented Jun 18, 2024

bors commented Jun 18, 2024