-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+use crate::utils::span_lint;
+use rustc::declare_lint_pass;
+use rustc::hir;
+use rustc::hir::intravisit::{walk_expr, walk_fn, FnKind, NestedVisitorMap, Visitor};
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use rustc_data_structures::fx::FxHashMap;
+use rustc_session::declare_tool_lint;
+use syntax::source_map::Span;
+use syntax::symbol::Symbol;
-
-use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use crate::rustc::{declare_tool_lint, lint_array};
-use crate::rustc::hir;
-use crate::rustc::hir::intravisit::{walk_expr, walk_fn, FnKind, NestedVisitorMap, Visitor};
-use crate::rustc_data_structures::fx::FxHashMap;
-use crate::syntax::ast;
-use crate::syntax::source_map::Span;
-use crate::syntax::symbol::LocalInternedString;
-use crate::utils::{in_macro, span_lint};
-
-/// **What it does:** Checks for unused labels.
-///
-/// **Why is this bad?** Maybe the label should be used in which case there is
-/// an error in the code or it should be removed.
-///
-/// **Known problems:** Hopefully none.
-///
-/// **Example:**
-/// ```rust,ignore
-/// fn unused_label() {
-/// 'label: for i in 1..2 {
-/// if i > 4 { continue }
-/// }
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for unused labels.
+ ///
+ /// **Why is this bad?** Maybe the label should be used in which case there is
+ /// an error in the code or it should be removed.
+ ///
+ /// **Known problems:** Hopefully none.
+ ///
+ /// **Example:**
+ /// ```rust,ignore
+ /// fn unused_label() {
+ /// 'label: for i in 1..2 {
+ /// if i > 4 { continue }
+ /// }
+ /// ```
pub UNUSED_LABEL,
complexity,
"unused labels"
}
-pub struct UnusedLabel;
-
-struct UnusedLabelVisitor<'a, 'tcx: 'a> {
- labels: FxHashMap<LocalInternedString, Span>,
+struct UnusedLabelVisitor<'a, 'tcx> {
+ labels: FxHashMap<Symbol, Span>,
cx: &'a LateContext<'a, 'tcx>,
}
-impl LintPass for UnusedLabel {
- fn get_lints(&self) -> LintArray {
- lint_array!(UNUSED_LABEL)
- }
-}
+declare_lint_pass!(UnusedLabel => [UNUSED_LABEL]);
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedLabel {
fn check_fn(
decl: &'tcx hir::FnDecl,
body: &'tcx hir::Body,
span: Span,
- fn_id: ast::NodeId,
+ fn_id: hir::HirId,
) {
- if in_macro(span) {
+ if span.from_expansion() {
return;
}
}
}
-impl<'a, 'tcx: 'a> Visitor<'tcx> for UnusedLabelVisitor<'a, 'tcx> {
+impl<'a, 'tcx> Visitor<'tcx> for UnusedLabelVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
- match expr.node {
- hir::ExprKind::Break(destination, _) | hir::ExprKind::Continue(destination) => if let Some(label) = destination.label {
- self.labels.remove(&label.ident.as_str());
+ match expr.kind {
+ hir::ExprKind::Break(destination, _) | hir::ExprKind::Continue(destination) => {
+ if let Some(label) = destination.label {
+ self.labels.remove(&label.ident.name);
+ }
},
- hir::ExprKind::Loop(_, Some(label), _) | hir::ExprKind::While(_, _, Some(label)) => {
- self.labels.insert(label.ident.as_str(), expr.span);
+ hir::ExprKind::Loop(_, Some(label), _) => {
+ self.labels.insert(label.ident.name, expr.span);
},
_ => (),
}
walk_expr(self, expr);
}
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
- NestedVisitorMap::All(&self.cx.tcx.hir)
+ NestedVisitorMap::All(&self.cx.tcx.hir())
}
}