diff options
| author | HampusM <hampus@hampusmat.com> | 2026-09-21 23:42:32 +0200 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2026-09-21 23:42:32 +0200 |
| commit | 7003d9de96824f3e1cb67d56c1c4be883f6e2520 (patch) | |
| tree | 896578ac2a3250e2bbbc405fbe8e1cf136ab0b90 /engine-ecs/src/component | |
| parent | dfa772c8c901500f679249c9a6e0bd25b05ca4d7 (diff) | |
refactor(engine-ecs): fix clippy lints
Diffstat (limited to 'engine-ecs/src/component')
| -rw-r--r-- | engine-ecs/src/component/storage.rs | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/engine-ecs/src/component/storage.rs b/engine-ecs/src/component/storage.rs index 5746bea..b208a90 100644 --- a/engine-ecs/src/component/storage.rs +++ b/engine-ecs/src/component/storage.rs @@ -185,7 +185,7 @@ impl Storage .collect(), }); - let found_archetypes = self.find_all_archetype_with_comps(&search_terms); + let found_archetypes = self.find_all_archetype_with_comps(search_terms); return ArchetypeRefIter { storage: self, @@ -688,16 +688,12 @@ impl<'component_storage, const TERM_CAP: usize> Iterator let mut traversal_results = ArrayVec::<TraversalResult, TERM_CAP>::default(); - if do_traversals( + do_traversals( self.storage, archetype, &self.search_terms.traverse, &mut traversal_results, - ) - .is_none() - { - return None; - }; + )?; Some((archetype, traversal_results)) }) @@ -705,8 +701,9 @@ impl<'component_storage, const TERM_CAP: usize> Iterator return Some((pre_iter_archetype, pre_iter_traversal_results)); } - let (archetype, traversal_results) = loop { - match self.dfs_iter.streaming_find(|res| { + let (archetype, traversal_results) = + loop { + match self.dfs_iter.streaming_find(|res| { matches!( res, ArchetypeAddEdgeDfsIterResult::AddEdge { .. } @@ -735,12 +732,10 @@ impl<'component_storage, const TERM_CAP: usize> Iterator add_edge_archetype, &self.search_terms.traverse, &mut traversal_results, - ) - .is_none() - { + ).is_none() { self.dfs_iter.pop(); continue; - }; + } break (add_edge_archetype, traversal_results); } @@ -769,9 +764,8 @@ impl<'component_storage, const TERM_CAP: usize> Iterator }, ); - let found = self.find_edges_of_imaginary_archetype( - add_edge_archetype_comps.clone(), - ); + let found = + self.find_edges_of_imaginary_archetype(&add_edge_archetype_comps); self.dfs_iter.push(( BorrowedOrOwned::Owned(Archetype::new( @@ -785,7 +779,7 @@ impl<'component_storage, const TERM_CAP: usize> Iterator unreachable!(); } } - }; + }; Some((archetype, traversal_results)) } @@ -795,7 +789,7 @@ impl<const TERM_CAP: usize> ArchetypeRefIter<'_, '_, TERM_CAP> { fn find_edges_of_imaginary_archetype( &self, - imaginary_archetype_comps: ArrayVec<Uid, 32>, + imaginary_archetype_comps: &ArrayVec<Uid, 32>, ) -> Vec<(Uid, ArchetypeEdges)> { self.storage |
