Rollup merge of #68740 - JohnTitor:do-not-sugg-underscore, r=Centril

Do not suggest things named underscore

Fixes #68719

r? @estebank
This commit is contained in:
Yuki Okushi 2020-02-02 08:30:21 +09:00 committed by GitHub
commit 87bb0c4389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 0 deletions

View File

@ -769,6 +769,11 @@ impl<'a> Resolver<'a> {
span: Span,
) -> bool {
if let Some(suggestion) = suggestion {
// We shouldn't suggest underscore.
if suggestion.candidate == kw::Underscore {
return false;
}
let msg = format!(
"{} {} with a similar name exists",
suggestion.res.article(),

View File

@ -0,0 +1,14 @@
const _: () = ();
fn main() {
a // Shouldn't suggest underscore
//~^ ERROR: cannot find value `a` in this scope
}
trait Unknown {}
#[allow(unused_imports)]
use Unknown as _;
fn foo<T: A>(x: T) {} // Shouldn't suggest underscore
//~^ ERROR: cannot find trait `A` in this scope

View File

@ -0,0 +1,16 @@
error[E0425]: cannot find value `a` in this scope
--> $DIR/typo-suggestion-named-underscore.rs:4:5
|
LL | a // Shouldn't suggest underscore
| ^ not found in this scope
error[E0405]: cannot find trait `A` in this scope
--> $DIR/typo-suggestion-named-underscore.rs:13:11
|
LL | fn foo<T: A>(x: T) {} // Shouldn't suggest underscore
| ^ not found in this scope
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0405, E0425.
For more information about an error, try `rustc --explain E0405`.