Update Unicode lint tests

diff --git a/clippy_lints/src/unicode.rs b/clippy_lints/src/unicode.rs
index 15c74eff73b16aa3dcadd22f792d314636b16c85..f7e1edae5162fc1f5d37baba00dd669dc3d341a8 100644 (file)
--- a/clippy_lints/src/unicode.rs
+++ b/clippy_lints/src/unicode.rs
@@ -56,17 +56,17 @@
     ///
     /// **Known problems** None.
     ///
-    /// **Example:** You may not see it, but “à” and “à” aren't the same string. The
+    /// **Example:** You may not see it, but "à"" and "à"" aren't the same string. The
     /// former when escaped is actually `"a\u{300}"` while the latter is `"\u{e0}"`.
     pub UNICODE_NOT_NFC,
     pedantic,
-    "using a unicode literal not in NFC normal form (see [unicode tr15](http://www.unicode.org/reports/tr15/) for further information)"
+    "using a Unicode literal not in NFC normal form (see [Unicode tr15](http://www.unicode.org/reports/tr15/) for further information)"
 }
 
 declare_lint_pass!(Unicode => [ZERO_WIDTH_SPACE, NON_ASCII_LITERAL, UNICODE_NOT_NFC]);
 
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Unicode {
-    fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
+impl LateLintPass<'_, '_> for Unicode {
+    fn check_expr(&mut self, cx: &LateContext<'_, '_>, expr: &'_ Expr) {
         if let ExprKind::Lit(ref lit) = expr.node {
             if let LitKind::Str(_, _) = lit.node {
                 check_str(cx, lit.span, expr.hir_id)
@@ -122,7 +122,7 @@ fn check_str(cx: &LateContext<'_, '_>, span: Span, id: HirId) {
             cx,
             UNICODE_NOT_NFC,
             span,
-            "non-nfc unicode sequence detected",
+            "non-NFC Unicode sequence detected",
             "consider replacing the string with",
             string.nfc().collect::<String>(),
             Applicability::MachineApplicable,

diff --git a/tests/ui/unicode.stderr b/tests/ui/unicode.stderr
index 641680431a2cb2ccc6a6441688559f6e6d63fb32..4575a132e5b2c8de599253e5e944993133443138 100644 (file)
--- a/tests/ui/unicode.stderr
+++ b/tests/ui/unicode.stderr
@@ -2,15 +2,15 @@ error: zero-width space detected
   --> $DIR/unicode.rs:3:12
    |
 LL |     print!("Here >​< is a ZWS, and ​another");
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider replacing the string with: `"Here >/u{200B}< is a ZWS, and /u{200B}another"`
    |
    = note: `-D clippy::zero-width-space` implied by `-D warnings`
 
-error: non-nfc unicode sequence detected
+error: non-NFC Unicode sequence detected
   --> $DIR/unicode.rs:9:12
    |
 LL |     print!("̀àh?");
-   |            ^^^^^
+   |            ^^^^^ help: consider replacing the string with: `"̀àh?"`
    |
    = note: `-D clippy::unicode-not-nfc` implied by `-D warnings`
 
@@ -18,7 +18,7 @@ error: literal non-ASCII character detected
   --> $DIR/unicode.rs:15:12
    |
 LL |     print!("Üben!");
-   |            ^^^^^^^
+   |            ^^^^^^^ help: consider replacing the string with: `"/u{dc}ben!"`
    |
    = note: `-D clippy::non-ascii-literal` implied by `-D warnings`