Rustup to https://github.com/rust-lang/rust/pull/60740

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

diff --git a/clippy_lints/src/const_static_lifetime.rs b/clippy_lints/src/const_static_lifetime.rs
index 1e369044d2469a464613e2093ba4d23db79ec2c8..fefd180953f29928fac540cf1e3098ec87d2b86c 100644 (file)
--- a/clippy_lints/src/const_static_lifetime.rs
+++ b/clippy_lints/src/const_static_lifetime.rs
@@ -1,6 +1,6 @@
-use crate::utils::{in_macro, snippet, span_lint_and_then};
+use crate::utils::{in_macro_or_desugar, snippet, span_lint_and_then};
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, lint_array};
+use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_errors::Applicability;
 use syntax::ast::*;
 
@@ -26,17 +26,7 @@
     "Using explicit `'static` lifetime for constants when elision rules would allow omitting them."
 }
 
-pub struct StaticConst;
-
-impl LintPass for StaticConst {
-    fn get_lints(&self) -> LintArray {
-        lint_array!(CONST_STATIC_LIFETIME)
-    }
-
-    fn name(&self) -> &'static str {
-        "StaticConst"
-    }
-}
+declare_lint_pass!(StaticConst => [CONST_STATIC_LIFETIME]);
 
 impl StaticConst {
     // Recursively visit types
@@ -57,7 +47,7 @@ fn visit_type(&mut self, ty: &Ty, cx: &EarlyContext<'_>) {
                 if let Some(lifetime) = *optional_lifetime {
                     match borrow_type.ty.node {
                         TyKind::Path(..) | TyKind::Slice(..) | TyKind::Array(..) | TyKind::Tup(..) => {
-                            if lifetime.ident.name == "'static" {
+                            if lifetime.ident.name == syntax::symbol::kw::StaticLifetime {
                                 let snip = snippet(cx, borrow_type.ty.span, "<type>");
                                 let sugg = format!("&{}", snip);
                                 span_lint_and_then(
@@ -91,7 +81,7 @@ fn visit_type(&mut self, ty: &Ty, cx: &EarlyContext<'_>) {
 
 impl EarlyLintPass for StaticConst {
     fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
-        if !in_macro(item.span) {
+        if !in_macro_or_desugar(item.span) {
             // Match only constants...
             if let ItemKind::Const(ref var_type, _) = item.node {
                 self.visit_type(var_type, cx);