bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

note -> help

Browse source
This commit is contained in:
Michael Goulet 2023-01-17 03:09:49 +00:00
parent 716ea5f19c
commit 21725774a2
11 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -2465,7 +2465,7 @@ fn show_candidates(
msg.push_str(&candidate.0); msg.push_str(&candidate.0);
} }
err.note(&msg); err.help(&msg);
} }
} else if !matches!(mode, DiagnosticMode::Import) { } else if !matches!(mode, DiagnosticMode::Import) {
assert!(!inaccessible_path_strings.is_empty()); assert!(!inaccessible_path_strings.is_empty());

2
tests/ui/empty/empty-macro-use.stderr
View file

@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
LL | macro_two!(); LL | macro_two!();
| ^^^^^^^^^ | ^^^^^^^^^
| |
= note: consider importing this macro: = help: consider importing this macro:
two_macros::macro_two two_macros::macro_two
error: aborting due to previous error error: aborting due to previous error

4
tests/ui/hygiene/globs.stderr
View file

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

2
tests/ui/hygiene/no_implicit_prelude-2018.stderr
View file

@ -4,7 +4,7 @@ error: cannot find macro `print` in this scope
LL | print!(); LL | print!();
| ^^^^^ | ^^^^^
| |
= note: consider importing this macro: = help: consider importing this macro:
std::print std::print
error: aborting due to previous error error: aborting due to previous error

6
tests/ui/imports/bad-import-in-nested.stderr
View file

@ -4,7 +4,7 @@ error[E0432]: unresolved import `super::super::C::D::AA`
LL | use super::{super::C::D::AA, AA as _}; LL | use super::{super::C::D::AA, AA as _};
| ^^^^^^^^^^^^^^^ no `AA` in `C::D` | ^^^^^^^^^^^^^^^ no `AA` in `C::D`
| |
= note: consider importing this type alias instead: = help: consider importing this type alias instead:
crate::A::AA crate::A::AA
error[E0432]: unresolved import `crate::C::AA` error[E0432]: unresolved import `crate::C::AA`
@ -13,7 +13,7 @@ error[E0432]: unresolved import `crate::C::AA`
LL | use crate::C::{self, AA}; LL | use crate::C::{self, AA};
| ^^ no `AA` in `C` | ^^ no `AA` in `C`
| |
= note: consider importing this type alias instead: = help: consider importing this type alias instead:
crate::A::AA crate::A::AA
error[E0432]: unresolved import `crate::C::BB` error[E0432]: unresolved import `crate::C::BB`
@ -22,7 +22,7 @@ error[E0432]: unresolved import `crate::C::BB`
LL | use crate::{A, C::BB}; LL | use crate::{A, C::BB};
| ^^^^^ no `BB` in `C` | ^^^^^ no `BB` in `C`
| |
= note: consider importing this type alias instead: = help: consider importing this type alias instead:
crate::A::BB crate::A::BB
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

4
tests/ui/macros/issue-88228.rs
View file

@ -8,7 +8,7 @@ mod hey {
#[derive(Bla)] #[derive(Bla)]
//~^ ERROR cannot find derive macro `Bla` //~^ ERROR cannot find derive macro `Bla`
//~| NOTE consider importing this derive macro //~| HELP consider importing this derive macro
struct A; struct A;
#[derive(println)] #[derive(println)]
@ -19,5 +19,5 @@ struct B;
fn main() { fn main() {
bla!(); bla!();
//~^ ERROR cannot find macro `bla` //~^ ERROR cannot find macro `bla`
//~| NOTE consider importing this macro //~| HELP consider importing this macro
} }

4
tests/ui/macros/issue-88228.stderr
View file

@ -4,7 +4,7 @@ error: cannot find macro `bla` in this scope
LL | bla!(); LL | bla!();
| ^^^ | ^^^
| |
= note: consider importing this macro: = help: consider importing this macro:
crate::hey::bla crate::hey::bla
error: cannot find derive macro `println` in this scope error: cannot find derive macro `println` in this scope
@ -21,7 +21,7 @@ error: cannot find derive macro `Bla` in this scope
LL | #[derive(Bla)] LL | #[derive(Bla)]
| ^^^ | ^^^
| |
= note: consider importing this derive macro: = help: consider importing this derive macro:
crate::hey::Bla crate::hey::Bla
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

2
tests/ui/macros/macro-use-wrong-name.stderr
View file

@ -9,7 +9,7 @@ LL | macro_two!();
LL | macro_rules! macro_one { () => ("one") } LL | macro_rules! macro_one { () => ("one") }
| ---------------------- similarly named macro `macro_one` defined here | ---------------------- similarly named macro `macro_one` defined here
| |
= note: consider importing this macro: = help: consider importing this macro:
two_macros::macro_two two_macros::macro_two
error: aborting due to previous error error: aborting due to previous error

2
tests/ui/missing/missing-macro-use.stderr
View file

@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
LL | macro_two!(); LL | macro_two!();
| ^^^^^^^^^ | ^^^^^^^^^
| |
= note: consider importing this macro: = help: consider importing this macro:
two_macros::macro_two two_macros::macro_two
error: aborting due to previous error error: aborting due to previous error

4
tests/ui/proc-macro/derive-helper-shadowing.stderr
View file

@ -16,7 +16,7 @@ error: cannot find attribute `empty_helper` in this scope
LL | #[derive(GenHelperUse)] LL | #[derive(GenHelperUse)]
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
| |
= note: consider importing this attribute macro: = help: consider importing this attribute macro:
empty_helper empty_helper
= note: this error originates in the derive macro `GenHelperUse` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `GenHelperUse` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -29,7 +29,7 @@ LL | #[empty_helper]
LL | gen_helper_use!(); LL | gen_helper_use!();
| ----------------- in this macro invocation | ----------------- in this macro invocation
| |
= note: consider importing this attribute macro: = help: consider importing this attribute macro:
crate::empty_helper crate::empty_helper
= note: this error originates in the macro `gen_helper_use` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the macro `gen_helper_use` (in Nightly builds, run with -Z macro-backtrace for more info)

20
tests/ui/proc-macro/generate-mod.stderr
View file

@ -4,7 +4,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
LL | generate_mod::check!(); LL | generate_mod::check!();
| ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
FromOutside FromOutside
= note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -14,7 +14,7 @@ error[E0412]: cannot find type `Outer` in this scope
LL | generate_mod::check!(); LL | generate_mod::check!();
| ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
Outer Outer
= note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -24,7 +24,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
LL | #[generate_mod::check_attr] LL | #[generate_mod::check_attr]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
FromOutside FromOutside
= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -34,7 +34,7 @@ error[E0412]: cannot find type `OuterAttr` in this scope
LL | #[generate_mod::check_attr] LL | #[generate_mod::check_attr]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
OuterAttr OuterAttr
= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -44,7 +44,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
LL | #[derive(generate_mod::CheckDerive)] LL | #[derive(generate_mod::CheckDerive)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
FromOutside FromOutside
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -54,7 +54,7 @@ error[E0412]: cannot find type `OuterDerive` in this scope
LL | #[derive(generate_mod::CheckDerive)] LL | #[derive(generate_mod::CheckDerive)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
OuterDerive OuterDerive
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -64,7 +64,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
LL | #[derive(generate_mod::CheckDerive)] LL | #[derive(generate_mod::CheckDerive)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
FromOutside FromOutside
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -74,7 +74,7 @@ error[E0412]: cannot find type `OuterDerive` in this scope
LL | #[derive(generate_mod::CheckDerive)] LL | #[derive(generate_mod::CheckDerive)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
OuterDerive OuterDerive
= note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDerive` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -84,7 +84,7 @@ error[E0412]: cannot find type `FromOutside` in this scope
LL | #[derive(generate_mod::CheckDeriveLint)] LL | #[derive(generate_mod::CheckDeriveLint)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
FromOutside FromOutside
= note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info)
@ -94,7 +94,7 @@ error[E0412]: cannot find type `OuterDeriveLint` in this scope
LL | #[derive(generate_mod::CheckDeriveLint)] LL | #[derive(generate_mod::CheckDeriveLint)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
| |
= note: consider importing this struct: = help: consider importing this struct:
OuterDeriveLint OuterDeriveLint
= note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the derive macro `generate_mod::CheckDeriveLint` (in Nightly builds, run with -Z macro-backtrace for more info)