From f14cebf85e46b47f2ea88ba9a84312877862ddf0 Mon Sep 17 00:00:00 2001 From: Al McElrath Date: Wed, 8 Apr 2026 09:48:24 -0700 Subject: [PATCH] cleanup `get_labeled_by_id`/`get_erased_labeled_by_id` bounds --- crates/bevy_asset/src/loader.rs | 2 +- crates/bevy_asset/src/transformer.rs | 32 +++++++--------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs index 917a62f529ca1..ecda13dcd18d1 100644 --- a/crates/bevy_asset/src/loader.rs +++ b/crates/bevy_asset/src/loader.rs @@ -629,7 +629,7 @@ impl<'a> LoadContext<'a> { /// Returns the labeled asset given its asset ID if it exists. /// - /// This can be used to get the asset from its handle since `&Handle` implemented + /// This can be used to get the asset from its handle since `&Handle` implements /// [`Into`]. pub fn get_labeled_by_id(&self, id: impl Into) -> Option<&ErasedLoadedAsset> { let index = self.asset_id_to_asset_index.get(&id.into())?; diff --git a/crates/bevy_asset/src/transformer.rs b/crates/bevy_asset/src/transformer.rs index 73b940cfc2187..2d3c713421ea0 100644 --- a/crates/bevy_asset/src/transformer.rs +++ b/crates/bevy_asset/src/transformer.rs @@ -139,14 +139,10 @@ impl TransformedAsset { /// /// This can be used to get the asset from its handle since `&Handle` implements /// [`Into>`]. - pub fn get_labeled_by_id( + pub fn get_labeled_by_id( &mut self, id: impl Into>, - ) -> Option> - where - CowArc<'static, str>: Borrow, - Q: ?Sized + Hash + Eq, - { + ) -> Option> { let index = self.asset_id_to_asset_index.get(&id.into().untyped())?; let labeled = &mut self.labeled_assets[*index]; let value = labeled.asset.value.downcast_mut::()?; @@ -162,14 +158,10 @@ impl TransformedAsset { /// /// This can be used to get the asset from its handle since `&UntypedHandle` implements /// [`Into`]. - pub fn get_erased_labeled_by_id( + pub fn get_erased_labeled_by_id( &self, id: impl Into, - ) -> Option<&ErasedLoadedAsset> - where - CowArc<'static, str>: Borrow, - Q: ?Sized + Hash + Eq, - { + ) -> Option<&ErasedLoadedAsset> { let index = self.asset_id_to_asset_index.get(&id.into())?; let labeled = &self.labeled_assets[*index]; Some(&labeled.asset) @@ -318,14 +310,10 @@ impl<'a, A: Asset> TransformedSubAsset<'a, A> { /// /// This can be used to get the asset from its handle since `&Handle` implements /// [`Into>`]. - pub fn get_labeled_by_id( + pub fn get_labeled_by_id( &mut self, id: impl Into>, - ) -> Option> - where - CowArc<'static, str>: Borrow, - Q: ?Sized + Hash + Eq, - { + ) -> Option> { let index = self.asset_id_to_asset_index.get(&id.into().untyped())?; let labeled = &mut self.labeled_assets[*index]; let value = labeled.asset.value.downcast_mut::()?; @@ -341,14 +329,10 @@ impl<'a, A: Asset> TransformedSubAsset<'a, A> { /// /// This can be used to get the asset from its handle since `&UntypedHandle` implements /// [`Into`]. - pub fn get_erased_labeled_by_id( + pub fn get_erased_labeled_by_id( &self, id: impl Into, - ) -> Option<&ErasedLoadedAsset> - where - CowArc<'static, str>: Borrow, - Q: ?Sized + Hash + Eq, - { + ) -> Option<&ErasedLoadedAsset> { let index = self.asset_id_to_asset_index.get(&id.into())?; let labeled = &self.labeled_assets[*index]; Some(&labeled.asset)