Remove #[inline(always)] where it doesn't improve or degrades perform…

…ance

crates/bevy_ecs/src/term_query/iter.rs

@@ -45,7 +45,7 @@ impl<'w, 's> TermQueryCursor<'w, 's> {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn next<Q: QueryTermGroup>(
         &mut self,
         tables: &'w Tables,
@@ -145,7 +145,7 @@ impl<'w, 's> TermQueryIterUntyped<'w, 's> {
 
 // This would be a streaming iterator if rust supported those
 impl<'w, 's> TermQueryIterUntyped<'w, 's> {
-    #[inline(always)]
+    #[inline]
     fn next_fetch<'f>(&'f mut self) -> Option<&'f [FetchedTerm<'w>]> {
         unsafe {
             self.cursor
@@ -158,7 +158,7 @@ impl<'w, 's> TermQueryIterUntyped<'w, 's> {
 impl<'w, 's> Iterator for TermQueryIterUntyped<'w, 's> {
     type Item = Vec<FetchedTerm<'w>>;
 
-    #[inline(always)]
+    #[inline]
     fn next(&mut self) -> Option<Self::Item> {
         self.next_fetch().map(|fetches| fetches.to_vec())
     }
@@ -170,7 +170,7 @@ pub struct TermQueryIter<'w, 's, Q: QueryTermGroup> {
 }
 
 impl<'w, 's, Q: QueryTermGroup> TermQueryIter<'w, 's, Q> {
-    #[inline(always)]
+    #[inline]
     pub unsafe fn new(
         world: UnsafeWorldCell<'w>,
         query_state: &'s TermQueryState<Q>,
@@ -187,7 +187,7 @@ impl<'w, 's, Q: QueryTermGroup> TermQueryIter<'w, 's, Q> {
 impl<'w, 's, Q: QueryTermGroup> Iterator for TermQueryIter<'w, 's, Q> {
     type Item = Q::Item<'w>;
 
-    #[inline(always)]
+    #[inline]
     fn next(&mut self) -> Option<Self::Item> {
         unsafe {
             if let Some(fetches) = &mut self.inner.next_fetch() {

crates/bevy_ecs/src/term_query/state.rs

@@ -35,12 +35,12 @@ impl RawFetches {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     pub(crate) fn as_uninit<'w>(&self) -> &mut [MaybeUninit<FetchedTerm<'w>>] {
         unsafe { std::slice::from_raw_parts_mut(self.mem.cast(), self.len) }
     }
 
-    #[inline(always)]
+    #[inline]
     pub(crate) fn as_slice<'w>(&self) -> &mut [FetchedTerm<'w>] {
         unsafe { std::slice::from_raw_parts_mut(self.mem.cast(), self.len) }
     }
@@ -558,7 +558,7 @@ impl<Q: QueryTermGroup, F: QueryTermGroup> TermQueryState<Q, F> {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     pub unsafe fn set_table<'w>(&self, state: &mut TermVec<TermState<'w>>, table: &'w Table) {
         let len = self.terms.len();
         let terms = &self.terms[..len];

crates/bevy_ecs/src/term_query/terms/component.rs

@@ -251,7 +251,7 @@ impl Fetchable for ComponentTerm {
         state
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn set_table<'w>(&self, state: &mut ComponentTermState<'w>, table: &'w Table) {
         if let StorageType::SparseSet = state.storage {
             return;
@@ -392,7 +392,7 @@ impl<T: Component> ComponentQueryTerm for Without<T> {
         ComponentTerm::without(component)
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(_term: &'w FetchedComponent<'w>) -> Self::Item<'w> {}
 }
 
@@ -405,7 +405,7 @@ impl<T: Component> ComponentQueryTerm for Has<T> {
         ComponentTerm::with(component).optional()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &'w FetchedComponent<'w>) -> Self::Item<'w> {
         term.matched
     }
@@ -420,7 +420,7 @@ impl<T: Component> ComponentQueryTerm for Added<T> {
         ComponentTerm::added(component)
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(_term: &'w FetchedComponent<'w>) -> Self::Item<'w> {}
 }
 
@@ -433,7 +433,7 @@ impl<T: Component> ComponentQueryTerm for Changed<T> {
         ComponentTerm::changed(component)
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(_term: &FetchedComponent<'w>) -> Self::Item<'w> {}
 }
 
@@ -446,7 +446,7 @@ impl<T: Component> ComponentQueryTerm for &T {
         ComponentTerm::read_id(component)
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         term.pointer.debug_checked_unwrap().deref()
     }
@@ -461,7 +461,7 @@ impl<T: Component> ComponentQueryTerm for Ref<'_, T> {
         ComponentTerm::read_id(component).with_change_detection()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         let change_detection = term.change_ticks.as_ref().debug_checked_unwrap();
         Ref {
@@ -485,7 +485,7 @@ impl ComponentQueryTerm for Ptr<'_> {
         ComponentTerm::read()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         term.pointer.debug_checked_unwrap()
     }
@@ -500,7 +500,7 @@ impl<'r, T: Component> ComponentQueryTerm for &'r mut T {
         ComponentTerm::write_id(component)
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         let change_detection = term.change_ticks.as_ref().debug_checked_unwrap();
         Mut {
@@ -528,7 +528,7 @@ impl<'r> ComponentQueryTerm for PtrMut<'r> {
         ComponentTerm::read()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         let change_detection = term.change_ticks.as_ref().debug_checked_unwrap();
         MutUntyped {
@@ -552,7 +552,7 @@ impl<C: ComponentQueryTerm> ComponentQueryTerm for Option<C> {
         C::init_term(world).optional()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedComponent<'w>) -> Self::Item<'w> {
         if term.matched {
             Some(C::from_fetch(term))

crates/bevy_ecs/src/term_query/terms/entity.rs

@@ -53,10 +53,10 @@ impl Fetchable for EntityTerm {
         world
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn set_table<'w>(&self, _state: &mut Self::State<'w>, _table: &'w Table) {}
 
-    #[inline(always)]
+    #[inline]
     unsafe fn fetch<'w>(
         &self,
         world: &Self::State<'w>,
@@ -73,7 +73,7 @@ impl Fetchable for EntityTerm {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn filter_fetch<'w>(
         &self,
         _state: &Self::State<'w>,
@@ -129,7 +129,7 @@ impl QueryTerm for Entity {
         Term::Entity(EntityTerm::none())
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedTerm<'w>) -> Self::Item<'w> {
         let term = term.entity().debug_checked_unwrap();
 
@@ -145,7 +145,7 @@ impl QueryTerm for EntityRef<'_> {
         Term::Entity(EntityTerm::read())
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedTerm<'w>) -> Self::Item<'w> {
         let term = term.entity().debug_checked_unwrap();
         EntityRef::new(term.cell.debug_checked_unwrap())
@@ -160,7 +160,7 @@ impl<'r> QueryTerm for EntityMut<'r> {
         Term::Entity(EntityTerm::write())
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedTerm<'w>) -> Self::Item<'w> {
         let term = term.entity().debug_checked_unwrap();
         EntityMut::new(term.cell.debug_checked_unwrap())

crates/bevy_ecs/src/term_query/terms/group.rs

@@ -52,7 +52,7 @@ impl Fetchable for OrTerm {
             .collect()
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn set_table<'w>(&self, state: &mut Self::State<'w>, table: &'w Table) {
         self.terms
             .iter()
@@ -65,7 +65,7 @@ impl Fetchable for OrTerm {
             })
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn fetch<'w>(
         &self,
         state: &Self::State<'w>,
@@ -83,7 +83,7 @@ impl Fetchable for OrTerm {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn filter_fetch<'w>(
         &self,
         state: &Self::State<'w>,
@@ -144,7 +144,7 @@ impl<Q: ComponentQueryTermGroup> QueryTermGroup for Or<Q> {
         }));
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetches<'w: 'f, 'f>(
         terms: &mut impl Iterator<Item = &'f FetchedTerm<'w>>,
     ) -> Self::Item<'w> {
@@ -165,7 +165,7 @@ impl<Q: ComponentQueryTermGroup> QueryTermGroup for AnyOf<Q> {
         }));
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetches<'w: 'f, 'f>(
         terms: &mut impl Iterator<Item = &'f FetchedTerm<'w>>,
     ) -> Self::Item<'w> {

crates/bevy_ecs/src/term_query/terms/mod.rs

@@ -43,7 +43,7 @@ pub enum FetchedTerm<'w> {
 }
 
 impl<'w> FetchedTerm<'w> {
-    #[inline(always)]
+    #[inline]
     pub fn component(&self) -> Option<&<ComponentTerm as Fetchable>::Item<'w>> {
         if let FetchedTerm::Component(term) = self {
             Some(term)
@@ -52,7 +52,7 @@ impl<'w> FetchedTerm<'w> {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn entity(&self) -> Option<&<EntityTerm as Fetchable>::Item<'w>> {
         if let FetchedTerm::Entity(term) = self {
             Some(term)
@@ -61,7 +61,7 @@ impl<'w> FetchedTerm<'w> {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn group(&self) -> Option<&Vec<<ComponentTerm as Fetchable>::Item<'w>>> {
         if let FetchedTerm::Or(term) = self {
             Some(term)
@@ -254,7 +254,7 @@ impl<T: ComponentQueryTerm> QueryTerm for T {
         Term::Component(T::init_term(world))
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetch<'w>(term: &FetchedTerm<'w>) -> Self::Item<'w> {
         let term = term.component().debug_checked_unwrap();
         T::from_fetch(term)
@@ -280,7 +280,7 @@ impl<T: QueryTerm> QueryTermGroup for T {
         terms.push(T::init_term(world));
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetches<'w: 'f, 'f>(
         terms: &mut impl Iterator<Item = &'f FetchedTerm<'w>>,
     ) -> Self::Item<'w> {
@@ -309,7 +309,7 @@ impl<T: ComponentQueryTerm> ComponentQueryTermGroup for T {
         terms.push(T::init_term(world));
     }
 
-    #[inline(always)]
+    #[inline]
     unsafe fn from_fetches<'w: 'f, 'f>(
         terms: &mut impl Iterator<Item = &'f FetchedComponent<'w>>,
     ) -> Self::Item<'w> {
@@ -329,7 +329,7 @@ macro_rules! impl_query_term_tuple {
                 )*
             }
 
-            #[inline(always)]
+            #[inline]
             unsafe fn from_fetches<'w: 'f, 'f>(_terms: &mut impl Iterator<Item = &'f FetchedTerm<'w>>) -> Self::Item<'w> {
                 ($(
                     $term::from_fetches(_terms),
@@ -353,7 +353,7 @@ macro_rules! impl_component_query_term_tuple {
             }
 
 
-            #[inline(always)]
+            #[inline]
             unsafe fn from_fetches<'w: 'f, 'f>(_terms: &mut impl Iterator<Item = &'f FetchedComponent<'w>>) -> Self::Item<'w> {
                 ($(
                     $term::from_fetches(_terms),