Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions framework_crates/bones_asset/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -896,10 +896,7 @@ impl AssetServer {
SchemaMismatchError,
>,
> {
let cid = match self.store.asset_ids.get(&handle.untyped()) {
Some(cid) => cid,
None => return None,
};
let cid = self.store.asset_ids.get(&handle.untyped())?;
Some(
MapRef::try_map(self.store.assets.get(&cid).unwrap(), |x| {
let asset = &x.data;
Expand Down
4 changes: 0 additions & 4 deletions framework_crates/bones_ecs/src/components/typed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,6 @@ mod tests {
#[repr(C)]
struct A(u32);

#[derive(Debug, Clone, Copy, PartialEq, Eq, HasSchema, Default)]
#[repr(C)]
struct B(u32);

fn entity(index: u32) -> Entity {
Entity::new(index, 0)
}
Expand Down
4 changes: 2 additions & 2 deletions framework_crates/bones_ecs/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ mod tests {
assert!(d.as_deref() == Some(&2));
}

let mut world = World::new();
let world = World::new();
world.insert_resource(1u16);
world.insert_resource(2u64);
world.run_system(access_resource, ());
Expand All @@ -480,7 +480,7 @@ mod tests {
**n *= 3;
}

let mut world = World::new();
let world = World::new();
world.insert_resource(2usize);

let result = world.run_system(mul_by_res, 3);
Expand Down
7 changes: 4 additions & 3 deletions framework_crates/bones_framework/src/audio/audio_center.rs
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,10 @@ pub fn _process_audio_events(
force_restart,
} => {
let should_play = force_restart
|| audio_center.music.as_ref().map_or(true, |current_music| {
sound_source != current_music.bones_handle
});
|| audio_center
.music
.as_ref()
.is_none_or(|current_music| sound_source != current_music.bones_handle);

if should_play {
// Stop the current music
Expand Down
2 changes: 1 addition & 1 deletion framework_crates/bones_framework/src/localization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ impl AssetLoader for LocalizationLoader {
.unwrap_or(en_us.clone());

let selected_locale = fluent_langneg::negotiate_languages(
&[user_locale.clone()],
std::slice::from_ref(&user_locale),
&available_locales,
Some(&en_us),
fluent_langneg::NegotiationStrategy::Filtering,
Expand Down
Loading