diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index d02201d5321c7..84400091100e6 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -2064,9 +2064,9 @@ pub fn is_case_difference(sm: &dyn SourceMapper, suggested: &str, sp: Span) -> b
     // FIXME: this should probably be extended to also account for `FO0` → `FOO` and unicode.
     let found = sm.span_to_snippet(sp).unwrap();
     let ascii_confusables = &['c', 'f', 'i', 'k', 'o', 's', 'u', 'v', 'w', 'x', 'y', 'z'];
-    // There are ASCII chars that are confusable (above) and differ in capitalization:
-    let confusable = found.chars().zip(suggested.chars()).any(|(f, s)| {
-        (ascii_confusables.contains(&f) || ascii_confusables.contains(&s)) && f != s
+    // All the chars that differ in capitalization are confusable (above):
+    let confusable = found.chars().zip(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
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr.stderr b/src/test/ui/consts/const-eval/const_fn_ptr.stderr
index 9a5871905a05f..2fbb19322442b 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr.stderr
+++ b/src/test/ui/consts/const-eval/const_fn_ptr.stderr
@@ -20,7 +20,7 @@ warning: constant `X_const` should have an upper case name
   --> $DIR/const_fn_ptr.rs:9:7
    |
 LL | const X_const: fn(usize) -> usize = double_const;
-   |       ^^^^^^^ help: convert the identifier to upper case (notice the capitalization): `X_CONST`
+   |       ^^^^^^^ help: convert the identifier to upper case: `X_CONST`
    |
    = note: `#[warn(non_upper_case_globals)]` on by default
 
diff --git a/src/test/ui/enable-unstable-lib-feature.stderr b/src/test/ui/enable-unstable-lib-feature.stderr
index d89f804f15bdd..d5b8c0efaad37 100644
--- a/src/test/ui/enable-unstable-lib-feature.stderr
+++ b/src/test/ui/enable-unstable-lib-feature.stderr
@@ -2,7 +2,7 @@ error: function `BOGUS` should have a snake case name
   --> $DIR/enable-unstable-lib-feature.rs:11:8
    |
 LL | pub fn BOGUS() { }
-   |        ^^^^^ help: convert the identifier to snake case (notice the capitalization): `bogus`
+   |        ^^^^^ help: convert the identifier to snake case: `bogus`
    |
 note: lint level defined here
   --> $DIR/enable-unstable-lib-feature.rs:6:9
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr b/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
index 40e5a736a8e56..d95510ccd2d25 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
+++ b/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
@@ -20,7 +20,7 @@ error: constant in pattern `not_okay` should have an upper case name
   --> $DIR/lint-lowercase-static-const-pattern.rs:40:13
    |
 LL |         (0, not_okay) => 0,
-   |             ^^^^^^^^ help: convert the identifier to upper case (notice the capitalization): `NOT_OKAY`
+   |             ^^^^^^^^ help: convert the identifier to upper case: `NOT_OKAY`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/src/test/ui/lint/lint-non-snake-case-functions.stderr
index 244522acf1f80..c5eca89debb82 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-functions.stderr
@@ -2,7 +2,7 @@ error: method `Foo_Method` should have a snake case name
   --> $DIR/lint-non-snake-case-functions.rs:7:8
    |
 LL |     fn Foo_Method() {}
-   |        ^^^^^^^^^^ help: convert the identifier to snake case (notice the capitalization): `foo_method`
+   |        ^^^^^^^^^^ help: convert the identifier to snake case: `foo_method`
    |
 note: lint level defined here
   --> $DIR/lint-non-snake-case-functions.rs:1:9
@@ -32,7 +32,7 @@ error: trait method `ABC` should have a snake case name
   --> $DIR/lint-non-snake-case-functions.rs:22:8
    |
 LL |     fn ABC();
-   |        ^^^ help: convert the identifier to snake case (notice the capitalization): `abc`
+   |        ^^^ help: convert the identifier to snake case: `abc`
 
 error: trait method `a_b_C` should have a snake case name
   --> $DIR/lint-non-snake-case-functions.rs:25:8
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr b/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
index 233048ee1ddb0..2185d5a0ab48f 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
+++ b/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
@@ -2,7 +2,7 @@ error: associated constant `not_upper` should have an upper case name
   --> $DIR/lint-non-uppercase-associated-const.rs:7:11
    |
 LL |     const not_upper: bool = true;
-   |           ^^^^^^^^^ help: convert the identifier to upper case (notice the capitalization): `NOT_UPPER`
+   |           ^^^^^^^^^ help: convert the identifier to upper case: `NOT_UPPER`
    |
 note: lint level defined here
   --> $DIR/lint-non-uppercase-associated-const.rs:1:9
diff --git a/src/test/ui/lint/not_found.stderr b/src/test/ui/lint/not_found.stderr
index 8614e9f11733e..5016d9b97d69e 100644
--- a/src/test/ui/lint/not_found.stderr
+++ b/src/test/ui/lint/not_found.stderr
@@ -10,7 +10,7 @@ warning: unknown lint: `DEAD_CODE`
   --> $DIR/not_found.rs:8:8
    |
 LL | #[warn(DEAD_CODE)]
-   |        ^^^^^^^^^ help: did you mean (notice the capitalization): `dead_code`
+   |        ^^^^^^^^^ help: did you mean: `dead_code`
 
 warning: unknown lint: `Warnings`
   --> $DIR/not_found.rs:10:8