Add explanatory note to 'expected item' error #115473

gurry · 2023-09-02T09:15:19Z

It changes the diagnostic from this:

error: expected item, found `5`
 --> ../test.rs:1:1
  |
1 | 5
  | ^ expected item

to this:

error: expected item, found `5`
 --> ../test.rs:1:1
  |
1 | 5
  | ^ expected item
  |
  = note: items are things that can appear at the root of a module
  = note: for a full list see https://doc.rust-lang.org/reference/items.html

rustbot · 2023-09-02T09:15:26Z

r? @nnethercote

(rustbot has picked a reviewer for you, use r? to override)

gurry · 2023-09-02T09:25:45Z

@rustbot label -S-waiting-on-review +S-waiting-on-author

gurry · 2023-09-03T03:14:32Z

r? @workingjubilee

gurry · 2023-09-03T08:31:54Z

@rustbot review

gurry · 2023-09-05T12:31:28Z

r? @compiler-errors

compiler-errors · 2023-09-05T21:27:24Z

@gurry: please be patient when awaiting a review in the future. no need to reassign twice in 4 days -- if it's been longer than a week or if there's some reason to believe the reviewer is inactive, then you can reassign the reviewer.

@bors r+ rollup

bors · 2023-09-05T21:27:26Z

📌 Commit 691362831f96dc14213e95f420a625d2dcd4a35a has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2023-09-05T21:27:46Z

actually wait i'm not totally satisfied with the phrasing

@bors r-

compiler-errors · 2023-09-05T21:28:31Z

compiler/rustc_parse/src/parser/item.rs

                } else {
-                    "expected item"
+                    err.span_label(span, "expected item")
+                        .note("items are things that can appear at the root of a module")


Suggested change

.note("items are things that can appear at the root of a module")

.note("items are declarations that can appear at the root of a module")

compiler-errors · 2023-09-05T21:30:50Z

compiler/rustc_parse/src/parser/item.rs

+                        .note("items are things that can appear at the root of a module")
+                        .note("for a full list see https://doc.rust-lang.org/reference/items.html");


or maybe we should just consolidate this into one note:

Suggested change

.note("items are things that can appear at the root of a module")

.note("for a full list see https://doc.rust-lang.org/reference/items.html");

.note("for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>");

Let me make this change, update tests and push.

gurry · 2023-09-06T01:05:01Z

@gurry: please be patient when awaiting a review in the future. no need to reassign twice in 4 days -- if it's been longer than a week or if there's some reason to believe the reviewer is inactive, then you can reassign the reviewer.

@bors r+ rollup

Sorry, I'll be more patient in the future.

gurry · 2023-09-06T04:44:07Z

@rustbot review

compiler-errors · 2023-09-06T05:39:48Z

@bors r+ rollup

bors · 2023-09-06T05:39:50Z

📌 Commit 6a286e7 has been approved by compiler-errors

It is now in the queue for this repository.

…iler-errors Add explanatory note to 'expected item' error Fixes rust-lang#113110 It changes the diagnostic from this: ``` error: expected item, found `5` --> ../test.rs:1:1 | 1 | 5 | ^ expected item ``` to this: ``` error: expected item, found `5` --> ../test.rs:1:1 | 1 | 5 | ^ expected item | = note: items are things that can appear at the root of a module = note: for a full list see https://doc.rust-lang.org/reference/items.html ```

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#114511 (Remove the unhelpful let binding diag comes from FormatArguments) - rust-lang#115473 (Add explanatory note to 'expected item' error) - rust-lang#115574 (Replace `rustc_data_structures` dependency with `rustc_index` in `rustc_parse_format`) - rust-lang#115578 (Clarify cryptic comments) - rust-lang#115587 (fix rust-lang#115348) - rust-lang#115596 (A small change) - rust-lang#115598 (Fix log formatting in bootstrap) - rust-lang#115605 (Better Debug for `Ty` in smir) - rust-lang#115614 (Fix minor grammar typo) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned nnethercote Sep 2, 2023

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 Sep 2, 2023

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 Sep 2, 2023

This comment has been minimized.

Sign in to view

gurry force-pushed the 113110-expected-item branch 2 times, most recently from 17fd171 to 70e22f4 Compare September 2, 2023 11:14

This comment has been minimized.

Sign in to view

gurry force-pushed the 113110-expected-item branch from 70e22f4 to c32c6a1 Compare September 2, 2023 12:09

This comment has been minimized.

Sign in to view

gurry force-pushed the 113110-expected-item branch from c32c6a1 to 6913628 Compare September 3, 2023 02:45

gurry marked this pull request as ready for review September 3, 2023 02:54

rustbot assigned workingjubilee and unassigned nnethercote Sep 3, 2023

gurry mentioned this pull request Sep 3, 2023

explain what an item is when invalid code is placed at the module-level #113110

Closed

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 Sep 3, 2023

sam0x17 approved these changes Sep 3, 2023

View reviewed changes

rustbot assigned compiler-errors and unassigned workingjubilee Sep 5, 2023

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 Sep 5, 2023

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 5, 2023

compiler-errors reviewed Sep 5, 2023

View reviewed changes

Add explanatory note to 'expected item' error

6a286e7

gurry force-pushed the 113110-expected-item branch from 6913628 to 6a286e7 Compare September 6, 2023 04:41

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 Sep 6, 2023

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 Sep 6, 2023

fmease mentioned this pull request Sep 6, 2023

Rollup of 8 pull requests #115606

Closed

sam0x17 approved these changes Sep 6, 2023

View reviewed changes

matthiaskrgr mentioned this pull request Sep 6, 2023

Rollup of 9 pull requests #115615

Merged

bors merged commit 4a31cc8 into rust-lang:master Sep 6, 2023

rustbot added this to the 1.74.0 milestone Sep 6, 2023

gurry deleted the 113110-expected-item branch September 13, 2023 04:03

	.note("items are things that can appear at the root of a module")
	.note("items are declarations that can appear at the root of a module")

		.note("items are things that can appear at the root of a module")
		.note("for a full list see https://doc.rust-lang.org/reference/items.html");

	.note("items are things that can appear at the root of a module")
	.note("for a full list see https://doc.rust-lang.org/reference/items.html");
	.note("for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>");

Add explanatory note to 'expected item' error #115473

Add explanatory note to 'expected item' error #115473

Uh oh!

Conversation

gurry commented Sep 2, 2023

Uh oh!

rustbot commented Sep 2, 2023

Uh oh!

gurry commented Sep 2, 2023

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

gurry commented Sep 3, 2023

Uh oh!

gurry commented Sep 3, 2023

Uh oh!

gurry commented Sep 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Sep 5, 2023

Uh oh!

bors commented Sep 5, 2023

Uh oh!

compiler-errors commented Sep 5, 2023

Uh oh!

compiler-errors Sep 5, 2023

Choose a reason for hiding this comment

Uh oh!

compiler-errors Sep 5, 2023

Choose a reason for hiding this comment

Uh oh!

gurry Sep 6, 2023

Choose a reason for hiding this comment

Uh oh!

gurry commented Sep 6, 2023

Uh oh!

gurry commented Sep 6, 2023

Uh oh!

compiler-errors commented Sep 6, 2023

Uh oh!

bors commented Sep 6, 2023

Uh oh!

Uh oh!

gurry commented Sep 5, 2023 •

edited

Loading