Extend `is_case_difference` to handle digit-letter confusables
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
index 46a4a18..55a42d0 100644
--- a/compiler/rustc_errors/src/emitter.rs
+++ b/compiler/rustc_errors/src/emitter.rs
@@ -262,19 +262,11 @@ fn primary_span_formatted(
format!("help: {msg}")
} else {
// Show the default suggestion text with the substitution
- format!(
- "help: {}{}: `{}`",
- msg,
- if self
- .source_map()
- .is_some_and(|sm| is_case_difference(sm, snippet, part.span,))
- {
- " (notice the capitalization)"
- } else {
- ""
- },
- snippet,
- )
+ let confusion_type = self
+ .source_map()
+ .map(|sm| detect_confusion_type(sm, snippet, part.span))
+ .unwrap_or(ConfusionType::None);
+ format!("help: {}{}: `{}`", msg, confusion_type.label_text(), snippet,)
};
primary_span.push_span_label(part.span, msg);
@@ -2028,12 +2020,12 @@ fn emit_suggestion_default(
buffer.append(0, ": ", Style::HeaderMsg);
let mut msg = vec![(suggestion.msg.to_owned(), Style::NoStyle)];
- if suggestions
- .iter()
- .take(MAX_SUGGESTIONS)
- .any(|(_, _, _, only_capitalization)| *only_capitalization)
+ if let Some(confusion_type) =
+ suggestions.iter().take(MAX_SUGGESTIONS).find_map(|(_, _, _, confusion_type)| {
+ if confusion_type.has_confusion() { Some(*confusion_type) } else { None }
+ })
{
- msg.push((" (notice the capitalization difference)".into(), Style::NoStyle));
+ msg.push((confusion_type.label_text().into(), Style::NoStyle));
}
self.msgs_to_buffer(
&mut buffer,
@@ -3528,24 +3520,107 @@ pub fn is_different(sm: &SourceMap, suggested: &str, sp: Span) -> bool {
}
/// Whether the original and suggested code are visually similar enough to warrant extra wording.
-pub fn is_case_difference(sm: &SourceMap, suggested: &str, sp: Span) -> bool {
- // FIXME: this should probably be extended to also account for `FO0` → `FOO` and unicode.
+pub fn detect_confusion_type(sm: &SourceMap, suggested: &str, sp: Span) -> ConfusionType {
let found = match sm.span_to_snippet(sp) {
Ok(snippet) => snippet,
Err(e) => {
warn!(error = ?e, "Invalid span {:?}", sp);
- return false;
+ return ConfusionType::None;
}
};
- let ascii_confusables = &['c', 'f', 'i', 'k', 'o', 's', 'u', 'v', 'w', 'x', 'y', 'z'];
- // All the chars that differ in capitalization are confusable (above):
- let confusable = iter::zip(found.chars(), suggested.chars())
- .filter(|(f, s)| f != s)
- .all(|(f, s)| ascii_confusables.contains(&f) || ascii_confusables.contains(&s));
- confusable && found.to_lowercase() == suggested.to_lowercase()
- // FIXME: We sometimes suggest the same thing we already have, which is a
- // bug, but be defensive against that here.
- && found != suggested
+
+ let mut has_case_confusion = false;
+ let mut has_digit_letter_confusion = false;
+
+ if found.len() == suggested.len() {
+ let mut has_case_diff = false;
+ let mut has_digit_letter_confusable = false;
+ let mut has_other_diff = false;
+
+ let ascii_confusables = &['c', 'f', 'i', 'k', 'o', 's', 'u', 'v', 'w', 'x', 'y', 'z'];
+
+ let digit_letter_confusables = [('0', 'O'), ('1', 'l'), ('5', 'S'), ('8', 'B'), ('9', 'g')];
+
+ for (f, s) in iter::zip(found.chars(), suggested.chars()) {
+ if f != s {
+ if f.to_lowercase().to_string() == s.to_lowercase().to_string() {
+ // Check for case differences (any character that differs only in case)
+ if ascii_confusables.contains(&f) || ascii_confusables.contains(&s) {
+ has_case_diff = true;
+ } else {
+ has_other_diff = true;
+ }
+ } else if digit_letter_confusables.contains(&(f, s))
+ || digit_letter_confusables.contains(&(s, f))
+ {
+ // Check for digit-letter confusables (like 0 vs O, 1 vs l, etc.)
+ has_digit_letter_confusable = true;
+ } else {
+ has_other_diff = true;
+ }
+ }
+ }
+
+ // If we have case differences and no other differences
+ if has_case_diff && !has_other_diff && found != suggested {
+ has_case_confusion = true;
+ }
+ if has_digit_letter_confusable && !has_other_diff && found != suggested {
+ has_digit_letter_confusion = true;
+ }
+ }
+
+ match (has_case_confusion, has_digit_letter_confusion) {
+ (true, true) => ConfusionType::Both,
+ (true, false) => ConfusionType::Case,
+ (false, true) => ConfusionType::DigitLetter,
+ (false, false) => ConfusionType::None,
+ }
+}
+
+/// Represents the type of confusion detected between original and suggested code.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ConfusionType {
+ /// No confusion detected
+ None,
+ /// Only case differences (e.g., "hello" vs "Hello")
+ Case,
+ /// Only digit-letter confusion (e.g., "0" vs "O", "1" vs "l")
+ DigitLetter,
+ /// Both case and digit-letter confusion
+ Both,
+}
+
+impl ConfusionType {
+ /// Returns the appropriate label text for this confusion type.
+ pub fn label_text(&self) -> &'static str {
+ match self {
+ ConfusionType::None => "",
+ ConfusionType::Case => " (notice the capitalization)",
+ ConfusionType::DigitLetter => " (notice the digit/letter confusion)",
+ ConfusionType::Both => " (notice the capitalization and digit/letter confusion)",
+ }
+ }
+
+ /// Combines two confusion types. If either is `Both`, the result is `Both`.
+ /// If one is `Case` and the other is `DigitLetter`, the result is `Both`.
+ /// Otherwise, returns the non-`None` type, or `None` if both are `None`.
+ pub fn combine(self, other: ConfusionType) -> ConfusionType {
+ match (self, other) {
+ (ConfusionType::None, other) => other,
+ (this, ConfusionType::None) => this,
+ (ConfusionType::Both, _) | (_, ConfusionType::Both) => ConfusionType::Both,
+ (ConfusionType::Case, ConfusionType::DigitLetter)
+ | (ConfusionType::DigitLetter, ConfusionType::Case) => ConfusionType::Both,
+ (ConfusionType::Case, ConfusionType::Case) => ConfusionType::Case,
+ (ConfusionType::DigitLetter, ConfusionType::DigitLetter) => ConfusionType::DigitLetter,
+ }
+ }
+
+ /// Returns true if this confusion type represents any kind of confusion.
+ pub fn has_confusion(&self) -> bool {
+ *self != ConfusionType::None
+ }
}
pub(crate) fn should_show_source_code(
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
index 381d780..2534cdd 100644
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -50,7 +50,7 @@
IndicateAnonymousLifetime, SingleLabelManySpans,
};
pub use emitter::ColorConfig;
-use emitter::{DynEmitter, Emitter, is_case_difference, is_different};
+use emitter::{ConfusionType, DynEmitter, Emitter, detect_confusion_type, is_different};
use rustc_data_structures::AtomicRef;
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
use rustc_data_structures::stable_hasher::StableHasher;
@@ -308,7 +308,7 @@ impl CodeSuggestion {
pub(crate) fn splice_lines(
&self,
sm: &SourceMap,
- ) -> Vec<(String, Vec<SubstitutionPart>, Vec<Vec<SubstitutionHighlight>>, bool)> {
+ ) -> Vec<(String, Vec<SubstitutionPart>, Vec<Vec<SubstitutionHighlight>>, ConfusionType)> {
// For the `Vec<Vec<SubstitutionHighlight>>` value, the first level of the vector
// corresponds to the output snippet's lines, while the second level corresponds to the
// substrings within that line that should be highlighted.
@@ -414,14 +414,15 @@ fn push_trailing(
// We need to keep track of the difference between the existing code and the added
// or deleted code in order to point at the correct column *after* substitution.
let mut acc = 0;
- let mut only_capitalization = false;
+ let mut confusion_type = ConfusionType::None;
for part in &mut substitution.parts {
// If this is a replacement of, e.g. `"a"` into `"ab"`, adjust the
// suggestion and snippet to look as if we just suggested to add
// `"b"`, which is typically much easier for the user to understand.
part.trim_trivial_replacements(sm);
- only_capitalization |= is_case_difference(sm, &part.snippet, part.span);
+ let part_confusion = detect_confusion_type(sm, &part.snippet, part.span);
+ confusion_type = confusion_type.combine(part_confusion);
let cur_lo = sm.lookup_char_pos(part.span.lo());
if prev_hi.line == cur_lo.line {
let mut count =
@@ -511,7 +512,7 @@ fn push_trailing(
if highlights.iter().all(|parts| parts.is_empty()) {
None
} else {
- Some((buf, substitution.parts, highlights, only_capitalization))
+ Some((buf, substitution.parts, highlights, confusion_type))
}
})
.collect()
diff --git a/src/tools/clippy/tests/ui/match_str_case_mismatch.stderr b/src/tools/clippy/tests/ui/match_str_case_mismatch.stderr
index 8068edf..c2b58b9 100644
--- a/src/tools/clippy/tests/ui/match_str_case_mismatch.stderr
+++ b/src/tools/clippy/tests/ui/match_str_case_mismatch.stderr
@@ -18,7 +18,7 @@
LL | "~!@#$%^&*()-_=+Foo" => {},
| ^^^^^^^^^^^^^^^^^^^^
|
-help: consider changing the case of this arm to respect `to_ascii_lowercase` (notice the capitalization difference)
+help: consider changing the case of this arm to respect `to_ascii_lowercase` (notice the capitalization)
|
LL - "~!@#$%^&*()-_=+Foo" => {},
LL + "~!@#$%^&*()-_=+foo" => {},
diff --git a/tests/ui/error-codes/E0423.stderr b/tests/ui/error-codes/E0423.stderr
index e50b8bd..b699e53 100644
--- a/tests/ui/error-codes/E0423.stderr
+++ b/tests/ui/error-codes/E0423.stderr
@@ -54,7 +54,7 @@
LL - let f = Foo();
LL + let f = Foo { a: val };
|
-help: a function with a similar name exists (notice the capitalization difference)
+help: a function with a similar name exists (notice the capitalization)
|
LL - let f = Foo();
LL + let f = foo();
diff --git a/tests/ui/lint/lint-non-uppercase-usages.stderr b/tests/ui/lint/lint-non-uppercase-usages.stderr
index 7c7e573..b34be31 100644
--- a/tests/ui/lint/lint-non-uppercase-usages.stderr
+++ b/tests/ui/lint/lint-non-uppercase-usages.stderr
@@ -29,7 +29,7 @@
LL | fn foo<const foo: u32>() {
| ^^^
|
-help: convert the identifier to upper case (notice the capitalization difference)
+help: convert the identifier to upper case (notice the capitalization)
|
LL - fn foo<const foo: u32>() {
LL + fn foo<const FOO: u32>() {
diff --git a/tests/ui/parser/item-kw-case-mismatch.stderr b/tests/ui/parser/item-kw-case-mismatch.stderr
index df39eb1..d2a1eb7 100644
--- a/tests/ui/parser/item-kw-case-mismatch.stderr
+++ b/tests/ui/parser/item-kw-case-mismatch.stderr
@@ -4,7 +4,7 @@
LL | Use std::ptr::read;
| ^^^
|
-help: write it in the correct case (notice the capitalization difference)
+help: write it in the correct case (notice the capitalization)
|
LL - Use std::ptr::read;
LL + use std::ptr::read;
@@ -28,7 +28,7 @@
LL | async Fn _a() {}
| ^^
|
-help: write it in the correct case (notice the capitalization difference)
+help: write it in the correct case (notice the capitalization)
|
LL - async Fn _a() {}
LL + async fn _a() {}
@@ -40,7 +40,7 @@
LL | Fn _b() {}
| ^^
|
-help: write it in the correct case (notice the capitalization difference)
+help: write it in the correct case (notice the capitalization)
|
LL - Fn _b() {}
LL + fn _b() {}
diff --git a/tests/ui/parser/kw-in-trait-bounds.stderr b/tests/ui/parser/kw-in-trait-bounds.stderr
index 1892d0b..5a4adf3 100644
--- a/tests/ui/parser/kw-in-trait-bounds.stderr
+++ b/tests/ui/parser/kw-in-trait-bounds.stderr
@@ -4,7 +4,7 @@
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
LL + fn _f<F: Fn(), G>(_: impl fn(), _: &dyn fn())
@@ -16,7 +16,7 @@
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
LL + fn _f<F: fn(), G>(_: impl Fn(), _: &dyn fn())
@@ -28,7 +28,7 @@
LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
LL + fn _f<F: fn(), G>(_: impl fn(), _: &dyn Fn())
@@ -40,7 +40,7 @@
LL | G: fn(),
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - G: fn(),
LL + G: Fn(),
diff --git a/tests/ui/parser/misspelled-keywords/hrdt.stderr b/tests/ui/parser/misspelled-keywords/hrdt.stderr
index e5fc1a5..497bd61 100644
--- a/tests/ui/parser/misspelled-keywords/hrdt.stderr
+++ b/tests/ui/parser/misspelled-keywords/hrdt.stderr
@@ -4,7 +4,7 @@
LL | Where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8,
| ^^^ expected one of 7 possible tokens
|
-help: write keyword `where` in lowercase (notice the capitalization difference)
+help: write keyword `where` in lowercase (notice the capitalization)
|
LL - Where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8,
LL + where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8,
diff --git a/tests/ui/parser/misspelled-keywords/impl-return.stderr b/tests/ui/parser/misspelled-keywords/impl-return.stderr
index ff53914..d49d962 100644
--- a/tests/ui/parser/misspelled-keywords/impl-return.stderr
+++ b/tests/ui/parser/misspelled-keywords/impl-return.stderr
@@ -4,7 +4,7 @@
LL | fn code() -> Impl Display {}
| ^^^^^^^ expected one of 7 possible tokens
|
-help: write keyword `impl` in lowercase (notice the capitalization difference)
+help: write keyword `impl` in lowercase (notice the capitalization)
|
LL - fn code() -> Impl Display {}
LL + fn code() -> impl Display {}
diff --git a/tests/ui/parser/misspelled-keywords/static.stderr b/tests/ui/parser/misspelled-keywords/static.stderr
index e559f2b..0df40bc 100644
--- a/tests/ui/parser/misspelled-keywords/static.stderr
+++ b/tests/ui/parser/misspelled-keywords/static.stderr
@@ -4,7 +4,7 @@
LL | Static a = 0;
| ^ expected one of `!` or `::`
|
-help: write keyword `static` in lowercase (notice the capitalization difference)
+help: write keyword `static` in lowercase (notice the capitalization)
|
LL - Static a = 0;
LL + static a = 0;
diff --git a/tests/ui/parser/misspelled-keywords/struct.stderr b/tests/ui/parser/misspelled-keywords/struct.stderr
index edbec3b..af8614e 100644
--- a/tests/ui/parser/misspelled-keywords/struct.stderr
+++ b/tests/ui/parser/misspelled-keywords/struct.stderr
@@ -4,7 +4,7 @@
LL | Struct Foor {
| ^^^^ expected one of `!` or `::`
|
-help: write keyword `struct` in lowercase (notice the capitalization difference)
+help: write keyword `struct` in lowercase (notice the capitalization)
|
LL - Struct Foor {
LL + struct Foor {
diff --git a/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr b/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr
index 4e1fcaf..bd809e7 100644
--- a/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr
+++ b/tests/ui/parser/recover/recover-fn-trait-from-fn-kw.stderr
@@ -4,7 +4,7 @@
LL | fn foo(_: impl fn() -> i32) {}
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - fn foo(_: impl fn() -> i32) {}
LL + fn foo(_: impl Fn() -> i32) {}
@@ -16,7 +16,7 @@
LL | fn foo2<T: fn(i32)>(_: T) {}
| ^^
|
-help: use `Fn` to refer to the trait (notice the capitalization difference)
+help: use `Fn` to refer to the trait (notice the capitalization)
|
LL - fn foo2<T: fn(i32)>(_: T) {}
LL + fn foo2<T: Fn(i32)>(_: T) {}
diff --git a/tests/ui/parser/typod-const-in-const-param-def.stderr b/tests/ui/parser/typod-const-in-const-param-def.stderr
index bf7168a..cc1600f 100644
--- a/tests/ui/parser/typod-const-in-const-param-def.stderr
+++ b/tests/ui/parser/typod-const-in-const-param-def.stderr
@@ -4,7 +4,7 @@
LL | pub fn foo<Const N: u8>() {}
| ^^^^^
|
-help: use the `const` keyword (notice the capitalization difference)
+help: use the `const` keyword (notice the capitalization)
|
LL - pub fn foo<Const N: u8>() {}
LL + pub fn foo<const N: u8>() {}
@@ -16,7 +16,7 @@
LL | pub fn baz<Const N: u8, T>() {}
| ^^^^^
|
-help: use the `const` keyword (notice the capitalization difference)
+help: use the `const` keyword (notice the capitalization)
|
LL - pub fn baz<Const N: u8, T>() {}
LL + pub fn baz<const N: u8, T>() {}
@@ -28,7 +28,7 @@
LL | pub fn qux<T, Const N: u8>() {}
| ^^^^^
|
-help: use the `const` keyword (notice the capitalization difference)
+help: use the `const` keyword (notice the capitalization)
|
LL - pub fn qux<T, Const N: u8>() {}
LL + pub fn qux<T, const N: u8>() {}
@@ -40,7 +40,7 @@
LL | pub fn quux<T, Const N: u8, U>() {}
| ^^^^^
|
-help: use the `const` keyword (notice the capitalization difference)
+help: use the `const` keyword (notice the capitalization)
|
LL - pub fn quux<T, Const N: u8, U>() {}
LL + pub fn quux<T, const N: u8, U>() {}
diff --git a/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr b/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr
index 6d6fd98..47efe69 100644
--- a/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr
+++ b/tests/ui/suggestions/assoc-ct-for-assoc-method.stderr
@@ -8,7 +8,7 @@
|
= note: expected type `i32`
found fn item `fn() -> MyS {MyS::foo}`
-help: try referring to the associated const `FOO` instead (notice the capitalization difference)
+help: try referring to the associated const `FOO` instead (notice the capitalization)
|
LL - let x: i32 = MyS::foo;
LL + let x: i32 = MyS::FOO;
diff --git a/tests/ui/suggestions/bool_typo_err_suggest.stderr b/tests/ui/suggestions/bool_typo_err_suggest.stderr
index faf799d..d46ce1a 100644
--- a/tests/ui/suggestions/bool_typo_err_suggest.stderr
+++ b/tests/ui/suggestions/bool_typo_err_suggest.stderr
@@ -16,7 +16,7 @@
LL | let y = False;
| ^^^^^ not found in this scope
|
-help: you may want to use a bool value instead (notice the capitalization difference)
+help: you may want to use a bool value instead (notice the capitalization)
|
LL - let y = False;
LL + let y = false;
diff --git a/tests/ui/suggestions/case-difference-suggestions.rs b/tests/ui/suggestions/case-difference-suggestions.rs
new file mode 100644
index 0000000..d554b6e
--- /dev/null
+++ b/tests/ui/suggestions/case-difference-suggestions.rs
@@ -0,0 +1,57 @@
+fn main() {
+
+ // Simple case difference, no hit
+ let hello = "hello";
+ println!("{}", Hello); //~ ERROR cannot find value `Hello` in this scope
+
+ // Multiple case differences, hit
+ let myVariable = 10;
+ println!("{}", myvariable); //~ ERROR cannot find value `myvariable` in this scope
+
+ // Case difference with special characters, hit
+ let user_name = "john";
+ println!("{}", User_Name); //~ ERROR cannot find value `User_Name` in this scope
+
+ // All uppercase vs all lowercase, hit
+ let FOO = 42;
+ println!("{}", foo); //~ ERROR cannot find value `foo` in this scope
+
+
+ // 0 vs O
+ let FFO0 = 100;
+ println!("{}", FFOO); //~ ERROR cannot find value `FFOO` in this scope
+
+ let l1st = vec![1, 2, 3];
+ println!("{}", list); //~ ERROR cannot find value `list` in this scope
+
+ let S5 = "test";
+ println!("{}", SS); //~ ERROR cannot find value `SS` in this scope
+
+ let aS5 = "test";
+ println!("{}", a55); //~ ERROR cannot find value `a55` in this scope
+
+ let B8 = 8;
+ println!("{}", BB); //~ ERROR cannot find value `BB` in this scope
+
+ let g9 = 9;
+ println!("{}", gg); //~ ERROR cannot find value `gg` in this scope
+
+ let o1d = "old";
+ println!("{}", old); //~ ERROR cannot find value `old` in this scope
+
+ let new1 = "new";
+ println!("{}", newl); //~ ERROR cannot find value `newl` in this scope
+
+ let apple = "apple";
+ println!("{}", app1e); //~ ERROR cannot find value `app1e` in this scope
+
+ let a = 1;
+ println!("{}", A); //~ ERROR cannot find value `A` in this scope
+
+ let worldlu = "world";
+ println!("{}", world1U); //~ ERROR cannot find value `world1U` in this scope
+
+ let myV4rlable = 42;
+ println!("{}", myv4r1able); //~ ERROR cannot find value `myv4r1able` in this scope
+
+}
diff --git a/tests/ui/suggestions/case-difference-suggestions.stderr b/tests/ui/suggestions/case-difference-suggestions.stderr
new file mode 100644
index 0000000..c3d2410
--- /dev/null
+++ b/tests/ui/suggestions/case-difference-suggestions.stderr
@@ -0,0 +1,99 @@
+error[E0425]: cannot find value `Hello` in this scope
+ --> $DIR/case-difference-suggestions.rs:5:20
+ |
+LL | println!("{}", Hello);
+ | ^^^^^ help: a local variable with a similar name exists: `hello`
+
+error[E0425]: cannot find value `myvariable` in this scope
+ --> $DIR/case-difference-suggestions.rs:9:20
+ |
+LL | println!("{}", myvariable);
+ | ^^^^^^^^^^ help: a local variable with a similar name exists (notice the capitalization): `myVariable`
+
+error[E0425]: cannot find value `User_Name` in this scope
+ --> $DIR/case-difference-suggestions.rs:13:20
+ |
+LL | println!("{}", User_Name);
+ | ^^^^^^^^^ help: a local variable with a similar name exists: `user_name`
+
+error[E0425]: cannot find value `foo` in this scope
+ --> $DIR/case-difference-suggestions.rs:17:20
+ |
+LL | println!("{}", foo);
+ | ^^^ help: a local variable with a similar name exists (notice the capitalization): `FOO`
+
+error[E0425]: cannot find value `FFOO` in this scope
+ --> $DIR/case-difference-suggestions.rs:22:20
+ |
+LL | println!("{}", FFOO);
+ | ^^^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `FFO0`
+
+error[E0425]: cannot find value `list` in this scope
+ --> $DIR/case-difference-suggestions.rs:25:20
+ |
+LL | println!("{}", list);
+ | ^^^^ help: a local variable with a similar name exists: `l1st`
+
+error[E0425]: cannot find value `SS` in this scope
+ --> $DIR/case-difference-suggestions.rs:28:20
+ |
+LL | println!("{}", SS);
+ | ^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `S5`
+
+error[E0425]: cannot find value `a55` in this scope
+ --> $DIR/case-difference-suggestions.rs:31:20
+ |
+LL | println!("{}", a55);
+ | ^^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `aS5`
+
+error[E0425]: cannot find value `BB` in this scope
+ --> $DIR/case-difference-suggestions.rs:34:20
+ |
+LL | println!("{}", BB);
+ | ^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `B8`
+
+error[E0425]: cannot find value `gg` in this scope
+ --> $DIR/case-difference-suggestions.rs:37:20
+ |
+LL | println!("{}", gg);
+ | ^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `g9`
+
+error[E0425]: cannot find value `old` in this scope
+ --> $DIR/case-difference-suggestions.rs:40:20
+ |
+LL | println!("{}", old);
+ | ^^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `o1d`
+
+error[E0425]: cannot find value `newl` in this scope
+ --> $DIR/case-difference-suggestions.rs:43:20
+ |
+LL | println!("{}", newl);
+ | ^^^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `new1`
+
+error[E0425]: cannot find value `app1e` in this scope
+ --> $DIR/case-difference-suggestions.rs:46:20
+ |
+LL | println!("{}", app1e);
+ | ^^^^^ help: a local variable with a similar name exists (notice the digit/letter confusion): `apple`
+
+error[E0425]: cannot find value `A` in this scope
+ --> $DIR/case-difference-suggestions.rs:49:20
+ |
+LL | println!("{}", A);
+ | ^ help: a local variable with a similar name exists: `a`
+
+error[E0425]: cannot find value `world1U` in this scope
+ --> $DIR/case-difference-suggestions.rs:52:20
+ |
+LL | println!("{}", world1U);
+ | ^^^^^^^ help: a local variable with a similar name exists (notice the capitalization and digit/letter confusion): `worldlu`
+
+error[E0425]: cannot find value `myv4r1able` in this scope
+ --> $DIR/case-difference-suggestions.rs:55:20
+ |
+LL | println!("{}", myv4r1able);
+ | ^^^^^^^^^^ help: a local variable with a similar name exists (notice the capitalization and digit/letter confusion): `myV4rlable`
+
+error: aborting due to 16 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/suggestions/incorrect-variant-literal.svg b/tests/ui/suggestions/incorrect-variant-literal.svg
index 279fd30..2cab1f4 100644
--- a/tests/ui/suggestions/incorrect-variant-literal.svg
+++ b/tests/ui/suggestions/incorrect-variant-literal.svg
@@ -455,7 +455,7 @@
</tspan>
<tspan x="10px" y="3916px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
- <tspan x="10px" y="3934px"><tspan class="fg-ansi256-014 bold">help</tspan><tspan>: there is a variant with a similar name (notice the capitalization difference)</tspan>
+ <tspan x="10px" y="3934px"><tspan class="fg-ansi256-014 bold">help</tspan><tspan>: there is a variant with a similar name (notice the capitalization)</tspan>
</tspan>
<tspan x="10px" y="3952px"><tspan> </tspan><tspan class="fg-ansi256-012 bold">|</tspan>
</tspan>
