From: Michael Wright <mikerite@lavabit.com>
Date: Sun, 8 Jul 2018 06:03:11 +0000 (+0200)
Subject: Remove duplication in missing_inline
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=60af4a8e13a054e177461a75d254aff11cc482a3;p=rust.git

Remove duplication in missing_inline
---

diff --git a/clippy_lints/src/missing_inline.rs b/clippy_lints/src/missing_inline.rs
index 7b13aee9a55..6987eaa71d9 100644
--- a/clippy_lints/src/missing_inline.rs
+++ b/clippy_lints/src/missing_inline.rs
@@ -169,28 +169,19 @@ fn check_impl_item(&mut self, cx: &LateContext<'a, 'tcx>, impl_item: &'tcx hir::
         };
 
         let def_id = cx.tcx.hir.local_def_id(impl_item.id);
-        match cx.tcx.associated_item(def_id).container {
-            TraitContainer(cid) => {
-                if let Some(n) = cx.tcx.hir.as_local_node_id(cid) {
-                    if !cx.access_levels.is_exported(n) {
-                        // If a trait is being implemented for an item, and the
-                        // trait is not exported, we don't need #[inline]
-                        return;
-                    }
-                }
-            },
-            ImplContainer(cid) => {
-                if cx.tcx.impl_trait_ref(cid).is_some() {
-                    let trait_ref = cx.tcx.impl_trait_ref(cid).unwrap();
-                    if let Some(n) = cx.tcx.hir.as_local_node_id(trait_ref.def_id) {
-                        if !cx.access_levels.is_exported(n) {
-                            // If a trait is being implemented for an item, and the
-                            // trait is not exported, we don't need #[inline]
-                            return;
-                        }
-                    }
+        let trait_def_id = match cx.tcx.associated_item(def_id).container {
+            TraitContainer(cid) => Some(cid),
+            ImplContainer(cid) => cx.tcx.impl_trait_ref(cid).map(|t| t.def_id),
+        };
+
+        if let Some(trait_def_id) = trait_def_id {
+            if let Some(n) = cx.tcx.hir.as_local_node_id(trait_def_id) {
+                if !cx.access_levels.is_exported(n) {
+                    // If a trait is being implemented for an item, and the
+                    // trait is not exported, we don't need #[inline]
+                    return;
                 }
-            },
+            }
         }
 
         check_missing_inline_attrs(cx, &impl_item.attrs, impl_item.span, desc);