Skip to content

Commit 731f1d8

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#57477 - euclio:clarify-lev-suggestion, r=zackmdavis
clarify resolve typo suggestion Include the kind of the binding that we're suggesting, and use a structured suggestion. Fixes rust-lang#53445.
2 parents 44a41b4 + 404ad50 commit 731f1d8

40 files changed

+249
-125
lines changed

‎src/librustc/hir/def.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl Def {
284284
}
285285
}
286286

287-
/// A human readable kind name
287+
/// A human readable name for the def kind ("function", "module", etc.).
288288
pub fn kind_name(&self) -> &'static str {
289289
match *self {
290290
Def::Fn(..) => "function",
@@ -324,6 +324,7 @@ impl Def {
324324
}
325325
}
326326

327+
/// An English article for the def.
327328
pub fn article(&self) -> &'static str {
328329
match *self {
329330
Def::AssociatedTy(..) | Def::AssociatedConst(..) | Def::AssociatedExistential(..) |

‎src/librustc_resolve/lib.rs

Lines changed: 68 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,16 @@ struct BindingError {
120120
target: BTreeSet<Span>,
121121
}
122122

123+
struct TypoSuggestion {
124+
candidate: Symbol,
125+
126+
/// The kind of the binding ("crate", "module", etc.)
127+
kind: &'static str,
128+
129+
/// An appropriate article to refer to the binding ("a", "an", etc.)
130+
article: &'static str,
131+
}
132+
123133
impl PartialOrd for BindingError {
124134
fn partial_cmp(&self, other: &BindingError) -> Option<cmp::Ordering> {
125135
Some(self.cmp(other))
@@ -1448,7 +1458,7 @@ impl PrimitiveTypeTable {
14481458
}
14491459
}
14501460

1451-
#[derive(Default, Clone)]
1461+
#[derive(Debug, Default, Clone)]
14521462
pub struct ExternPreludeEntry<'a> {
14531463
extern_crate_item: Option<&'a NameBinding<'a>>,
14541464
pub introduced_by_item: bool,
@@ -3291,8 +3301,19 @@ impl<'a> Resolver<'a> {
32913301
let mut levenshtein_worked = false;
32923302

32933303
// Try Levenshtein algorithm.
3294-
if let Some(candidate) = this.lookup_typo_candidate(path, ns, is_expected, span) {
3295-
err.span_label(ident_span, format!("did you mean `{}`?", candidate));
3304+
let suggestion = this.lookup_typo_candidate(path, ns, is_expected, span);
3305+
if let Some(suggestion) = suggestion {
3306+
let msg = format!(
3307+
"{} {} with a similar name exists",
3308+
suggestion.article, suggestion.kind
3309+
);
3310+
err.span_suggestion_with_applicability(
3311+
ident_span,
3312+
&msg,
3313+
suggestion.candidate.to_string(),
3314+
Applicability::MaybeIncorrect,
3315+
);
3316+
32963317
levenshtein_worked = true;
32973318
}
32983319

@@ -4183,19 +4204,25 @@ impl<'a> Resolver<'a> {
41834204
None
41844205
}
41854206

4186-
fn lookup_typo_candidate<FilterFn>(&mut self,
4187-
path: &[Segment],
4188-
ns: Namespace,
4189-
filter_fn: FilterFn,
4190-
span: Span)
4191-
-> Option<Symbol>
4192-
where FilterFn: Fn(Def) -> bool
4207+
fn lookup_typo_candidate<FilterFn>(
4208+
&mut self,
4209+
path: &[Segment],
4210+
ns: Namespace,
4211+
filter_fn: FilterFn,
4212+
span: Span,
4213+
) -> Option<TypoSuggestion>
4214+
where
4215+
FilterFn: Fn(Def) -> bool,
41934216
{
4194-
let add_module_candidates = |module: Module, names: &mut Vec<Name>| {
4217+
let add_module_candidates = |module: Module, names: &mut Vec<TypoSuggestion>| {
41954218
for (&(ident, _), resolution) in module.resolutions.borrow().iter() {
41964219
if let Some(binding) = resolution.borrow().binding {
41974220
if filter_fn(binding.def()) {
4198-
names.push(ident.name);
4221+
names.push(TypoSuggestion {
4222+
candidate: ident.name,
4223+
article: binding.def().article(),
4224+
kind: binding.def().kind_name(),
4225+
});
41994226
}
42004227
}
42014228
}
@@ -4209,7 +4236,11 @@ impl<'a> Resolver<'a> {
42094236
// Locals and type parameters
42104237
for (ident, def) in &rib.bindings {
42114238
if filter_fn(*def) {
4212-
names.push(ident.name);
4239+
names.push(TypoSuggestion {
4240+
candidate: ident.name,
4241+
article: def.article(),
4242+
kind: def.kind_name(),
4243+
});
42134244
}
42144245
}
42154246
// Items in scope
@@ -4222,7 +4253,13 @@ impl<'a> Resolver<'a> {
42224253
} else {
42234254
// Items from the prelude
42244255
if !module.no_implicit_prelude {
4225-
names.extend(self.extern_prelude.iter().map(|(ident, _)| ident.name));
4256+
names.extend(self.extern_prelude.iter().map(|(ident, _)| {
4257+
TypoSuggestion {
4258+
candidate: ident.name,
4259+
article: "a",
4260+
kind: "crate",
4261+
}
4262+
}));
42264263
if let Some(prelude) = self.prelude {
42274264
add_module_candidates(prelude, &mut names);
42284265
}
@@ -4234,7 +4271,13 @@ impl<'a> Resolver<'a> {
42344271
// Add primitive types to the mix
42354272
if filter_fn(Def::PrimTy(Bool)) {
42364273
names.extend(
4237-
self.primitive_type_table.primitive_types.iter().map(|(name, _)| name)
4274+
self.primitive_type_table.primitive_types.iter().map(|(name, _)| {
4275+
TypoSuggestion {
4276+
candidate: *name,
4277+
article: "a",
4278+
kind: "primitive type",
4279+
}
4280+
})
42384281
)
42394282
}
42404283
} else {
@@ -4251,9 +4294,16 @@ impl<'a> Resolver<'a> {
42514294

42524295
let name = path[path.len() - 1].ident.name;
42534296
// Make sure error reporting is deterministic.
4254-
names.sort_by_cached_key(|name| name.as_str());
4255-
match find_best_match_for_name(names.iter(), &name.as_str(), None) {
4256-
Some(found) if found != name => Some(found),
4297+
names.sort_by_cached_key(|suggestion| suggestion.candidate.as_str());
4298+
4299+
match find_best_match_for_name(
4300+
names.iter().map(|suggestion| &suggestion.candidate),
4301+
&name.as_str(),
4302+
None,
4303+
) {
4304+
Some(found) if found != name => names
4305+
.into_iter()
4306+
.find(|suggestion| suggestion.candidate == found),
42574307
_ => None,
42584308
}
42594309
}

‎src/librustc_resolve/macros.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@ impl<'a> Resolver<'a> {
10151015
};
10161016
let ident = Ident::new(Symbol::intern(name), span);
10171017
self.lookup_typo_candidate(&[Segment::from_ident(ident)], MacroNS, is_macro, span)
1018+
.map(|suggestion| suggestion.candidate)
10181019
});
10191020

10201021
if let Some(suggestion) = suggestion {

‎src/test/ui/associated-types/associated-types-eq-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0412]: cannot find type `A` in this scope
22
--> $DIR/associated-types-eq-1.rs:10:12
33
|
44
LL | let _: A = x.boo(); //~ ERROR cannot find type `A` in this scope
5-
| ^ did you mean `I`?
5+
| ^ help: a type parameter with a similar name exists: `I`
66

77
error: aborting due to previous error
88

‎src/test/ui/empty/empty-struct-braces-expr.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ error[E0423]: expected value, found struct `Empty1`
44
LL | let e1 = Empty1; //~ ERROR expected value, found struct `Empty1`
55
| ^^^^^^
66
| |
7-
| did you mean `XEmpty2`?
87
| did you mean `Empty1 { /* fields */ }`?
8+
| help: a unit struct with a similar name exists: `XEmpty2`
99

1010
error[E0423]: expected function, found struct `Empty1`
1111
--> $DIR/empty-struct-braces-expr.rs:16:14
1212
|
1313
LL | let e1 = Empty1(); //~ ERROR expected function, found struct `Empty1`
1414
| ^^^^^^
1515
| |
16-
| did you mean `XEmpty2`?
1716
| did you mean `Empty1 { /* fields */ }`?
17+
| help: a unit struct with a similar name exists: `XEmpty2`
1818

1919
error[E0423]: expected value, found struct variant `E::Empty3`
2020
--> $DIR/empty-struct-braces-expr.rs:17:14
@@ -34,17 +34,17 @@ error[E0423]: expected value, found struct `XEmpty1`
3434
LL | let xe1 = XEmpty1; //~ ERROR expected value, found struct `XEmpty1`
3535
| ^^^^^^^
3636
| |
37-
| did you mean `XEmpty2`?
3837
| did you mean `XEmpty1 { /* fields */ }`?
38+
| help: a unit struct with a similar name exists: `XEmpty2`
3939

4040
error[E0423]: expected function, found struct `XEmpty1`
4141
--> $DIR/empty-struct-braces-expr.rs:21:15
4242
|
4343
LL | let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1`
4444
| ^^^^^^^
4545
| |
46-
| did you mean `XEmpty2`?
4746
| did you mean `XEmpty1 { /* fields */ }`?
47+
| help: a unit struct with a similar name exists: `XEmpty2`
4848

4949
error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope
5050
--> $DIR/empty-struct-braces-expr.rs:22:19

‎src/test/ui/empty/empty-struct-braces-pat-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0532]: expected unit struct/variant or constant, found struct variant `XE
1010
LL | XE::XEmpty3 => ()
1111
| ^^^^-------
1212
| | |
13-
| | did you mean `XEmpty4`?
13+
| | help: a unit variant with a similar name exists: `XEmpty4`
1414
| did you mean `XE::XEmpty3 { /* fields */ }`?
1515

1616
error: aborting due to 2 previous errors

‎src/test/ui/empty/empty-struct-braces-pat-2.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@ error[E0532]: expected tuple struct/variant, found struct `Empty1`
44
LL | Empty1() => () //~ ERROR expected tuple struct/variant, found struct `Empty1`
55
| ^^^^^^
66
| |
7-
| did you mean `XEmpty6`?
87
| did you mean `Empty1 { /* fields */ }`?
8+
| help: a tuple struct with a similar name exists: `XEmpty6`
99

1010
error[E0532]: expected tuple struct/variant, found struct `XEmpty1`
1111
--> $DIR/empty-struct-braces-pat-2.rs:18:9
1212
|
1313
LL | XEmpty1() => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1`
1414
| ^^^^^^^
1515
| |
16-
| did you mean `XEmpty6`?
1716
| did you mean `XEmpty1 { /* fields */ }`?
17+
| help: a tuple struct with a similar name exists: `XEmpty6`
1818

1919
error[E0532]: expected tuple struct/variant, found struct `Empty1`
2020
--> $DIR/empty-struct-braces-pat-2.rs:21:9
2121
|
2222
LL | Empty1(..) => () //~ ERROR expected tuple struct/variant, found struct `Empty1`
2323
| ^^^^^^
2424
| |
25-
| did you mean `XEmpty6`?
2625
| did you mean `Empty1 { /* fields */ }`?
26+
| help: a tuple struct with a similar name exists: `XEmpty6`
2727

2828
error[E0532]: expected tuple struct/variant, found struct `XEmpty1`
2929
--> $DIR/empty-struct-braces-pat-2.rs:24:9
3030
|
3131
LL | XEmpty1(..) => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1`
3232
| ^^^^^^^
3333
| |
34-
| did you mean `XEmpty6`?
3534
| did you mean `XEmpty1 { /* fields */ }`?
35+
| help: a tuple struct with a similar name exists: `XEmpty6`
3636

3737
error: aborting due to 4 previous errors
3838

‎src/test/ui/empty/empty-struct-braces-pat-3.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3`
1010
LL | XE::XEmpty3() => ()
1111
| ^^^^-------
1212
| | |
13-
| | did you mean `XEmpty5`?
13+
| | help: a tuple variant with a similar name exists: `XEmpty5`
1414
| did you mean `XE::XEmpty3 { /* fields */ }`?
1515

1616
error[E0532]: expected tuple struct/variant, found struct variant `E::Empty3`
@@ -25,7 +25,7 @@ error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3`
2525
LL | XE::XEmpty3(..) => ()
2626
| ^^^^-------
2727
| | |
28-
| | did you mean `XEmpty5`?
28+
| | help: a tuple variant with a similar name exists: `XEmpty5`
2929
| did you mean `XE::XEmpty3 { /* fields */ }`?
3030

3131
error: aborting due to 4 previous errors

‎src/test/ui/empty/empty-struct-tuple-pat.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ error[E0532]: expected unit struct/variant or constant, found tuple variant `XE:
2828
LL | XE::XEmpty5 => (),
2929
| ^^^^-------
3030
| |
31-
| did you mean `XEmpty4`?
31+
| help: a unit variant with a similar name exists: `XEmpty4`
3232

3333
error: aborting due to 4 previous errors
3434

‎src/test/ui/empty/empty-struct-unit-pat.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ error[E0532]: expected tuple struct/variant, found unit struct `Empty2`
22
--> $DIR/empty-struct-unit-pat.rs:21:9
33
|
44
LL | Empty2() => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2`
5-
| ^^^^^^ did you mean `XEmpty6`?
5+
| ^^^^^^ help: a tuple struct with a similar name exists: `XEmpty6`
66

77
error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2`
88
--> $DIR/empty-struct-unit-pat.rs:24:9
99
|
1010
LL | XEmpty2() => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2`
11-
| ^^^^^^^ did you mean `XEmpty6`?
11+
| ^^^^^^^ help: a tuple struct with a similar name exists: `XEmpty6`
1212

1313
error[E0532]: expected tuple struct/variant, found unit struct `Empty2`
1414
--> $DIR/empty-struct-unit-pat.rs:27:9
1515
|
1616
LL | Empty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2`
17-
| ^^^^^^ did you mean `XEmpty6`?
17+
| ^^^^^^ help: a tuple struct with a similar name exists: `XEmpty6`
1818

1919
error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2`
2020
--> $DIR/empty-struct-unit-pat.rs:30:9
2121
|
2222
LL | XEmpty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2`
23-
| ^^^^^^^ did you mean `XEmpty6`?
23+
| ^^^^^^^ help: a tuple struct with a similar name exists: `XEmpty6`
2424

2525
error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4`
2626
--> $DIR/empty-struct-unit-pat.rs:34:9
@@ -34,7 +34,7 @@ error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4`
3434
LL | XE::XEmpty4() => (),
3535
| ^^^^-------
3636
| |
37-
| did you mean `XEmpty5`?
37+
| help: a tuple variant with a similar name exists: `XEmpty5`
3838

3939
error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4`
4040
--> $DIR/empty-struct-unit-pat.rs:42:9
@@ -48,7 +48,7 @@ error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4`
4848
LL | XE::XEmpty4(..) => (),
4949
| ^^^^-------
5050
| |
51-
| did you mean `XEmpty5`?
51+
| help: a tuple variant with a similar name exists: `XEmpty5`
5252

5353
error: aborting due to 8 previous errors
5454

‎src/test/ui/error-codes/E0423.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ error[E0423]: expected function, found struct `Foo`
2222
LL | let f = Foo(); //~ ERROR E0423
2323
| ^^^
2424
| |
25-
| did you mean `foo`?
2625
| did you mean `Foo { /* fields */ }`?
26+
| help: a function with a similar name exists: `foo`
2727

2828
error[E0423]: expected value, found struct `S`
2929
--> $DIR/E0423.rs:12:32

‎src/test/ui/error-festival.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `y` in this scope
22
--> $DIR/error-festival.rs:14:5
33
|
44
LL | y = 2;
5-
| ^ did you mean `x`?
5+
| ^ help: a local variable with a similar name exists: `x`
66

77
error[E0603]: constant `FOO` is private
88
--> $DIR/error-festival.rs:22:10

0 commit comments

Comments
 (0)