Skip to content
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

Tweak output of resolve errors #126810

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Tweak output of resolve errors #126810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86f8aae
Remove redundancy in resolve error between main message and primary l…
estebank Jun 21, 2024
3abad14
Unify output of the different "cannot find X" errors
estebank Jun 26, 2024
5f47d1f
revert wording changes to main message
estebank Jun 28, 2024
ec83028
More accurate description of unresolved imported item
estebank Jul 1, 2024
de92cd4
Account for `_` in import paths
estebank Jul 2, 2024
045e8dd
Fix miri test
estebank Jul 2, 2024
a9fe7c8
fix windows test
estebank Jul 2, 2024
f0d9e3f
Add scope context to unresolved macros
estebank Jul 2, 2024
e1fed5f
Fix ui-fulldeps test
estebank Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix ui-fulldeps test
  • Loading branch information
@estebank
estebank committed Jul 11, 2024
commit e1fed5fabcdf4e3b13a28223fe848044ce794539
36 changes: 18 additions & 18 deletions tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,68 +542,68 @@ error[E0433]: cannot find item `core` in the crate root
LL | #[suggestion(code = 3)]
| ^ you might be missing a crate named `core`

error: cannot find attribute `nonsense` in this scope
error: cannot find attribute `nonsense` in the crate root
--> $DIR/diagnostic-derive.rs:63:3
|
LL | #[nonsense(no_crate_example, code = E0123)]
| ^^^^^^^^ not found in this scope
| ^^^^^^^^ not found in the crate root

error: cannot find attribute `nonsense` in this scope
error: cannot find attribute `nonsense` in the crate root
--> $DIR/diagnostic-derive.rs:150:7
|
LL | #[nonsense]
| ^^^^^^^^ not found in this scope
| ^^^^^^^^ not found in the crate root

error: cannot find attribute `error` in this scope
error: cannot find attribute `error` in the crate root
--> $DIR/diagnostic-derive.rs:583:3
|
LL | #[error(no_crate_example, code = E0123)]
| ^^^^^ not found in this scope
| ^^^^^ not found in the crate root

error: cannot find attribute `warn_` in this scope
error: cannot find attribute `warn_` in the crate root
--> $DIR/diagnostic-derive.rs:590:3
|
LL | #[warn_(no_crate_example, code = E0123)]
| ^^^^^
| |
| not found in this scope
| not found in the crate root
| help: a built-in attribute with a similar name exists: `warn`

error: cannot find attribute `lint` in this scope
error: cannot find attribute `lint` in the crate root
--> $DIR/diagnostic-derive.rs:597:3
|
LL | #[lint(no_crate_example, code = E0123)]
| ^^^^
| |
| not found in this scope
| not found in the crate root
| help: a built-in attribute with a similar name exists: `link`

error: cannot find attribute `lint` in this scope
error: cannot find attribute `lint` in the crate root
--> $DIR/diagnostic-derive.rs:604:3
|
LL | #[lint(no_crate_example, code = E0123)]
| ^^^^
| |
| not found in this scope
| not found in the crate root
| help: a built-in attribute with a similar name exists: `link`

error: cannot find attribute `multipart_suggestion` in this scope
error: cannot find attribute `multipart_suggestion` in the crate root
--> $DIR/diagnostic-derive.rs:644:3
|
LL | #[multipart_suggestion(no_crate_suggestion)]
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root

error: cannot find attribute `multipart_suggestion` in this scope
error: cannot find attribute `multipart_suggestion` in the crate root
--> $DIR/diagnostic-derive.rs:647:3
|
LL | #[multipart_suggestion()]
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root

error: cannot find attribute `multipart_suggestion` in this scope
error: cannot find attribute `multipart_suggestion` in the crate root
--> $DIR/diagnostic-derive.rs:651:7
|
LL | #[multipart_suggestion(no_crate_suggestion)]
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root

error[E0425]: cannot find value `nonsense` in module `crate::fluent_generated`
--> $DIR/diagnostic-derive.rs:75:8
Expand Down
20 changes: 10 additions & 10 deletions tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct D {
#[foo]
//~^ ERROR `#[foo]` is not a valid attribute
//~| ERROR cannot find attribute `foo`
//~| NOTE not found in this scope
//~| NOTE not found in
struct E {
#[primary_span]
span: Span,
Expand Down Expand Up @@ -164,7 +164,7 @@ struct O {
#[foo]
//~^ ERROR cannot find attribute `foo`
//~| ERROR unsupported type attribute for subdiagnostic enum
//~| NOTE not found in this scope
//~| NOTE not found in
enum P {
#[label(no_crate_example)]
A {
Expand All @@ -179,7 +179,7 @@ enum Q {
#[bar]
//~^ ERROR `#[bar]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
A {
#[primary_span]
span: Span,
Expand All @@ -192,7 +192,7 @@ enum R {
#[bar = "..."]
//~^ ERROR `#[bar = ...]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
A {
#[primary_span]
span: Span,
Expand All @@ -205,7 +205,7 @@ enum S {
#[bar = 4]
//~^ ERROR `#[bar = ...]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
A {
#[primary_span]
span: Span,
Expand All @@ -218,7 +218,7 @@ enum T {
#[bar("...")]
//~^ ERROR `#[bar(...)]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
A {
#[primary_span]
span: Span,
Expand Down Expand Up @@ -280,7 +280,7 @@ struct Y {
#[bar]
//~^ ERROR `#[bar]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
bar: String,
}

Expand All @@ -292,7 +292,7 @@ struct Z {
#[bar = "..."]
//~^ ERROR `#[bar = ...]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
bar: String,
}

Expand All @@ -304,7 +304,7 @@ struct AA {
#[bar("...")]
//~^ ERROR `#[bar(...)]` is not a valid attribute
//~| ERROR cannot find attribute `bar`
//~| NOTE not found in this scope
//~| NOTE not found in
bar: String,
}

Expand Down Expand Up @@ -723,7 +723,7 @@ struct BP {
#[derive(Subdiagnostic)]
//~^ ERROR cannot find value `__code_29`
//~| NOTE in this expansion
//~| NOTE not found in this scope
//~| NOTE not found in
#[multipart_suggestion(no_crate_example)]
struct BQ {
#[suggestion_part(code = 3)]
Expand Down
36 changes: 18 additions & 18 deletions tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,59 +499,59 @@ error[E0433]: cannot find item `core` in the crate root
LL | #[suggestion(no_crate_example, code = "", style("foo"))]
| ^ you might be missing a crate named `core`

error: cannot find attribute `foo` in this scope
error: cannot find attribute `foo` in the crate root
--> $DIR/subdiagnostic-derive.rs:67:3
|
LL | #[foo]
| ^^^ not found in this scope
| ^^^ not found in the crate root

error: cannot find attribute `foo` in this scope
error: cannot find attribute `foo` in the crate root
--> $DIR/subdiagnostic-derive.rs:164:3
|
LL | #[foo]
| ^^^ not found in this scope
| ^^^ not found in the crate root

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in enum `Q`
--> $DIR/subdiagnostic-derive.rs:179:7
|
LL | #[bar]
| ^^^ not found in this scope
| ^^^ not found in enum `Q`

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in enum `R`
--> $DIR/subdiagnostic-derive.rs:192:7
|
LL | #[bar = "..."]
| ^^^ not found in this scope
| ^^^ not found in enum `R`

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in enum `S`
--> $DIR/subdiagnostic-derive.rs:205:7
|
LL | #[bar = 4]
| ^^^ not found in this scope
| ^^^ not found in enum `S`

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in enum `T`
--> $DIR/subdiagnostic-derive.rs:218:7
|
LL | #[bar("...")]
| ^^^ not found in this scope
| ^^^ not found in enum `T`

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in the crate root
--> $DIR/subdiagnostic-derive.rs:280:7
|
LL | #[bar]
| ^^^ not found in this scope
| ^^^ not found in the crate root

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in the crate root
--> $DIR/subdiagnostic-derive.rs:292:7
|
LL | #[bar = "..."]
| ^^^ not found in this scope
| ^^^ not found in the crate root

error: cannot find attribute `bar` in this scope
error: cannot find attribute `bar` in the crate root
--> $DIR/subdiagnostic-derive.rs:304:7
|
LL | #[bar("...")]
| ^^^ not found in this scope
| ^^^ not found in the crate root

error[E0425]: cannot find value `slug` in module `crate::fluent_generated`
--> $DIR/subdiagnostic-derive.rs:127:9
Expand Down
Loading