Skip to content
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

Jump to bottom

Allow Option<Entity> to leverage niche optimization #3029

Closed
wants to merge 12 commits into from
Closed

Allow Option<Entity> to leverage niche optimization #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5740099
Change entity generation to NonZeroU32, update tests, add new tests
Oct 26, 2021
7ad7eaa
Remove unsafe code for NonZeroU32 in entity, run rust format, mark en…
Oct 27, 2021
43e990d
Add entity generation exhaustion warning
Oct 29, 2021
e3784e5
Address PR feedback to improve documentation
Oct 30, 2021
4767f08
Ran cargo format
Oct 30, 2021
2e201a9
Remove workaround for the now stablized const panic
Dec 20, 2021
ab84dff
Change to unreachable
Dec 21, 2021
3535468
Merge remote-tracking branch 'upstream/main' into option-entity-gener…
Dec 30, 2021
080fef5
Merge branch 'main' into option-entity-generation-optimization
notverymoe Mar 11, 2023
829ae66
Update to the latest version, change parent to take Option<Entity>
notverymoe Mar 11, 2023
6323185
Fix format
notverymoe Mar 11, 2023
41c3e80
Fix tests
notverymoe Mar 12, 2023
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
6 changes: 3 additions & 3 deletions crates/bevy_animation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,14 @@ fn verify_no_ancestor_player(
player_parent: Option<&Parent>,
parents: &Query<(Option<With<AnimationPlayer>>, Option<&Parent>)>,
) -> bool {
let Some(mut current) = player_parent.map(Parent::get) else { return true };
let Some(mut current) = player_parent.and_then(Parent::try_get) else { return true };
loop {
let Ok((maybe_player, parent)) = parents.get(current) else { return true };
if maybe_player.is_some() {
return false;
}
if let Some(parent) = parent {
current = parent.get();
if let Some(parent) = parent.and_then(|v| v.try_get()) {
current = parent;
} else {
return true;
}
Expand Down
Loading