From fb47933690dfb54206e9f136902671b19ddd34e0 Mon Sep 17 00:00:00 2001 From: HampusM Date: Tue, 22 Apr 2025 18:06:59 +0200 Subject: refactor(ecs): fix clippy lints --- ecs/src/component/storage/archetype.rs | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'ecs/src/component/storage') diff --git a/ecs/src/component/storage/archetype.rs b/ecs/src/component/storage/archetype.rs index f8c204b..56dd5ae 100644 --- a/ecs/src/component/storage/archetype.rs +++ b/ecs/src/component/storage/archetype.rs @@ -155,7 +155,7 @@ impl Archetype inner: Either::B( [component_id] .into_iter() - .zip(self.get_index_for_component(component_id).into_iter()), + .zip(self.get_index_for_component(component_id)), ), } } @@ -219,19 +219,20 @@ type MatchingComponentIterFilterFn = fn(&((usize, &Uid), Uid)) -> bool; type MatchingComponentIterMapFn = fn(((usize, &Uid), Uid)) -> (Uid, usize); +type InnerMatchingComponentIterA<'archetype> = Map< + Filter< + Zip>, RepeatN>, + MatchingComponentIterFilterFn, + >, + MatchingComponentIterMapFn, +>; + +type InnerMatchingComponentIterB = Zip, OptionIntoIter>; + #[derive(Debug)] pub struct MatchingComponentIter<'archetype> { - inner: Either< - Map< - Filter< - Zip>, RepeatN>, - MatchingComponentIterFilterFn, - >, - MatchingComponentIterMapFn, - >, - Zip, OptionIntoIter>, - >, + inner: Either, InnerMatchingComponentIterB>, } impl Iterator for MatchingComponentIter<'_> -- cgit v1.2.3-18-g5258