MutImmutable -> Immutable, MutMutable -> Mutable, CaptureClause -> CaptureBy

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

diff --git a/clippy_lints/src/unused_label.rs b/clippy_lints/src/unused_label.rs
index 197b9a8146edcffbbcb95e87bd8f3b1192f17377..721458e1d9a19ffcb852baa21f266a2dcf31747a 100644 (file)
--- a/clippy_lints/src/unused_label.rs
+++ b/clippy_lints/src/unused_label.rs
@@ -5,7 +5,7 @@
 use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_data_structures::fx::FxHashMap;
 use syntax::source_map::Span;
-use syntax::symbol::LocalInternedString;
+use syntax::symbol::Symbol;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for unused labels.
@@ -28,7 +28,7 @@
 }
 
 struct UnusedLabelVisitor<'a, 'tcx> {
-    labels: FxHashMap<LocalInternedString, Span>,
+    labels: FxHashMap<Symbol, Span>,
     cx: &'a LateContext<'a, 'tcx>,
 }
 
@@ -62,14 +62,14 @@ fn check_fn(
 
 impl<'a, 'tcx> Visitor<'tcx> for UnusedLabelVisitor<'a, 'tcx> {
     fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
-        match expr.node {
+        match expr.kind {
             hir::ExprKind::Break(destination, _) | hir::ExprKind::Continue(destination) => {
                 if let Some(label) = destination.label {
-                    self.labels.remove(&label.ident.as_str());
+                    self.labels.remove(&label.ident.name);
                 }
             },
             hir::ExprKind::Loop(_, Some(label), _) => {
-                self.labels.insert(label.ident.as_str(), expr.span);
+                self.labels.insert(label.ident.name, expr.span);
             },
             _ => (),
         }