Skip to content

cleanup get_labeled_by_id/get_erased_labeled_by_id bounds #23721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yrns wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −25
Open

cleanup get_labeled_by_id/get_erased_labeled_by_id bounds #23721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/bevy_asset/src/loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<UntypedAssetId>`].
pub fn get_labeled_by_id(&self, id: impl Into<UntypedAssetId>) -> Option<&ErasedLoadedAsset> {
let index = self.asset_id_to_asset_index.get(&id.into())?;
Expand Down
32 changes: 8 additions & 24 deletions crates/bevy_asset/src/transformer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,10 @@ impl<A: Asset> TransformedAsset<A> {
///
/// This can be used to get the asset from its handle since `&Handle` implements
/// [`Into<AssetId<B>>`].
pub fn get_labeled_by_id<B: Asset, Q>(
pub fn get_labeled_by_id<B: Asset>(
&mut self,
id: impl Into<AssetId<B>>,
) -> Option<TransformedSubAsset<'_, B>>
where
CowArc<'static, str>: Borrow<Q>,
Q: ?Sized + Hash + Eq,
{
) -> Option<TransformedSubAsset<'_, B>> {
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::<B>()?;
Expand All @@ -162,14 +158,10 @@ impl<A: Asset> TransformedAsset<A> {
///
/// This can be used to get the asset from its handle since `&UntypedHandle` implements
/// [`Into<UntypedAssetId>`].
pub fn get_erased_labeled_by_id<Q>(
pub fn get_erased_labeled_by_id(
&self,
id: impl Into<UntypedAssetId>,
) -> Option<&ErasedLoadedAsset>
where
CowArc<'static, str>: Borrow<Q>,
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)
Expand Down Expand Up @@ -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<AssetId<B>>`].
pub fn get_labeled_by_id<B: Asset, Q>(
pub fn get_labeled_by_id<B: Asset>(
&mut self,
id: impl Into<AssetId<B>>,
) -> Option<TransformedSubAsset<'_, B>>
where
CowArc<'static, str>: Borrow<Q>,
Q: ?Sized + Hash + Eq,
{
) -> Option<TransformedSubAsset<'_, B>> {
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::<B>()?;
Expand All @@ -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<UntypedAssetId>`].
pub fn get_erased_labeled_by_id<Q>(
pub fn get_erased_labeled_by_id(
&self,
id: impl Into<UntypedAssetId>,
) -> Option<&ErasedLoadedAsset>
where
CowArc<'static, str>: Borrow<Q>,
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)
Expand Down