Update imports and rustup

clippy_lints/src/utils/author.rs

@@ -3,7 +3,7 @@
 
 #![allow(print_stdout, use_debug)]
 
-use rustc::lint::*;
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_lint, lint_array};
 use rustc::hir;
 use rustc::hir::{Expr, ExprKind, QPath, TyKind, Pat, PatKind, BindingAnnotation, StmtKind, DeclKind, Stmt};

clippy_lints/src/utils/hir_utils.rs

@@ -1,5 +1,5 @@
 use crate::consts::{constant_simple, constant_context};
-use rustc::lint::*;
+use rustc::lint::LateContext;
 use rustc::hir::*;
 use rustc::ty::{TypeckTables};
 use std::hash::{Hash, Hasher};

clippy_lints/src/utils/inspector.rs

@@ -2,7 +2,7 @@
 
 //! checks for attributes
 
-use rustc::lint::*;
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_lint, lint_array};
 use rustc::hir;
 use rustc::hir::print;

clippy_lints/src/utils/internal_lints.rs

@@ -1,4 +1,4 @@
-use rustc::lint::*;
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass, EarlyContext, EarlyLintPass};
 use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
 use rustc::hir;

clippy_lints/src/utils/mod.rs

@@ -6,7 +6,7 @@ use rustc::hir::*;
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
 use rustc::hir::def::Def;
 use rustc::hir::intravisit::{NestedVisitorMap, Visitor};
-use rustc::hir::map::Node;
+use rustc::hir::Node;
 use rustc::lint::{LateContext, Level, Lint, LintContext};
 use rustc::session::Session;
 use rustc::traits;
@@ -309,9 +309,9 @@ pub fn method_chain_args<'a>(expr: &'a Expr, methods: &[&str]) -> Option<Vec<&'a
 pub fn get_item_name(cx: &LateContext<'_, '_>, expr: &Expr) -> Option<Name> {
     let parent_id = cx.tcx.hir.get_parent(expr.id);
     match cx.tcx.hir.find(parent_id) {
-        Some(Node::NodeItem(&Item { ref name, .. })) => Some(*name),
-        Some(Node::NodeTraitItem(&TraitItem { ident, .. })) |
-        Some(Node::NodeImplItem(&ImplItem { ident, .. })) => Some(ident.name),
+        Some(Node::Item(&Item { ref name, .. })) => Some(*name),
+        Some(Node::TraitItem(&TraitItem { ident, .. })) |
+        Some(Node::ImplItem(&ImplItem { ident, .. })) => Some(ident.name),
         _ => None,
     }
 }
@@ -464,7 +464,7 @@ pub fn get_parent_expr<'c>(cx: &'c LateContext<'_, '_>, e: &Expr) -> Option<&'c
         return None;
     }
     map.find(parent_id).and_then(|node| {
-        if let Node::NodeExpr(parent) = node {
+        if let Node::Expr(parent) = node {
             Some(parent)
         } else {
             None
@@ -478,11 +478,11 @@ pub fn get_enclosing_block<'a, 'tcx: 'a>(cx: &LateContext<'a, 'tcx>, node: NodeI
         .and_then(|enclosing_id| map.find(enclosing_id));
     if let Some(node) = enclosing_node {
         match node {
-            Node::NodeBlock(block) => Some(block),
-            Node::NodeItem(&Item {
+            Node::Block(block) => Some(block),
+            Node::Item(&Item {
                 node: ItemKind::Fn(_, _, _, eid),
                 ..
-            }) | Node::NodeImplItem(&ImplItem {
+            }) | Node::ImplItem(&ImplItem {
                 node: ImplItemKind::Method(_, eid),
                 ..
             }) => match cx.tcx.hir.body(eid).value.node {

clippy_lints/src/utils/usage.rs

@@ -1,4 +1,4 @@
-use rustc::lint::*;
+use rustc::lint::LateContext;
 
 use rustc::hir::def::Def;
 use rustc::hir::*;