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

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

diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs
index ff75fbaa55f223bcd51bf161ca613eab6b411fcb..4f27d38c12fe408fe066ed85bf66f746d18812fd 100644 (file)
--- a/clippy_lints/src/lifetimes.rs
+++ b/clippy_lints/src/lifetimes.rs
@@ -6,7 +6,7 @@
 use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use syntax::source_map::Span;
-use syntax::symbol::keywords;
+use syntax::symbol::kw;
 
 use crate::reexport::*;
 use crate::utils::{last_path_segment, span_lint};
@@ -476,8 +476,8 @@ struct BodyLifetimeChecker {
 impl<'tcx> Visitor<'tcx> for BodyLifetimeChecker {
     // for lifetimes as parameters of generics
     fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
-        if lifetime.name.ident().name != keywords::Invalid.name()
-            && lifetime.name.ident().name != syntax::symbol::keywords::StaticLifetime.name()
+        if lifetime.name.ident().name != kw::Invalid
+            && lifetime.name.ident().name != kw::StaticLifetime
         {
             self.lifetimes_used_in_body = true;
         }