diff --git a/crates/re_query_cache/src/cache.rs b/crates/re_query_cache/src/cache.rs index 16442e15dfe2..6b03a1b2fe5e 100644 --- a/crates/re_query_cache/src/cache.rs +++ b/crates/re_query_cache/src/cache.rs @@ -734,9 +734,7 @@ impl CacheBucket { /// Iterate over the batches of the specified non-optional component. #[inline] - pub fn iter_component( - &self, - ) -> Option> { + pub fn iter_component(&self) -> Option> { let data = self .components .get(&C::name()) @@ -746,9 +744,7 @@ impl CacheBucket { /// Iterate over the batches of the specified optional component. #[inline] - pub fn iter_component_opt( - &self, - ) -> Option]>> { + pub fn iter_component_opt(&self) -> Option]>> { let data = self .components .get(&C::name()) @@ -823,7 +819,7 @@ impl CacheBucket { /// Get the raw batches for the specified non-optional component. #[inline] - pub fn component(&self) -> Option<&FlatVecDeque> { + pub fn component(&self) -> Option<&FlatVecDeque> { self.components .get(&C::name()) .and_then(|data| data.as_any().downcast_ref::>()) @@ -831,7 +827,7 @@ impl CacheBucket { /// Range over the batches of the specified non-optional component. #[inline] - pub fn range_component( + pub fn range_component( &self, entry_range: Range, ) -> Option> { @@ -844,9 +840,7 @@ impl CacheBucket { /// Get the raw batches for the specified optional component. #[inline] - pub fn component_opt( - &self, - ) -> Option<&FlatVecDeque>> { + pub fn component_opt(&self) -> Option<&FlatVecDeque>> { self.components .get(&C::name()) .and_then(|data| data.as_any().downcast_ref::>>()) @@ -854,7 +848,7 @@ impl CacheBucket { /// Range over the batches of the specified optional component. #[inline] - pub fn range_component_opt( + pub fn range_component_opt( &self, entry_range: Range, ) -> Option]>> { @@ -934,8 +928,8 @@ macro_rules! impl_insert { ) -> ::re_query::Result where A: Archetype, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* { // NOTE: not `profile_function!` because we want them merged together. re_tracing::profile_scope!("CacheBucket::insert", format!("arch={} pov={} comp={}", A::name(), $N, $M)); @@ -992,7 +986,7 @@ impl CacheBucket { ) -> ::re_query::Result where A: Archetype, - R1: Component + Send + Sync + 'static, + R1: Component, { self.insert_pov1_comp0::(query_time, arch_view) } @@ -1002,7 +996,7 @@ impl CacheBucket { }); #[inline] - fn insert_component( + fn insert_component( &mut self, at: usize, arch_view: &ArchetypeView, @@ -1041,7 +1035,7 @@ impl CacheBucket { /// This will insert an empty slice for a missing component (instead of N `None` values). #[inline] - fn insert_component_opt( + fn insert_component_opt( &mut self, at: usize, arch_view: &ArchetypeView, diff --git a/crates/re_query_cache/src/latest_at.rs b/crates/re_query_cache/src/latest_at.rs index c446fb3b8e37..4804b513801d 100644 --- a/crates/re_query_cache/src/latest_at.rs +++ b/crates/re_query_cache/src/latest_at.rs @@ -145,8 +145,8 @@ macro_rules! impl_query_archetype_latest_at { ) -> ::re_query::Result<()> where A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* F: FnMut( ( (TimeInt, RowId), diff --git a/crates/re_query_cache/src/query.rs b/crates/re_query_cache/src/query.rs index cace18c9041c..50e4036bff32 100644 --- a/crates/re_query_cache/src/query.rs +++ b/crates/re_query_cache/src/query.rs @@ -39,7 +39,7 @@ impl Caches { ) -> ::re_query::Result<()> where A: Archetype + 'a, - R1: Component + Send + Sync + 'static, + R1: Component, F: FnMut(((TimeInt, RowId), &[InstanceKey], &[R1])), { self.query_archetype_pov1_comp0::(store, query, entity_path, f) @@ -60,8 +60,8 @@ macro_rules! impl_query_archetype { ) -> ::re_query::Result<()> where A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* F: FnMut( ( (TimeInt, RowId), @@ -159,7 +159,7 @@ impl Caches { ) -> ::re_query::Result<()> where A: Archetype + 'a, - R1: Component + Send + Sync + 'static, + R1: Component, F: FnMut(((TimeInt, RowId), &[InstanceKey], &[R1])), { self.query_archetype_with_history_pov1_comp0::( @@ -186,8 +186,8 @@ macro_rules! impl_query_archetype_with_history { ) -> ::re_query::Result<()> where A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* F: FnMut( ( (TimeInt, RowId), diff --git a/crates/re_query_cache/src/range.rs b/crates/re_query_cache/src/range.rs index 2a44304d8d6b..39ffcc07fd91 100644 --- a/crates/re_query_cache/src/range.rs +++ b/crates/re_query_cache/src/range.rs @@ -165,8 +165,8 @@ macro_rules! impl_query_archetype_range { ) -> ::re_query::Result<()> where A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* F: FnMut( std::ops::Range, ( @@ -218,8 +218,8 @@ macro_rules! impl_query_archetype_range { ) -> crate::Result where A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* { re_tracing::profile_scope!("fill"); diff --git a/crates/re_query_cache2/src/latest_at/results.rs b/crates/re_query_cache2/src/latest_at/results.rs index 0028adcf41f5..3355be18c032 100644 --- a/crates/re_query_cache2/src/latest_at/results.rs +++ b/crates/re_query_cache2/src/latest_at/results.rs @@ -180,7 +180,7 @@ impl CachedLatestAtComponentResults { /// Use [`PromiseResult::flatten`] to merge the results of resolving the promise and of /// deserializing the data into a single one, if you don't need the extra flexibility. #[inline] - pub fn to_dense( + pub fn to_dense( &self, resolver: &PromiseResolver, ) -> PromiseResult> { @@ -201,7 +201,7 @@ impl CachedLatestAtComponentResults { /// Use [`PromiseResult::flatten`] to merge the results of resolving the promise and of /// deserializing the data into a single one, if you don't need the extra flexibility. #[inline] - pub fn iter_dense( + pub fn iter_dense( &self, resolver: &PromiseResolver, ) -> PromiseResult>> { @@ -216,7 +216,7 @@ impl CachedLatestAtComponentResults { /// Use [`PromiseResult::flatten`] to merge the results of resolving the promise and of /// deserializing the data into a single one, if you don't need the extra flexibility. #[inline] - pub fn to_sparse( + pub fn to_sparse( &self, resolver: &PromiseResolver, ) -> PromiseResult]>> { @@ -237,7 +237,7 @@ impl CachedLatestAtComponentResults { /// Use [`PromiseResult::flatten`] to merge the results of resolving the promise and of /// deserializing the data into a single one, if you don't need the extra flexibility. #[inline] - pub fn iter_sparse( + pub fn iter_sparse( &self, resolver: &PromiseResolver, ) -> PromiseResult>>> { @@ -247,10 +247,7 @@ impl CachedLatestAtComponentResults { } impl CachedLatestAtComponentResults { - fn downcast_dense( - &self, - cell: &DataCell, - ) -> crate::Result<&[C]> { + fn downcast_dense(&self, cell: &DataCell) -> crate::Result<&[C]> { // `OnceLock::get` is non-blocking -- this is a best-effort fast path in case the // data has already been computed. // @@ -276,10 +273,7 @@ impl CachedLatestAtComponentResults { downcast(&**cached) } - fn downcast_sparse( - &self, - cell: &DataCell, - ) -> crate::Result<&[Option]> { + fn downcast_sparse(&self, cell: &DataCell) -> crate::Result<&[Option]> { // `OnceLock::get` is non-blocking -- this is a best-effort fast path in case the // data has already been computed. // @@ -306,9 +300,7 @@ impl CachedLatestAtComponentResults { } } -fn downcast( - cached: &(dyn ErasedFlatVecDeque + Send + Sync), -) -> crate::Result<&[C]> { +fn downcast(cached: &(dyn ErasedFlatVecDeque + Send + Sync)) -> crate::Result<&[C]> { let cached = cached .as_any() .downcast_ref::>() @@ -324,7 +316,7 @@ fn downcast( Ok(cached.iter().next().unwrap()) } -fn downcast_opt( +fn downcast_opt( cached: &(dyn ErasedFlatVecDeque + Send + Sync), ) -> crate::Result<&[Option]> { let cached = cached diff --git a/crates/re_space_view_spatial/src/visualizers/entity_iterator.rs b/crates/re_space_view_spatial/src/visualizers/entity_iterator.rs index 7ad1205b334b..746f7fa2a313 100644 --- a/crates/re_space_view_spatial/src/visualizers/entity_iterator.rs +++ b/crates/re_space_view_spatial/src/visualizers/entity_iterator.rs @@ -130,8 +130,8 @@ macro_rules! impl_process_archetype { where S: IdentifiedViewSystem, A: Archetype + 'a, - $($pov: Component + Send + Sync + 'static,)+ - $($comp: Component + Send + Sync + 'static,)* + $($pov: Component,)+ + $($comp: Component,)* F: FnMut( &ViewerContext<'_>, &EntityPath,