Improve parse item fallback by oriongonza · Pull Request #125388 · rust-lang/rust

oriongonza · 2024-05-21T22:56:18Z

Closes #92615 and closes #101622
Please review the new diagnostics cafefully.

This PR also adds a few more comments to the parser.

rustbot · 2024-05-21T22:56:26Z

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

tests/ui/parser/shebang/shebang-doc-comment.stderr

SparrowLii

I don't think this PR solves #101622 :(

SparrowLii · 2024-05-24T01:51:10Z

compiler/rustc_parse/src/parser/item.rs

+                    .dcx()
+                    .struct_span_err(self.token.span, format!("expected item, found {token_str}"));
+
+                match self.parse_full_stmt(AttemptLocalParseRecovery::No) {


We'd be better doing more analysis to figure out what went wrong here, rather than treating them all as statements. For example, whether it contains ; in [] can be used to distinguish whether it is an attribute or an array.

I gave up on trying to detect kinds of expressions as it's very unreliable.

compiler/rustc_parse/src/parser/item.rs

oriongonza · 2024-05-24T10:48:07Z

I don't think this PR solves #101622 :(

It addresses the main point raised in the issue, right?

compiler/rustc_ast_pretty/src/pprust/mod.rs

oriongonza · 2024-05-31T15:35:51Z

@rustbot ready
@SparrowLii I've addressed your concerns and reworked the approach a bit.

bors · 2024-06-18T12:28:21Z

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

oriongonza · 2024-06-20T06:10:50Z

@rustbot author

bors · 2024-07-18T13:54:09Z

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

JohnCSimon · 2024-09-03T22:47:16Z

@dev-ardi
ping from triage - can you post your status on this PR? This PR has not received an update in a few months.

oriongonza · 2024-09-03T23:11:31Z

It was left unreviewed for a while so it became full of conflicts. I intend to finish it at some point though...

oriongonza · 2024-10-02T20:31:03Z

@rustbot ready

apiraino · 2024-10-31T11:01:44Z

r? @SparrowLii

(but feel free to roll the review assignment to someone else)

wesleywiser · 2024-12-05T15:50:32Z

r? diagnostics

wesleywiser · 2025-03-27T14:15:00Z

r? diagnostics

oli-obk · 2025-04-28T09:57:01Z

compiler/rustc_parse/src/parser/item.rs

+                            "Should have been handled by maybe_consume_incorrect_semicolon"
+                        );
+                    }
+                    StmtKind::Item(_) | StmtKind::MacCall(_) => {


Item should be unreachable, right?

oli-obk · 2025-04-28T09:58:24Z

compiler/rustc_parse/src/parser/item.rs

+                    }
+                    StmtKind::Semi(expr) => {
+                        err.span_label(span, "unexpected expression").help(format!(
+                            "consider putting it inside a function: fn foo() {{ {}; }}",


This diagnostic can potentially become very big. Either use structured suggestions, or do not put a suggestion into the diagnostic message itself.

oli-obk · 2025-04-28T10:00:24Z

tests/ui/parser/shebang/shebang-doc-comment.stderr

@@ -2,8 +2,11 @@ error: expected item, found `[`
  --> $DIR/shebang-doc-comment.rs:2:1
   |
 LL | [allow(unused_variables)]


Maybe add a code path for array expressions and suggest adding a # instead?

oli-obk · 2025-04-28T10:00:57Z

@rustbot author

rustbot · 2025-04-28T10:01:01Z

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

Dylan-DPC · 2025-06-18T17:03:26Z

@oriongonza any updates on this? thanks

alex-semenyuk · 2025-10-02T18:29:45Z

@oriongonza
Thanks for your contribution.
From wg-triage. Closed due to inactivity

rustbot assigned wesleywiser May 21, 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 21, 2024

compiler-errors reviewed May 22, 2024

View reviewed changes

tests/ui/parser/shebang/shebang-doc-comment.stderr Outdated Show resolved Hide resolved

SparrowLii reviewed May 24, 2024

View reviewed changes

compiler/rustc_parse/src/parser/item.rs Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/item.rs Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/item.rs Outdated Show resolved Hide resolved

oriongonza force-pushed the improve-parse-item-fallback branch 3 times, most recently from 9a129e5 to 06a1ccf Compare May 31, 2024 15:29

oriongonza commented May 31, 2024

View reviewed changes

compiler/rustc_ast_pretty/src/pprust/mod.rs Outdated Show resolved Hide resolved

oriongonza force-pushed the improve-parse-item-fallback branch from 06a1ccf to 1d326d5 Compare June 19, 2024 20:19

This comment has been minimized.

Sign in to view

oriongonza force-pushed the improve-parse-item-fallback branch 2 times, most recently from 3f2ccd7 to b9ddf53 Compare June 20, 2024 22:31

oriongonza force-pushed the improve-parse-item-fallback branch from b9ddf53 to c66b446 Compare July 4, 2024 22:37

This comment has been minimized.

Sign in to view

oriongonza force-pushed the improve-parse-item-fallback branch 2 times, most recently from 57d1590 to faf1c5f Compare October 2, 2024 20:18

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 Oct 2, 2024

This comment has been minimized.

Sign in to view

improve parse item fallback

b40be9d

oriongonza force-pushed the improve-parse-item-fallback branch from faf1c5f to b40be9d Compare October 2, 2024 22:12

rustbot assigned SparrowLii and unassigned wesleywiser Oct 31, 2024

rustbot assigned estebank and unassigned SparrowLii Dec 5, 2024

apiraino added the WG-diagnostics Working group: Diagnostics label Dec 5, 2024

rustbot assigned oli-obk and unassigned estebank Mar 27, 2025

oli-obk reviewed Apr 28, 2025

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 Apr 28, 2025

alex-semenyuk closed this Oct 2, 2025

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

Uh oh!

Conversation

oriongonza commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 21, 2024

Uh oh!

Uh oh!

SparrowLii left a comment

Choose a reason for hiding this comment

Uh oh!

SparrowLii May 24, 2024 • 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!

oriongonza Oct 2, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

oriongonza commented May 24, 2024

Uh oh!

Uh oh!

oriongonza commented May 31, 2024

Uh oh!

bors commented Jun 18, 2024

Uh oh!

This comment has been minimized.

oriongonza commented Jun 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

bors commented Jul 18, 2024

Uh oh!

JohnCSimon commented Sep 3, 2024

Uh oh!

oriongonza commented Sep 3, 2024

Uh oh!

oriongonza commented Oct 2, 2024

Uh oh!

This comment has been minimized.

apiraino commented Oct 31, 2024

Uh oh!

wesleywiser commented Dec 5, 2024

Uh oh!

wesleywiser commented Mar 27, 2025

Uh oh!

oli-obk Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

oli-obk Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

oli-obk Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Apr 28, 2025

Uh oh!

rustbot commented Apr 28, 2025

Uh oh!

Dylan-DPC commented Jun 18, 2025

Uh oh!

alex-semenyuk commented Oct 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

oriongonza commented May 21, 2024 •

edited

Loading

SparrowLii May 24, 2024 •

edited

Loading

oriongonza commented Jun 20, 2024 •

edited

Loading