squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Remove duplication in missing_inline

Browse source
This commit is contained in:
Michael Wright 2018-07-08 08:03:11 +02:00
parent d914106d87
commit 60af4a8e13
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
clippy_lints/src/missing_inline.rs
View file

@ -169,28 +169,19 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline {
}; };
let def_id = cx.tcx.hir.local_def_id(impl_item.id); let def_id = cx.tcx.hir.local_def_id(impl_item.id);
match cx.tcx.associated_item(def_id).container { let trait_def_id = match cx.tcx.associated_item(def_id).container {
TraitContainer(cid) => { TraitContainer(cid) => Some(cid),
if let Some(n) = cx.tcx.hir.as_local_node_id(cid) { ImplContainer(cid) => cx.tcx.impl_trait_ref(cid).map(|t| t.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] if let Some(trait_def_id) = trait_def_id {
return; 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;
} }
}, }
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;
}
}
}
},
} }
check_missing_inline_attrs(cx, &impl_item.attrs, impl_item.span, desc); check_missing_inline_attrs(cx, &impl_item.attrs, impl_item.span, desc);