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 c045c870810b086bad98cc7a205bd88358127801..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, NodeId};
 use syntax::codemap::Span;
 use unicode_normalization::UnicodeNormalization;
-use utils::{is_allowed, 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.
 ///
@@ -14,9 +15,9 @@
 ///
 /// **Example:** You don't see it, but there may be a zero-width space
 /// somewhere in this text.
-declare_lint! {
+declare_clippy_lint! {
     pub ZERO_WIDTH_SPACE,
-    Deny,
+    correctness,
     "using a zero-width space in a string literal, which is confusing"
 }
 
@@ -34,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"
 }
@@ -52,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)"
 }
@@ -71,7 +72,7 @@ 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, expr.id)
             }