From b778659c42eb395babd0b940e3bc5167a89280f6 Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@ftbfs.org>
Date: Sun, 5 Nov 2017 04:19:11 -0800
Subject: [PATCH] Fix compilation errors with rustc 1.23.0-nightly (d762b1d6c
 2017-11-04)

Fixes #2204
---
 clippy_lints/src/functions.rs              |  2 +-
 clippy_lints/src/len_zero.rs               |  2 +-
 clippy_lints/src/missing_doc.rs            |  2 +-
 clippy_lints/src/needless_pass_by_value.rs |  2 +-
 clippy_lints/src/utils/inspector.rs        | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clippy_lints/src/functions.rs b/clippy_lints/src/functions.rs
index def357c55e3e..12e5ffa06513 100644
--- a/clippy_lints/src/functions.rs
+++ b/clippy_lints/src/functions.rs
@@ -86,7 +86,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Functions {
         use rustc::hir::map::Node::*;
 
         let is_impl = if let Some(NodeItem(item)) = cx.tcx.hir.find(cx.tcx.hir.get_parent_node(nodeid)) {
-            matches!(item.node, hir::ItemImpl(_, _, _, _, Some(_), _, _) | hir::ItemDefaultImpl(..))
+            matches!(item.node, hir::ItemImpl(_, _, _, _, Some(_), _, _) | hir::ItemAutoImpl(..))
         } else {
             false
         };
diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs
index 9b14a44f2c04..3a80f837316d 100644
--- a/clippy_lints/src/len_zero.rs
+++ b/clippy_lints/src/len_zero.rs
@@ -68,7 +68,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LenZero {
         }
 
         match item.node {
-            ItemTrait(_, _, _, ref trait_items) => check_trait_items(cx, item, trait_items),
+            ItemTrait(_, _, _, _, ref trait_items) => check_trait_items(cx, item, trait_items),
             ItemImpl(_, _, _, _, None, _, ref impl_items) => check_impl_items(cx, item, impl_items),
             _ => (),
         }
diff --git a/clippy_lints/src/missing_doc.rs b/clippy_lints/src/missing_doc.rs
index 2ad6c36ab5f0..768e6cc3ec65 100644
--- a/clippy_lints/src/missing_doc.rs
+++ b/clippy_lints/src/missing_doc.rs
@@ -132,7 +132,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
             hir::ItemGlobalAsm(..) => "an assembly blob",
             hir::ItemTy(..) => "a type alias",
             hir::ItemUnion(..) => "a union",
-            hir::ItemDefaultImpl(..) |
+            hir::ItemAutoImpl(..) |
             hir::ItemExternCrate(..) |
             hir::ItemForeignMod(..) |
             hir::ItemImpl(..) |
diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs
index ac965a59bd51..45ea040362ad 100644
--- a/clippy_lints/src/needless_pass_by_value.rs
+++ b/clippy_lints/src/needless_pass_by_value.rs
@@ -87,7 +87,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
 
         // Exclude non-inherent impls
         if let Some(NodeItem(item)) = cx.tcx.hir.find(cx.tcx.hir.get_parent_node(node_id)) {
-            if matches!(item.node, ItemImpl(_, _, _, _, Some(_), _, _) | ItemDefaultImpl(..)) {
+            if matches!(item.node, ItemImpl(_, _, _, _, Some(_), _, _) | ItemAutoImpl(..)) {
                 return;
             }
         }
diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs
index bf3aa3f6b69a..ae1d9462b7ca 100644
--- a/clippy_lints/src/utils/inspector.rs
+++ b/clippy_lints/src/utils/inspector.rs
@@ -397,14 +397,14 @@ fn print_item(cx: &LateContext, item: &hir::Item) {
         },
         hir::ItemTrait(..) => {
             println!("trait decl");
-            if cx.tcx.trait_has_default_impl(did) {
-                println!("trait has a default impl");
+            if cx.tcx.trait_is_auto(did) {
+                println!("trait is auto");
             } else {
-                println!("trait has no default impl");
+                println!("trait is not auto");
             }
         },
-        hir::ItemDefaultImpl(_, ref _trait_ref) => {
-            println!("default impl");
+        hir::ItemAutoImpl(_, ref _trait_ref) => {
+            println!("auto impl");
         },
         hir::ItemImpl(_, _, _, _, Some(ref _trait_ref), _, _) => {
             println!("trait impl");