From 1ba8ed96cfebb9936f5ff2d6af962159ab08c8e2 Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Fri, 2 Dec 2016 22:33:16 +0100
Subject: [PATCH] Fix dogfood

---
 clippy_lints/src/lifetimes.rs | 2 +-
 clippy_lints/src/types.rs     | 2 +-
 clippy_lints/src/utils/mod.rs | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs
index 6d100317fd8..57e25b44484 100644
--- a/clippy_lints/src/lifetimes.rs
+++ b/clippy_lints/src/lifetimes.rs
@@ -241,7 +241,7 @@ impl<'v, 't> RefVisitor<'v, 't> {
 
     fn collect_anonymous_lifetimes(&mut self, qpath: &QPath, ty: &Ty) {
         let last_path_segment = &last_path_segment(qpath).parameters;
-        if let &AngleBracketedParameters(ref params) = last_path_segment {
+        if let AngleBracketedParameters(ref params) = *last_path_segment {
             if params.lifetimes.is_empty() {
                 match self.cx.tcx.tables().qpath_def(qpath, ty.id) {
                     Def::TyAlias(def_id) |
diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs
index 15e5f3f58db..294ca88b70f 100644
--- a/clippy_lints/src/types.rs
+++ b/clippy_lints/src/types.rs
@@ -77,7 +77,7 @@ impl LateLintPass for TypePass {
         if let TyPath(ref qpath) = ast_ty.node {
             let def = cx.tcx.tables().qpath_def(qpath, ast_ty.id);
             if let Some(def_id) = opt_def_id(def) {
-                if def_id == cx.tcx.lang_items.owned_box().unwrap() {
+                if Some(def_id) == cx.tcx.lang_items.owned_box() {
                     let last = last_path_segment(qpath);
                     if_let_chain! {[
                         let PathParameters::AngleBracketedParameters(ref ag) = last.parameters,
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index cb25759b4ae..05bd059d58a 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -159,9 +159,6 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
     let mut apb = AbsolutePathBuffer { names: vec![] };
 
     cx.tcx.push_item_path(&mut apb, def_id);
-    if path == paths::VEC_FROM_ELEM {
-        println!("{:#?} == {:#?}", apb.names, path);
-    }
 
     apb.names.len() == path.len() &&
     apb.names.iter().zip(path.iter()).all(|(a, &b)| &**a == b)
@@ -214,7 +211,7 @@ pub fn last_path_segment(path: &QPath) -> &PathSegment {
         QPath::Resolved(_, ref path) => path.segments
                                             .last()
                                             .expect("A path must have at least one segment"),
-        QPath::TypeRelative(_, ref seg) => &seg,
+        QPath::TypeRelative(_, ref seg) => seg,
     }
 }
 
@@ -222,7 +219,7 @@ pub fn single_segment_path(path: &QPath) -> Option<&PathSegment> {
     match *path {
         QPath::Resolved(_, ref path) if path.segments.len() == 1 => Some(&path.segments[0]),
         QPath::Resolved(..) => None,
-        QPath::TypeRelative(_, ref seg) => Some(&seg),
+        QPath::TypeRelative(_, ref seg) => Some(seg),
     }
 }