Add suggestions for possible missing `fn`, `struct`, or `enum` keywords by trevyn · Pull Request #127419 · rust-lang/rust

trevyn · 2024-07-06T10:18:51Z

rustbot · 2024-07-06T10:18:58Z

rustbot has assigned @fee1-dead.
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/rustc_parse/src/parser/diagnostics.rs

trevyn · 2024-07-07T12:27:38Z

@rustbot ready

fee1-dead

Thanks for addressing the comments! The approach looks a lot better now. Had a couple more nits.

fee1-dead · 2024-07-07T13:58:49Z

compiler/rustc_parse/src/parser/item.rs

+            if self.look_ahead(1, |t| *t == token::CloseDelim(Delimiter::Brace))
+                || self.look_ahead(2, |t| *t == token::Colon)
+                || self.look_ahead(3, |t| *t == token::Colon)


Comment here justifying the lookaheads. Otherwise this is a bit confusing.

fee1-dead · 2024-07-07T13:59:16Z

compiler/rustc_parse/src/parser/item.rs

-            // possible public struct definition where `struct` was forgotten
-            Some(errors::MissingKeywordForItemDefinition::Struct { span: sp, ident })
+            // possible struct or enum definition where `struct` or `enum` was forgotten
+            if self.look_ahead(1, |t| *t == token::CloseDelim(Delimiter::Brace))


It could be either struct or enum when the brace closes without anything inside, so we shouldn't just suggest struct

fee1-dead · 2024-07-07T14:05:19Z

compiler/rustc_parse/src/parser/item.rs

-        let full_sp = self.prev_token.span.to(self.token.span);
+        let is_pub = self.prev_token.is_keyword(kw::Pub);
+        let is_const = self.prev_token.is_keyword(kw::Const);
+        let sp = self.token.span.shrink_to_lo();


The span here is a bit suboptimal here. If there was a pub, we should use the span for pub foo (both tokens) in pub foo() {}. If there is no pub, I think it makes sense for us to just use the span for the identifier instead of shrinking.

As for the suggestion, I'm pretty sure you can use a separate (shrunk) span for the suggested snippet to replace.

trevyn · 2024-07-08T07:12:26Z

@rustbot ready

fee1-dead

LGTM, thanks!

fee1-dead · 2024-07-10T06:40:50Z

@bors r+

bors · 2024-07-10T06:40:52Z

📌 Commit b40adc9 has been approved by fee1-dead

It is now in the queue for this repository.

bors · 2024-07-10T18:27:35Z

⌛ Testing commit b40adc9 with merge 0c81f94...

bors · 2024-07-10T20:41:41Z

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 0c81f94 to master...

rust-timer · 2024-07-10T22:04:55Z

Finished benchmarking commit (0c81f94): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.5%	[-2.8%, -0.3%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.9%	[-3.9%, -3.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.9%	[-3.9%, -3.9%]	1

Cycles

Results (primary -6.9%, secondary -3.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-6.9%	[-6.9%, -6.9%]	1
Improvements ✅ (secondary)	-3.1%	[-3.4%, -2.8%]	3
All ❌✅ (primary)	-6.9%	[-6.9%, -6.9%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 704.203s -> 704.958s (0.11%)
Artifact size: 328.70 MiB -> 328.69 MiB (-0.00%)

rustbot assigned fee1-dead Jul 6, 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 Jul 6, 2024

compiler-errors suggested changes Jul 6, 2024

View reviewed changes

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

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

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

trevyn requested a review from compiler-errors July 6, 2024 20:09

fee1-dead requested changes Jul 7, 2024

View reviewed changes

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

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

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

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 Jul 7, 2024

fee1-dead removed the request for review from compiler-errors July 7, 2024 11:05

trevyn force-pushed the issue-125446 branch from ed4fcc3 to 5a3ac50 Compare July 7, 2024 11:25

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 Jul 7, 2024

fee1-dead requested changes Jul 7, 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 Jul 7, 2024

Add suggestions for possible missing fn, struct, or enum keywords

b40adc9

trevyn force-pushed the issue-125446 branch from 5a3ac50 to b40adc9 Compare July 8, 2024 06:09

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 Jul 8, 2024

fee1-dead approved these changes Jul 10, 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 Jul 10, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 10, 2024

bors merged commit 0c81f94 into rust-lang:master Jul 10, 2024

rustbot added this to the 1.81.0 milestone Jul 10, 2024

bors mentioned this pull request Jul 10, 2024

Make parse error suggestions verbose and fix spans #127407

Merged

matthiaskrgr mentioned this pull request Jul 11, 2024

ICE: parse_expected_identifier_found_str #127600

Closed

Uh oh!

Conversation

trevyn commented Jul 6, 2024

Uh oh!

rustbot commented Jul 6, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trevyn commented Jul 7, 2024

Uh oh!

fee1-dead left a comment

Choose a reason for hiding this comment

Uh oh!

fee1-dead Jul 7, 2024

Choose a reason for hiding this comment

Uh oh!

fee1-dead Jul 7, 2024

Choose a reason for hiding this comment

Uh oh!

fee1-dead Jul 7, 2024

Choose a reason for hiding this comment

Uh oh!

trevyn commented Jul 8, 2024

Uh oh!

fee1-dead left a comment

Choose a reason for hiding this comment

Uh oh!

fee1-dead commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

rust-timer commented Jul 10, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants