mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address review comment

Browse Source 
https://github.com/rust-lang/rust-clippy/pull/13286#discussion_r1780038602
This commit is contained in:
Samuel Moelius 2024-09-29 18:21:47 -04:00
parent b3cf448761
commit 54e4761d05
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clippy_lints/src/lifetimes.rs
View File

@ -506,8 +506,17 @@ struct LifetimeChecker<'cx, 'tcx, F> {
} }
impl<'cx, 'tcx, F> LifetimeChecker<'cx, 'tcx, F> { impl<'cx, 'tcx, F> LifetimeChecker<'cx, 'tcx, F> {
fn new(cx: &'cx LateContext<'tcx>, def_ids: Vec<LocalDefId>) -> LifetimeChecker<'cx, 'tcx, F> { fn new(cx: &'cx LateContext<'tcx>, generics: &'tcx Generics<'_>) -> LifetimeChecker<'cx, 'tcx, F> {
let map = def_ids.into_iter().map(|def_id| (def_id, Vec::new())).collect(); let map = generics
.params
.iter()
.filter_map(|par| match par.kind {
GenericParamKind::Lifetime {
kind: LifetimeParamKind::Explicit,
} => Some((par.def_id, Vec::new())),
_ => None,
})
.collect();
Self { Self {
cx, cx,
map, map,
@ -556,17 +565,7 @@ fn nested_visit_map(&mut self) -> Self::Map {
} }
fn report_extra_lifetimes<'tcx>(cx: &LateContext<'tcx>, func: &'tcx FnDecl<'_>, generics: &'tcx Generics<'_>) { fn report_extra_lifetimes<'tcx>(cx: &LateContext<'tcx>, func: &'tcx FnDecl<'_>, generics: &'tcx Generics<'_>) {
let def_ids = generics let mut checker = LifetimeChecker::<hir_nested_filter::None>::new(cx, generics);
.params
.iter()
.filter_map(|par| match par.kind {
GenericParamKind::Lifetime {
kind: LifetimeParamKind::Explicit,
} => Some(par.def_id),
_ => None,
})
.collect();
let mut checker = LifetimeChecker::<hir_nested_filter::None>::new(cx, def_ids);
walk_generics(&mut checker, generics); walk_generics(&mut checker, generics);
walk_fn_decl(&mut checker, func); walk_fn_decl(&mut checker, func);
@ -587,18 +586,7 @@ fn report_extra_lifetimes<'tcx>(cx: &LateContext<'tcx>, func: &'tcx FnDecl<'_>,
} }
fn report_extra_impl_lifetimes<'tcx>(cx: &LateContext<'tcx>, impl_: &'tcx Impl<'_>) { fn report_extra_impl_lifetimes<'tcx>(cx: &LateContext<'tcx>, impl_: &'tcx Impl<'_>) {
let def_ids = impl_ let mut checker = LifetimeChecker::<middle_nested_filter::All>::new(cx, impl_.generics);
.generics
.params
.iter()
.filter_map(|par| match par.kind {
GenericParamKind::Lifetime {
kind: LifetimeParamKind::Explicit,
} => Some(par.def_id),
_ => None,
})
.collect();
let mut checker = LifetimeChecker::<middle_nested_filter::All>::new(cx, def_ids);
walk_generics(&mut checker, impl_.generics); walk_generics(&mut checker, impl_.generics);
if let Some(ref trait_ref) = impl_.of_trait { if let Some(ref trait_ref) = impl_.of_trait {