Improve parser diagnostics by terrarier2111 · Pull Request #95211 · rust-lang/rust

terrarier2111 · 2022-03-22T16:20:43Z

This pr fixes#93867 and contains a couple of diagnostics related changes to the parser.
Here is a short list with some of the changes:

don't suggest the same thing that is the current token
suggest removing the current token if the following token is one of the suggestions (maybe incorrect)
tell the user to put a type or lifetime after where if there is none (as a warning)
reduce the amount of tokens suggested (via the new eat_noexpect and check_noexpect methods)

If any of these changes are undesirable, i can remove them, thanks!

rust-highfive · 2022-03-22T16:26:46Z

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

terrarier2111 · 2022-03-22T16:43:49Z

r? @compiler-errors

could you take a look at this cuz i took some inspiration from your comments and you seemed to be interested in smth like this as well?

compiler-errors · 2022-03-22T16:45:17Z

I cannot r+ this (and hence high-five bot didn't assign me), but I will certainly take a look!

compiler-errors · 2022-03-22T16:57:20Z

lol, nvm, highfive-bot does not care about bors permissions apparently. anywho, I cannot approve this for you, so I will reassign this to someone who can. I will try to give it a review though!

r? rust-lang/compiler

jackh726 · 2022-03-22T17:15:09Z

@bors delegate=compiler-errors

@compiler-errors if you want to review this, go for it (I'll try to look at this regardless later today)

bors · 2022-03-22T17:33:35Z

✌️ @compiler-errors can now approve this pull request

compiler-errors

I am concerned with a regression in parsing fn foo() where {}. Also left a few other comments.

compiler-errors · 2022-03-22T17:39:23Z

It is somewhat misleading to call this a "token"

What name would you suggest, i am willing to adjust this

Can you special-case this for certain tokens?
Also, not sure if the suggestion to remove a comment is useful here, since comments are usually intentionally placed. This one might be better fixed with a separate suggestion.

Can you special-case this for certain tokens?
Also, not sure if the suggestion to remove a comment is useful here, since comments are usually intentionally placed. This one might be better fixed with a separate suggestion.
Oh, yea i can special case different token kinds and i can ignore comments i think

Okay, so i made it vary based on the kind of token

terrarier2111 · 2022-03-22T17:59:22Z

I am concerned with a regression in parsing fn foo() where {}. Also left a few other comments.

I fixed this regression by downgrading the diagnostic from an error to a warning

compiler-errors · 2022-03-22T20:39:21Z

@terrarier2111, is it too much work to split this up into several commits? We might want to land some of these diagnostics separately, possibly so it's easier to git-bisect later on, and because they are varying levels of opinionated. Or at least, several commits might be easier to review. For example, I could see the _noexpect changes landing immediately, but the remove token help might need some refining.

compiler-errors · 2022-03-22T19:17:15Z

Do you mind leaving comments explaining what this logic is checking for? Also, perhaps using return might help tighten some of the if-else blocks.

I left some comments there and used returns, do the comments suffice?

terrarier2111 · 2022-03-24T15:22:24Z

@terrarier2111, is it too much work to split this up into several commits? We might want to land some of these diagnostics separately, possibly so it's easier to git-bisect later on, and because they are varying levels of opinionated. Or at least, several commits might be easier to review. For example, I could see the _noexpect changes landing immediately, but the remove token help might need some refining.

Do you mean splitting these commits in different prs or just having multiple commits in this pr?

bors · 2022-03-27T21:38:36Z

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

compiler-errors

Sorry for taking some time to get back to this. I have a couple of comments.

compiler-errors · 2022-05-13T14:52:43Z

can you double check if the parser has other self.token == use cases that can be turned into check_noexpect?

I don't think that i am able to do that as from what I was able to see that would require a decent amount of work and I just wanted to finish up the changes in this pr.

compiler-errors · 2022-06-06T17:55:05Z

@terrarier2111, heads up that PRs should not include merge commits: https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy

terrarier2111 · 2022-06-06T19:30:35Z

@compiler-errors Yea, i know i wanted to finish this later

compiler-errors · 2022-06-06T19:40:34Z

Heads up that you messed up the commit log I think: https://github.com/rust-lang/rust/pull/95211/commits

terrarier2111 · 2022-06-06T19:44:09Z

Heads up that you messed up the commit log I think: https://github.com/rust-lang/rust/pull/95211/commits

Oh.. yea how could I solve this problem?

compiler-errors · 2022-06-06T20:03:47Z

perhaps git pull --rebase origin master (where origin is whatever remote you've set up for rust-lang/rust, not your personal fork) -- please also make sure the changes you've made in cf7e08607c580bd130a27adc0a7700e333f3e92b didn't get lost as well.

terrarier2111 · 2022-06-06T20:09:52Z

Okay, well so i tried fixing it and actually made it worse :c
I think the issue is that i did "git push origin +MY_BRANCH" instead of "git push origin +master" because the master version didn't work for some reason

compiler-errors · 2022-06-06T20:54:28Z

I'm not sure if I can help -- I'm not familiar with the git push +branch syntax. Perhaps reset your branch and cherry-pick your specific commits? No idea.

terrarier2111 · 2022-06-13T11:54:48Z

@compiler-errors do I have to do anything else for this to be good to go?

compiler-errors · 2022-06-13T18:13:25Z

This looks fine enough to merge now. Maybe we actually don't need the noexpect methods, but those are easy to remove.

@bors r+

bors · 2022-06-13T18:13:27Z

📌 Commit 21fdd54 has been approved by compiler-errors

Rollup of 4 pull requests Successful merges: - rust-lang#95211 (Improve parser diagnostics) - rust-lang#95243 (Add Apple WatchOS compile targets) - rust-lang#97385 (Add WIP stable MIR crate) - rust-lang#97508 (Harden bad placeholder checks on statics/consts) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

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

rust-highfive assigned matthewjasper Mar 22, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2022

terrarier2111 force-pushed the improve-parser branch 2 times, most recently from aa01a0b to 3f8fdb7Compare March 22, 2022 16:32

terrarier2111 changed the title ~~Improves parser diagnostics, fixes #93867~~Improve parser diagnosticsMar 22, 2022

rust-highfive assigned compiler-errors and unassigned matthewjasper Mar 22, 2022

rust-highfive assigned jackh726 and unassigned compiler-errors Mar 22, 2022

terrarier2111 force-pushed the improve-parser branch from 7bd0c28 to 2ae9da9Compare March 22, 2022 17:50

compiler-errors suggested changes Mar 22, 2022
View reviewed changes

terrarier2111 force-pushed the improve-parser branch 2 times, most recently from e57b61b to 0839c08Compare March 22, 2022 18:59

This comment has been minimized.
Sign in to view

compiler-errors reviewed Mar 22, 2022
View reviewed changes

notriddle reviewed Mar 22, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/generics.rs Outdated

notriddle reviewed Mar 22, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

terrarier2111 force-pushed the improve-parser branch from 5f29e26 to a1df86eCompare March 26, 2022 09:30

This comment has been minimized.
Sign in to view

compiler-errors reviewed May 9, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/expr.rs Outdated

terrarier2111 force-pushed the improve-parser branch from d5e2166 to 637ce71Compare May 12, 2022 15:23

compiler-errors reviewed May 13, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/path.rs Outdated

compiler-errors reviewed May 13, 2022
View reviewed changes

compiler-errors 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 Jun 6, 2022

terrarier2111 force-pushed the improve-parser branch 2 times, most recently from 7a47722 to 70589baCompare June 6, 2022 19:37

terrarier2111 force-pushed the improve-parser branch from 70589ba to 2fd7808Compare June 6, 2022 20:07

terrarier2111 force-pushed the improve-parser branch from 2fd7808 to c88e4fbCompare June 12, 2022 15:25

klensy reviewed Jun 12, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

klensy reviewed Jun 12, 2022
View reviewed changes

Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated

Improves parser diagnostics,fixesrust-lang#93867
21fdd54

terrarier2111 force-pushed the improve-parser branch from ecbeac0 to 21fdd54Compare June 12, 2022 15:49

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 13, 2022

JohnTitor mentioned this pull request Jun 13, 2022
Rollup of 4 pull requests #98075
Merged

bors merged commit e3a3c00 into rust-lang:masterJun 14, 2022

rustbot added this to the 1.63.0 milestone Jun 14, 2022

Uh oh!

Uh oh!

Conversation

terrarier2111 commented Mar 22, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Mar 22, 2022

Uh oh!

terrarier2111 commented Mar 22, 2022

Uh oh!

compiler-errors commented Mar 22, 2022

Uh oh!

compiler-errors commented Mar 22, 2022

Uh oh!

jackh726 commented Mar 22, 2022

Uh oh!

bors commented Mar 22, 2022

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

compiler-errorsMar 22, 2022

Choose a reason for hiding this comment

Uh oh!

terrarier2111Mar 22, 2022

Choose a reason for hiding this comment

Uh oh!

compiler-errorsMar 22, 2022• 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!

terrarier2111Mar 22, 2022• 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!

terrarier2111Mar 22, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

terrarier2111 commented Mar 22, 2022

Uh oh!

This comment has been minimized.

compiler-errors commented Mar 22, 2022

Uh oh!

Uh oh!

compiler-errorsMar 22, 2022

Choose a reason for hiding this comment

Uh oh!

terrarier2111Mar 26, 2022• 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!

Uh oh!

terrarier2111 commented Mar 24, 2022

Uh oh!

This comment has been minimized.

bors commented Mar 27, 2022

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compiler-errorsMay 13, 2022

Choose a reason for hiding this comment

Uh oh!

terrarier2111Jun 6, 2022

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jun 6, 2022

Uh oh!

terrarier2111 commented Jun 6, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Jun 6, 2022

terrarier2111 commented Mar 22, 2022•
edited
Loading

compiler-errorsMar 22, 2022•
edited
Loading

terrarier2111Mar 22, 2022•
edited
Loading

terrarier2111Mar 26, 2022•
edited
Loading

terrarier2111 commented Jun 6, 2022•
edited
Loading