Skip to content

Commit 2172577

Browse files
compiler-errorscompiler-errors
committed
note -> help
1 parent 716ea5f commit 2172577

11 files changed

+26
-26
lines changed

‎compiler/rustc_resolve/src/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2465,7 +2465,7 @@ fn show_candidates(
24652465
msg.push_str(&candidate.0);
24662466
}
24672467

2468-
err.note(&msg);
2468+
err.help(&msg);
24692469
}
24702470
} else if !matches!(mode, DiagnosticMode::Import) {
24712471
assert!(!inaccessible_path_strings.is_empty());

‎tests/ui/empty/empty-macro-use.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
44
LL | macro_two!();
55
| ^^^^^^^^^
66
|
7-
= note: consider importing this macro:
7+
= help: consider importing this macro:
88
two_macros::macro_two
99

1010
error: aborting due to previous error

‎tests/ui/hygiene/globs.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ LL | n!(f);
5151
LL | n!(f);
5252
| ^ not found in this scope
5353
|
54-
= note: consider importing this function:
54+
= help: consider importing this function:
5555
foo::f
5656
= note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
5757

@@ -64,7 +64,7 @@ LL | n!(f);
6464
LL | f
6565
| ^ not found in this scope
6666
|
67-
= note: consider importing this function:
67+
= help: consider importing this function:
6868
foo::f
6969
= note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
7070

‎tests/ui/hygiene/no_implicit_prelude-2018.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `print` in this scope
44
LL | print!();
55
| ^^^^^
66
|
7-
= note: consider importing this macro:
7+
= help: consider importing this macro:
88
std::print
99

1010
error: aborting due to previous error

‎tests/ui/imports/bad-import-in-nested.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0432]: unresolved import `super::super::C::D::AA`
44
LL | use super::{super::C::D::AA, AA as _};
55
| ^^^^^^^^^^^^^^^ no `AA` in `C::D`
66
|
7-
= note: consider importing this type alias instead:
7+
= help: consider importing this type alias instead:
88
crate::A::AA
99

1010
error[E0432]: unresolved import `crate::C::AA`
@@ -13,7 +13,7 @@ error[E0432]: unresolved import `crate::C::AA`
1313
LL | use crate::C::{self, AA};
1414
| ^^ no `AA` in `C`
1515
|
16-
= note: consider importing this type alias instead:
16+
= help: consider importing this type alias instead:
1717
crate::A::AA
1818

1919
error[E0432]: unresolved import `crate::C::BB`
@@ -22,7 +22,7 @@ error[E0432]: unresolved import `crate::C::BB`
2222
LL | use crate::{A, C::BB};
2323
| ^^^^^ no `BB` in `C`
2424
|
25-
= note: consider importing this type alias instead:
25+
= help: consider importing this type alias instead:
2626
crate::A::BB
2727

2828
error: aborting due to 3 previous errors

