Merge branch 'macro-use' into HEAD

[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 38fcf514626ea7313b3535b7bae890c37f9b0561..8bb209a649025d8366e5079faa4d59642e72d79b 100644 (file)
--- a/clippy_lints/src/const_static_lifetime.rs
+++ b/clippy_lints/src/const_static_lifetime.rs
@@ -1,6 +1,7 @@
 use syntax::ast::*;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use utils::{in_macro, snippet, span_lint_and_then};
+use rustc::{declare_lint, lint_array};
+use crate::utils::{in_macro, snippet, span_lint_and_then};
 
 /// **What it does:** Checks for constants with an explicit `'static` lifetime.
 ///
@@ -56,7 +57,7 @@ fn visit_type(&mut self, ty: &Ty, cx: &EarlyContext) {
                                 span_lint_and_then(
                                     cx,
                                     CONST_STATIC_LIFETIME,
-                                    lifetime.span,
+                                    lifetime.ident.span,
                                     "Constants have by default a `'static` lifetime",
                                     |db| {
                                         db.span_suggestion(ty.span, "consider removing `'static`", sugg);