Skip to content

Improve parse item fallback #125388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve parse item fallback #125388

wants to merge 1 commit into from

Conversation

oriongonza
Copy link
Contributor

@oriongonza oriongonza commented May 21, 2024 •
edited
Loading

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

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

@rustbot
Copy link
Collaborator

rustbot commented May 21, 2024

r? @wesleywiser

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

@rustbot 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
SparrowLii
SparrowLii reviewed May 24, 2024
View reviewed changes
Copy link
Member

@SparrowLii SparrowLii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

compiler/rustc_parse/src/parser/item.rs Outdated
.dcx()
.struct_span_err(self.token.span, format!("expected item, found {token_str}"));

match self.parse_full_stmt(AttemptLocalParseRecovery::No) {
Copy link
Member

@SparrowLii SparrowLii May 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

SparrowLii
SparrowLii reviewed May 24, 2024
View reviewed changes
@oriongonza
Copy link
Contributor Author

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

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

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

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

@bors
Copy link
Collaborator

bors commented Jun 18, 2024

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

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

This comment has been minimized.

Sign in to view
@oriongonza
Copy link
Contributor Author

oriongonza commented Jun 20, 2024 •
edited
Loading

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2024
@oriongonza oriongonza force-pushed the improve-parse-item-fallback branch 2 times, most recently from 3f2ccd7 to b9ddf53 Compare June 20, 2024 22:31
@oriongonza oriongonza force-pushed the improve-parse-item-fallback branch from b9ddf53 to c66b446 Compare July 4, 2024 22:37
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Jul 18, 2024

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

@JohnCSimon
Copy link
Member

@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
Copy link
Contributor Author

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

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

@rustbot ready

@rustbot 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
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oriongonza oriongonza force-pushed the improve-parse-item-fallback branch from faf1c5f to b40be9d Compare October 2, 2024 22:12
@apiraino
Copy link
Contributor

r? @SparrowLii

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

@rustbot rustbot assigned SparrowLii and unassigned wesleywiser Oct 31, 2024
@wesleywiser
Copy link
Member

r? diagnostics

@rustbot rustbot assigned estebank and unassigned SparrowLii Dec 5, 2024
@apiraino apiraino added the WG-diagnostics Working group: Diagnostics label Dec 5, 2024
@wesleywiser
Copy link
Member

r? diagnostics

@rustbot rustbot assigned oli-obk and unassigned estebank Mar 27, 2025
oli-obk
oli-obk reviewed Apr 28, 2025
View reviewed changes
compiler/rustc_parse/src/parser/item.rs
"Should have been handled by maybe_consume_incorrect_semicolon"
);
}
StmtKind::Item(_) | StmtKind::MacCall(_) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Item should be unreachable, right?

oli-obk
oli-obk reviewed Apr 28, 2025
View reviewed changes
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() {{ {}; }}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

oli-obk
oli-obk reviewed Apr 28, 2025
View reviewed changes
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)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@oli-obk
Copy link
Contributor

oli-obk commented Apr 28, 2025

@rustbot author

@rustbot 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
@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@compiler-errors compiler-errors compiler-errors left review comments

@SparrowLii SparrowLii SparrowLii left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-diagnostics Working group: Diagnostics
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Poor recovery from pub let x = ... Provide a better error when code is put outside of a function