Rustup

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

diff --git a/clippy_lints/src/blacklisted_name.rs b/clippy_lints/src/blacklisted_name.rs
index 6b0af9849e85be18c9c02fd5fc91d8ccae6566f0..29660399233038f7f33fb3bfcd9639329b2c04d4 100644 (file)
--- a/clippy_lints/src/blacklisted_name.rs
+++ b/clippy_lints/src/blacklisted_name.rs
@@ -1,6 +1,6 @@
 use rustc::lint::*;
 use rustc::hir::*;
-use utils::span_lint;
+use crate::utils::span_lint;
 
 /// **What it does:** Checks for usage of blacklisted names for variables, such
 /// as `foo`.
@@ -14,9 +14,9 @@
 /// ```rust
 /// let foo = 3.14;
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub BLACKLISTED_NAME,
-    Warn,
+    style,
     "usage of a blacklisted/placeholder name"
 }
 
@@ -26,8 +26,10 @@ pub struct BlackListedName {
 }
 
 impl BlackListedName {
-    pub fn new(blacklist: Vec<String>) -> BlackListedName {
-        BlackListedName { blacklist: blacklist }
+    pub fn new(blacklist: Vec<String>) -> Self {
+        Self {
+            blacklist,
+        }
     }
 }
 
@@ -39,12 +41,14 @@ fn get_lints(&self) -> LintArray {
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BlackListedName {
     fn check_pat(&mut self, cx: &LateContext<'a, 'tcx>, pat: &'tcx Pat) {
-        if let PatKind::Binding(_, _, ref ident, _) = pat.node {
-            if self.blacklist.iter().any(|s| *s == *ident.node.as_str()) {
-                span_lint(cx,
-                          BLACKLISTED_NAME,
-                          pat.span,
-                          &format!("use of a blacklisted/placeholder name `{}`", ident.node));
+        if let PatKind::Binding(_, _, ident, _) = pat.node {
+            if self.blacklist.iter().any(|s| ident.name == *s) {
+                span_lint(
+                    cx,
+                    BLACKLISTED_NAME,
+                    ident.span,
+                    &format!("use of a blacklisted/placeholder name `{}`", ident.name),
+                );
             }
         }
     }