mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-29 02:03:53 +00:00
rustc_span: Use correct edit distance start length for suggestions
Otherwise the suggestions can be off-base for non-ASCII identifiers. For example suggesting that `Ok` is a name similar to `读文`.
This commit is contained in:
parent
aa330518f4
commit
45fc842ed9
@ -188,7 +188,11 @@ fn find_best_match_for_name_impl(
|
||||
return Some(*c);
|
||||
}
|
||||
|
||||
let mut dist = dist.unwrap_or_else(|| cmp::max(lookup.len(), 3) / 3);
|
||||
// `fn edit_distance()` use `chars()` to calculate edit distance, so we must
|
||||
// also use `chars()` (and not `str::len()`) to calculate length here.
|
||||
let lookup_len = lookup.chars().count();
|
||||
|
||||
let mut dist = dist.unwrap_or_else(|| cmp::max(lookup_len, 3) / 3);
|
||||
let mut best = None;
|
||||
// store the candidates with the same distance, only for `use_substring_score` current.
|
||||
let mut next_candidates = vec![];
|
||||
|
4
tests/ui/suggestions/non_ascii_ident.rs
Normal file
4
tests/ui/suggestions/non_ascii_ident.rs
Normal file
@ -0,0 +1,4 @@
|
||||
fn main() {
|
||||
// There shall be no suggestions here. In particular not `Ok`.
|
||||
let _ = 读文; //~ ERROR cannot find value `读文` in this scope
|
||||
}
|
9
tests/ui/suggestions/non_ascii_ident.stderr
Normal file
9
tests/ui/suggestions/non_ascii_ident.stderr
Normal file
@ -0,0 +1,9 @@
|
||||
error[E0425]: cannot find value `读文` in this scope
|
||||
--> $DIR/non_ascii_ident.rs:3:13
|
||||
|
|
||||
LL | let _ = 读文;
|
||||
| ^^^^ not found in this scope
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0425`.
|
Loading…
Reference in New Issue
Block a user