diff --git a/clippy_lints/src/exit.rs b/clippy_lints/src/exit.rs index 7220833b9f23..986c3d97b58b 100644 --- a/clippy_lints/src/exit.rs +++ b/clippy_lints/src/exit.rs @@ -32,8 +32,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Exit { if let Some(def_id) = qpath_res(cx, path, path_expr.hir_id).opt_def_id(); if match_def_path(cx, def_id, &paths::EXIT); then { - let mut parent = cx.tcx.hir().get_parent_item(e.hir_id); - if let Some(Node::Item(Item{ident, kind: ItemKind::Fn(..), ..})) = cx.tcx.hir().find(parent) { + let parent = cx.tcx.hir().get_parent_item(e.hir_id); + if let Some(Node::Item(Item{kind: ItemKind::Fn(..), ..})) = cx.tcx.hir().find(parent) { // If the next item up is a function we check if it is an entry point // and only then emit a linter warning let def_id = cx.tcx.hir().local_def_id(parent); diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs index 4fe41a880cc7..ff874179cfff 100644 --- a/clippy_lints/src/utils/sugg.rs +++ b/clippy_lints/src/utils/sugg.rs @@ -12,9 +12,9 @@ use std::borrow::Cow; use std::convert::TryInto; use std::fmt::Display; use syntax::ast; -use syntax::parse::token; use syntax::print::pprust::token_kind_to_string; use syntax::source_map::{CharPos, Span}; +use syntax::token; use syntax::util::parser::AssocOp; use syntax_pos::{BytePos, Pos}; @@ -440,7 +440,7 @@ fn associativity(op: &AssocOp) -> Associativity { /// Converts a `hir::BinOp` to the corresponding assigning binary operator. fn hirbinop2assignop(op: hir::BinOp) -> AssocOp { - use syntax::parse::token::BinOpToken::*; + use syntax::token::BinOpToken::*; AssocOp::AssignOp(match op.node { hir::BinOpKind::Add => Plus, @@ -468,7 +468,7 @@ fn hirbinop2assignop(op: hir::BinOp) -> AssocOp { /// Converts an `ast::BinOp` to the corresponding assigning binary operator. fn astbinop2assignop(op: ast::BinOp) -> AssocOp { use syntax::ast::BinOpKind::*; - use syntax::parse::token::BinOpToken; + use syntax::token::BinOpToken; AssocOp::AssignOp(match op.node { Add => BinOpToken::Plus, diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs index 989d2f374a84..9a7cfb677108 100644 --- a/clippy_lints/src/write.rs +++ b/clippy_lints/src/write.rs @@ -4,7 +4,8 @@ use rustc::{declare_lint_pass, declare_tool_lint}; use rustc_errors::Applicability; use std::borrow::Cow; use syntax::ast::*; -use syntax::parse::{parser, token}; +use syntax::parse::parser; +use syntax::token; use syntax::tokenstream::TokenStream; use syntax_pos::{BytePos, Span};