‎tests/ui/macros/issue-88228.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod hey {
88

99
#[derive(Bla)]
1010
//~^ ERROR cannot find derive macro `Bla`
11-
//~| NOTE consider importing this derive macro
11+
//~| HELP consider importing this derive macro
1212
struct A;
1313

1414
#[derive(println)]
@@ -19,5 +19,5 @@ struct B;
1919
fn main() {
2020
bla!();
2121
//~^ ERROR cannot find macro `bla`
22-
//~| NOTE consider importing this macro
22+
//~| HELP consider importing this macro
2323
}

‎tests/ui/macros/issue-88228.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `bla` in this scope
44
LL | bla!();
55
| ^^^
66
|
7-
= note: consider importing this macro:
7+
= help: consider importing this macro:
88
crate::hey::bla
99

1010
error: cannot find derive macro `println` in this scope
@@ -21,7 +21,7 @@ error: cannot find derive macro `Bla` in this scope
2121
LL | #[derive(Bla)]
2222
| ^^^
2323
|
24-
= note: consider importing this derive macro:
24+
= help: consider importing this derive macro:
2525
crate::hey::Bla
2626

2727
error: aborting due to 3 previous errors

‎tests/ui/macros/macro-use-wrong-name.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | macro_two!();
99
LL | macro_rules! macro_one { () => ("one") }
1010
| ---------------------- similarly named macro `macro_one` defined here
1111
|
12-
= note: consider importing this macro:
12+
= help: consider importing this macro:
1313
two_macros::macro_two
1414

1515
error: aborting due to previous error

‎tests/ui/missing/missing-macro-use.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
44
LL | macro_two!();
55
| ^^^^^^^^^
66
|
7-
= note: consider importing this macro:
7+
= help: consider importing this macro:
88
two_macros::macro_two
99

1010
error: aborting due to previous error

‎tests/ui/proc-macro/derive-helper-shadowing.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ error: cannot find attribute `empty_helper` in this scope
1616
LL | #[derive(GenHelperUse)]
1717
| ^^^^^^^^^^^^
1818
|
19-
= note: consider importing this attribute macro:
19+
= help: consider importing this attribute macro:
2020
empty_helper
2121
= note: this error originates in the derive macro `GenHelperUse` (in Nightly builds, run with -Z macro-backtrace for more info)
2222

@@ -29,7 +29,7 @@ LL | #[empty_helper]
2929
LL | gen_helper_use!();
3030
| ----------------- in this macro invocation
3131
|
32-
= note: consider importing this attribute macro:
32+
= help: consider importing this attribute macro:
3333
crate::empty_helper
3434
= note: this error originates in the macro `gen_helper_use` (in Nightly builds, run with -Z macro-backtrace for more info)
3535

‎tests/ui/proc-macro/generate-mod.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
44
LL | generate_mod::check!();
55
| ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
66
|
7-
= note: consider importing this struct:
7+
= help: consider importing this struct:
88
FromOutside
99
= note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
1010

@@ -14,7 +14,7 @@ error[E0412]: cannot find type `Outer` in this scope
1414
LL | generate_mod::check!();
1515
| ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
1616
|
17-
= note: consider importing this struct:
17+
= help: consider importing this struct:
1818
Outer
1919
= note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
2020

@@ -24,7 +24,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
2424
LL | #[generate_mod::check_attr]
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
2626
|
27-
= note: consider importing this struct:
27+
= help: consider importing this struct:
2828
FromOutside
2929
= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
3030

@@ -34,7 +34,7 @@ error[E0412]: cannot find type `OuterAttr` in this scope
3434
LL | #[generate_mod::check_attr]
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
3636
|
37-
= note: consider importing this struct:
37+
= help: consider importing this struct:
3838
OuterAttr
3939
= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
4040

@@ -44,7 +44,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
4444
LL | #[derive(generate_mod::CheckDerive)]
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
4646
|
47-
= note: consider importing this struct:
47+
= help: consider importing this struct:
4848
FromOutside
4949
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
5050

@@ -54,7 +54,7 @@ error[E0412]: cannot find type `OuterDerive` in this scope
5454
LL | #[derive(generate_mod::CheckDerive)]
5555
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
5656
|
57-
= note: consider importing this struct:
57+
= help: consider importing this struct:
5858
OuterDerive
5959
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
6060

@@ -64,7 +64,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
6464
LL | #[derive(generate_mod::CheckDerive)]
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
6666
|
67-
= note: consider importing this struct:
67+
= help: consider importing this struct:
6868
FromOutside
6969
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
7070

@@ -74,7 +74,7 @@ error[E0412]: cannot find type `OuterDerive` in this scope
7474
LL | #[derive(generate_mod::CheckDerive)]
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
7676
|
77-
= note: consider importing this struct:
77+
= help: consider importing this struct:
7878
OuterDerive
7979
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
8080

@@ -84,7 +84,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
8484
LL | #[derive(generate_mod::CheckDeriveLint)]
8585
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
8686
|
87-
= note: consider importing this struct:
87+
= help: consider importing this struct:
8888
FromOutside
8989
= note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info)
9090

@@ -94,7 +94,7 @@ error[E0412]: cannot find type `OuterDeriveLint` in this scope
9494
LL | #[derive(generate_mod::CheckDeriveLint)]
9595
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
9696
|
97-
= note: consider importing this struct:
97+
= help: consider importing this struct:
9898
OuterDeriveLint
9999
= note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info)
100100

0 commit comments

Comments
 (0)