Merge branch 'macro-use' into HEAD

[rust.git] / clippy_lints / src / unicode.rs

diff --git a/clippy_lints/src/unicode.rs b/clippy_lints/src/unicode.rs
index 1d5ab7db3461c2749f857305df20031303125150..c4a795bfacb342430df1b60a86c8546182082888 100644 (file)
--- a/clippy_lints/src/unicode.rs
+++ b/clippy_lints/src/unicode.rs
@@ -1,9 +1,10 @@
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
-use syntax::ast::LitKind;
+use syntax::ast::{LitKind, NodeId};
 use syntax::codemap::Span;
 use unicode_normalization::UnicodeNormalization;
-use utils::{snippet, span_help_and_lint};
+use crate::utils::{is_allowed, snippet, span_help_and_lint};
 
 /// **What it does:** Checks for the Unicode zero-width space in the code.
 ///
@@ -12,10 +13,11 @@
 ///
 /// **Known problems:** None.
 ///
-/// **Example:** You don't see it, but there may be a zero-width space somewhere in this text.
-declare_lint! {
+/// **Example:** You don't see it, but there may be a zero-width space
+/// somewhere in this text.
+declare_clippy_lint! {
     pub ZERO_WIDTH_SPACE,
-    Deny,
+    correctness,
     "using a zero-width space in a string literal, which is confusing"
 }
 
@@ -33,9 +35,9 @@
 /// ```rust
 /// let x = "Hä?"
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub NON_ASCII_LITERAL,
-    Allow,
+    pedantic,
     "using any literal non-ASCII chars in a string literal instead of \
      using the `\\u` escape"
 }
@@ -51,9 +53,9 @@
 ///
 /// **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}"`.
-declare_lint! {
+declare_clippy_lint! {
     pub UNICODE_NOT_NFC,
-    Allow,
+    pedantic,
     "using a unicode literal not in NFC normal form (see \
      [unicode tr15](http://www.unicode.org/reports/tr15/) for further information)"
 }
@@ -70,9 +72,9 @@ fn get_lints(&self) -> LintArray {
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Unicode {
     fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
-        if let ExprLit(ref lit) = expr.node {
+        if let ExprKind::Lit(ref lit) = expr.node {
             if let LitKind::Str(_, _) = lit.node {
-                check_str(cx, lit.span)
+                check_str(cx, lit.span, expr.id)
             }
         }
     }
@@ -92,33 +94,43 @@ fn escape<T: Iterator<Item = char>>(s: T) -> String {
     result
 }
 
-fn check_str(cx: &LateContext, span: Span) {
+fn check_str(cx: &LateContext, span: Span, id: NodeId) {
     let string = snippet(cx, span, "");
     if string.contains('\u{200B}') {
-        span_help_and_lint(cx,
-                           ZERO_WIDTH_SPACE,
-                           span,
-                           "zero-width space detected",
-                           &format!("Consider replacing the string with:\n\"{}\"",
-                                    string.replace("\u{200B}", "\\u{200B}")));
+        span_help_and_lint(
+            cx,
+            ZERO_WIDTH_SPACE,
+            span,
+            "zero-width space detected",
+            &format!(
+                "Consider replacing the string with:\n\"{}\"",
+                string.replace("\u{200B}", "\\u{200B}")
+            ),
+        );
     }
     if string.chars().any(|c| c as u32 > 0x7F) {
-        span_help_and_lint(cx,
-                           NON_ASCII_LITERAL,
-                           span,
-                           "literal non-ASCII character detected",
-                           &format!("Consider replacing the string with:\n\"{}\"",
-                                    if cx.current_level(UNICODE_NOT_NFC) == Level::Allow {
-                                        escape(string.chars())
-                                    } else {
-                                        escape(string.nfc())
-                                    }));
+        span_help_and_lint(
+            cx,
+            NON_ASCII_LITERAL,
+            span,
+            "literal non-ASCII character detected",
+            &format!(
+                "Consider replacing the string with:\n\"{}\"",
+                if is_allowed(cx, UNICODE_NOT_NFC, id) {
+                    escape(string.chars())
+                } else {
+                    escape(string.nfc())
+                }
+            ),
+        );
     }
-    if cx.current_level(NON_ASCII_LITERAL) == Level::Allow && string.chars().zip(string.nfc()).any(|(a, b)| a != b) {
-        span_help_and_lint(cx,
-                           UNICODE_NOT_NFC,
-                           span,
-                           "non-nfc unicode sequence detected",
-                           &format!("Consider replacing the string with:\n\"{}\"", string.nfc().collect::<String>()));
+    if is_allowed(cx, NON_ASCII_LITERAL, id) && string.chars().zip(string.nfc()).any(|(a, b)| a != b) {
+        span_help_and_lint(
+            cx,
+            UNICODE_NOT_NFC,
+            span,
+            "non-nfc unicode sequence detected",
+            &format!("Consider replacing the string with:\n\"{}\"", string.nfc().collect::<String>()),
+        );
     }
 }