Skip to content

fix enum reflection based partial_cmp, disallow compare different variant names. #22595

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

Merged
alice-i-cecile merged 4 commits into from
Jan 21, 2026
Merged

fix enum reflection based partial_cmp, disallow compare different variant names. #22595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36e3bac
fix partial cmp
molikto Jan 19, 2026
8ec88ce
Update crates/bevy_reflect/src/enums/helpers.rs
molikto Jan 20, 2026
4ffcbe9
Update crates/bevy_reflect/src/lib.rs
molikto Jan 20, 2026
f6631ca
change test name
molikto Jan 20, 2026
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
4 changes: 2 additions & 2 deletions crates/bevy_reflect/src/enums/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ pub fn enum_partial_cmp<TEnum: Enum + ?Sized>(

// Same variant name?
if a.variant_name() != b.variant_name() {
// Different variant names, determining ordering by variant index
return Some(a.variant_index().cmp(&b.variant_index()));
// Different variant names, cannot compare
return None;
}

// Same variant type?
Expand Down
35 changes: 10 additions & 25 deletions crates/bevy_reflect/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1691,19 +1691,10 @@ mod tests {
let b = MyEnum::Center;
let c = MyEnum::Bottom;

// Variant ordering should follow variant index
assert_eq!(
PartialReflect::reflect_partial_cmp(&a, &b),
Some(Ordering::Less)
);
assert_eq!(
PartialReflect::reflect_partial_cmp(&b, &a),
Some(Ordering::Greater)
);
assert_eq!(
PartialReflect::reflect_partial_cmp(&b, &c),
Some(Ordering::Less)
);
// Variant ordering of different variant name cannot be compared.
assert_eq!(PartialReflect::reflect_partial_cmp(&a, &b), None);
assert_eq!(PartialReflect::reflect_partial_cmp(&b, &a), None);
assert_eq!(PartialReflect::reflect_partial_cmp(&b, &c), None);
assert_eq!(
PartialReflect::reflect_partial_cmp(&a, &a),
Some(Ordering::Equal)
Expand All @@ -1713,23 +1704,17 @@ mod tests {
enum MyEnum2 {
A,
B,
C,
Center,
}
let a1 = MyEnum2::A;
let c1 = MyEnum2::C;
let c1 = MyEnum2::Center;

// Unfortunately, it means that enums that have different types can also be compared
assert_eq!(
PartialReflect::reflect_partial_cmp(&a1, &a),
Some(Ordering::Equal)
);
assert_eq!(
PartialReflect::reflect_partial_cmp(&a1, &b),
Some(Ordering::Less)
);
assert_eq!(PartialReflect::reflect_partial_cmp(&a1, &a), None);
assert_eq!(PartialReflect::reflect_partial_cmp(&a1, &b), None);
// Variant name same, even different type, should be comparable
assert_eq!(
PartialReflect::reflect_partial_cmp(&c1, &b),
Some(Ordering::Greater)
Some(Ordering::Equal)
);
}

Expand Down