Skip to content

Commit af04602

Browse files
authored
cleanup get_labeled_by_id/get_erased_labeled_by_id bounds (#23721)
# Objective Remove some unnecessary type bounds. ## Testing `cargo test -p bevy_asset`
1 parent 160e26d commit af04602

2 files changed

Lines changed: 9 additions & 25 deletions

File tree

crates/bevy_asset/src/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ impl<'a> LoadContext<'a> {
629629

630630
/// Returns the labeled asset given its asset ID if it exists.
631631
///
632-
/// This can be used to get the asset from its handle since `&Handle` implemented
632+
/// This can be used to get the asset from its handle since `&Handle` implements
633633
/// [`Into<UntypedAssetId>`].
634634
pub fn get_labeled_by_id(&self, id: impl Into<UntypedAssetId>) -> Option<&ErasedLoadedAsset> {
635635
let index = self.asset_id_to_asset_index.get(&id.into())?;

crates/bevy_asset/src/transformer.rs

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,10 @@ impl<A: Asset> TransformedAsset<A> {
139139
///
140140
/// This can be used to get the asset from its handle since `&Handle` implements
141141
/// [`Into<AssetId<B>>`].
142-
pub fn get_labeled_by_id<B: Asset, Q>(
142+
pub fn get_labeled_by_id<B: Asset>(
143143
&mut self,
144144
id: impl Into<AssetId<B>>,
145-
) -> Option<TransformedSubAsset<'_, B>>
146-
where
147-
CowArc<'static, str>: Borrow<Q>,
148-
Q: ?Sized + Hash + Eq,
149-
{
145+
) -> Option<TransformedSubAsset<'_, B>> {
150146
let index = self.asset_id_to_asset_index.get(&id.into().untyped())?;
151147
let labeled = &mut self.labeled_assets[*index];
152148
let value = labeled.asset.value.downcast_mut::<B>()?;
@@ -162,14 +158,10 @@ impl<A: Asset> TransformedAsset<A> {
162158
///
163159
/// This can be used to get the asset from its handle since `&UntypedHandle` implements
164160
/// [`Into<UntypedAssetId>`].
165-
pub fn get_erased_labeled_by_id<Q>(
161+
pub fn get_erased_labeled_by_id(
166162
&self,
167163
id: impl Into<UntypedAssetId>,
168-
) -> Option<&ErasedLoadedAsset>
169-
where
170-
CowArc<'static, str>: Borrow<Q>,
171-
Q: ?Sized + Hash + Eq,
172-
{
164+
) -> Option<&ErasedLoadedAsset> {
173165
let index = self.asset_id_to_asset_index.get(&id.into())?;
174166
let labeled = &self.labeled_assets[*index];
175167
Some(&labeled.asset)
@@ -318,14 +310,10 @@ impl<'a, A: Asset> TransformedSubAsset<'a, A> {
318310
///
319311
/// This can be used to get the asset from its handle since `&Handle` implements
320312
/// [`Into<AssetId<B>>`].
321-
pub fn get_labeled_by_id<B: Asset, Q>(
313+
pub fn get_labeled_by_id<B: Asset>(
322314
&mut self,
323315
id: impl Into<AssetId<B>>,
324-
) -> Option<TransformedSubAsset<'_, B>>
325-
where
326-
CowArc<'static, str>: Borrow<Q>,
327-
Q: ?Sized + Hash + Eq,
328-
{
316+
) -> Option<TransformedSubAsset<'_, B>> {
329317
let index = self.asset_id_to_asset_index.get(&id.into().untyped())?;
330318
let labeled = &mut self.labeled_assets[*index];
331319
let value = labeled.asset.value.downcast_mut::<B>()?;
@@ -341,14 +329,10 @@ impl<'a, A: Asset> TransformedSubAsset<'a, A> {
341329
///
342330
/// This can be used to get the asset from its handle since `&UntypedHandle` implements
343331
/// [`Into<UntypedAssetId>`].
344-
pub fn get_erased_labeled_by_id<Q>(
332+
pub fn get_erased_labeled_by_id(
345333
&self,
346334
id: impl Into<UntypedAssetId>,
347-
) -> Option<&ErasedLoadedAsset>
348-
where
349-
CowArc<'static, str>: Borrow<Q>,
350-
Q: ?Sized + Hash + Eq,
351-
{
335+
) -> Option<&ErasedLoadedAsset> {
352336
let index = self.asset_id_to_asset_index.get(&id.into())?;
353337
let labeled = &self.labeled_assets[*index];
354338
Some(&labeled.asset)

0 commit comments

Comments
 (0)