Skip to content

Commit a6c2396

Browse files
committed
Cleanup
1 parent 95c4f50 commit a6c2396

File tree

2 files changed

+48
-44
lines changed

2 files changed

+48
-44
lines changed

crates/bevy_reflect/src/enums/helpers.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@ pub fn enum_hash<TEnum: Enum>(value: &TEnum) -> Option<u64> {
1515
Some(hasher.finish())
1616
}
1717

18-
// TODO: Add serializable. How do we handle enums?
19-
// pub fn enum_serialize<TEnum, S>(value: &TEnum, serializer: S) -> Result<S::Ok, S::Error>
20-
// where
21-
// TEnum: Enum + ?Sized,
22-
// S: serde::Serializer,
23-
// {
24-
//
25-
//
26-
// }
27-
2818
/// Compares an [`Enum`] with a [`Reflect`] value.
2919
///
3020
/// Returns true if and only if all of the following are true:

crates/bevy_reflect/src/enums/mod.rs

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -445,58 +445,72 @@ mod tests {
445445

446446
let a: &dyn Reflect = &TestEnum::A;
447447
let b: &dyn Reflect = &TestEnum::A;
448-
assert!(a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::A == TestEnum::A");
448+
assert!(
449+
a.reflect_partial_eq(b).unwrap_or_default(),
450+
"expected TestEnum::A == TestEnum::A"
451+
);
449452

450453
let a: &dyn Reflect = &TestEnum::A;
451454
let b: &dyn Reflect = &TestEnum::A1;
452-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::A != TestEnum::A1");
455+
assert!(
456+
!a.reflect_partial_eq(b).unwrap_or_default(),
457+
"expected TestEnum::A != TestEnum::A1"
458+
);
453459

454460
let a: &dyn Reflect = &TestEnum::B(123);
455461
let b: &dyn Reflect = &TestEnum::B(123);
456-
assert!(a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::B(123) == TestEnum::B(123)");
462+
assert!(
463+
a.reflect_partial_eq(b).unwrap_or_default(),
464+
"expected TestEnum::B(123) == TestEnum::B(123)"
465+
);
457466

458467
let a: &dyn Reflect = &TestEnum::B(123);
459468
let b: &dyn Reflect = &TestEnum::B(321);
460-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::B(123) != TestEnum::B(321)");
469+
assert!(
470+
!a.reflect_partial_eq(b).unwrap_or_default(),
471+
"expected TestEnum::B(123) != TestEnum::B(321)"
472+
);
461473

462474
let a: &dyn Reflect = &TestEnum::B(123);
463475
let b: &dyn Reflect = &TestEnum::B1(123);
464-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::B(123) != TestEnum::B1(123)");
476+
assert!(
477+
!a.reflect_partial_eq(b).unwrap_or_default(),
478+
"expected TestEnum::B(123) != TestEnum::B1(123)"
479+
);
465480

466481
let a: &dyn Reflect = &TestEnum::B(123);
467482
let b: &dyn Reflect = &TestEnum::B2(123, 123);
468-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::B(123) != TestEnum::B2(123, 123)");
483+
assert!(
484+
!a.reflect_partial_eq(b).unwrap_or_default(),
485+
"expected TestEnum::B(123) != TestEnum::B2(123, 123)"
486+
);
469487

470-
let a: &dyn Reflect = &TestEnum::C {
471-
value: 123
472-
};
473-
let b: &dyn Reflect = &TestEnum::C {
474-
value: 123
475-
};
476-
assert!(a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::C{{value: 123}} == TestEnum::C{{value: 123}}");
488+
let a: &dyn Reflect = &TestEnum::C { value: 123 };
489+
let b: &dyn Reflect = &TestEnum::C { value: 123 };
490+
assert!(
491+
a.reflect_partial_eq(b).unwrap_or_default(),
492+
"expected TestEnum::C{{value: 123}} == TestEnum::C{{value: 123}}"
493+
);
477494

478-
let a: &dyn Reflect = &TestEnum::C {
479-
value: 123
480-
};
481-
let b: &dyn Reflect = &TestEnum::C {
482-
value: 321
483-
};
484-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::C{{value: 123}} != TestEnum::C{{value: 321}}");
495+
let a: &dyn Reflect = &TestEnum::C { value: 123 };
496+
let b: &dyn Reflect = &TestEnum::C { value: 321 };
497+
assert!(
498+
!a.reflect_partial_eq(b).unwrap_or_default(),
499+
"expected TestEnum::C{{value: 123}} != TestEnum::C{{value: 321}}"
500+
);
485501

486-
let a: &dyn Reflect = &TestEnum::C {
487-
value: 123
488-
};
489-
let b: &dyn Reflect = &TestEnum::C1 {
490-
value: 123
491-
};
492-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::C{{value: 123}} != TestEnum::C1{{value: 123}}");
502+
let a: &dyn Reflect = &TestEnum::C { value: 123 };
503+
let b: &dyn Reflect = &TestEnum::C1 { value: 123 };
504+
assert!(
505+
!a.reflect_partial_eq(b).unwrap_or_default(),
506+
"expected TestEnum::C{{value: 123}} != TestEnum::C1{{value: 123}}"
507+
);
493508

494-
let a: &dyn Reflect = &TestEnum::C {
495-
value: 123
496-
};
497-
let b: &dyn Reflect = &TestEnum::C2 {
498-
value: 1.23
499-
};
500-
assert!(!a.reflect_partial_eq(b).unwrap_or_default(), "expected TestEnum::C{{value: 123}} != TestEnum::C2{{value: 1.23}}");
509+
let a: &dyn Reflect = &TestEnum::C { value: 123 };
510+
let b: &dyn Reflect = &TestEnum::C2 { value: 1.23 };
511+
assert!(
512+
!a.reflect_partial_eq(b).unwrap_or_default(),
513+
"expected TestEnum::C{{value: 123}} != TestEnum::C2{{value: 1.23}}"
514+
);
501515
}
502516
}

0 commit comments

Comments
 (0)