Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2902 from mikerite/missing_inline_refactor

Browse source 
Remove duplication in missing_inline
This commit is contained in:
Philipp Krones 2018-07-09 19:46:17 +02:00 committed by GitHub
commit aeb653f110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
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 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 !cx.access_levels.is_exported(n) {
// If a trait is being implemented for an item, and the // If a trait is being implemented for an item, and the
// trait is not exported, we don't need #[inline] // trait is not exported, we don't need #[inline]
return; 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);