reflect: remove manual Reflect impls which could be handled by macros #12596
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: James Liu <[email protected]>
OneFourth
commented
Mar 20, 2024
| @@ -77,7 +71,8 @@ bitflags::bitflags! { | |||
| /// [discussion about memory management](https://github.com/WebAssembly/design/issues/1397) for more | |||
| /// details. | |||
| #[repr(transparent)] | |||
| #[derive(Serialize, TypePath, Deserialize, Hash, Clone, Copy, PartialEq, Eq, Debug)] | |||
| #[derive(Serialize, Deserialize, Hash, Clone, Copy, PartialEq, Eq, Debug, Reflect)] | |||
| #[reflect_value(Serialize, Deserialize, Hash, PartialEq, Debug)] | |||
There was a problem hiding this comment.
I had some issues with this, the suggested changes here https://github.com/bevyengine/bevy/pull/12025/files#r1518749863 wouldn't allow both reflect and reflect_value.
If I used reflect I ended up with errors like
the trait
bevy_reflect::FromReflectis not implemented forrender_asset::_::InternalBitFlags, which is required byRenderAssetUsages: bevy_reflect::FromReflect
It also didn't like Reflect being there, so I made it reflect_value and removed Reflect from the list
| @@ -996,252 +995,14 @@ impl<T: Reflect + TypePath + GetTypeRegistration, const N: usize> GetTypeRegistr | |||
| } | |||
| } | |||
|
|
|||
| impl<T: FromReflect + TypePath + GetTypeRegistration> GetTypeRegistration for Option<T> { | |||
There was a problem hiding this comment.
Most of the conflicts were from the + GetTypeRegistration which didn't exist before
MrGVSV
approved these changes
Mar 20, 2024
MrGVSV
added
C-Code-Quality
james7132
approved these changes
Mar 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
Reflectimpls which could be handled by macros #12025 to fix merge conflictsSolution
dynamic_linkingfeature is used #9747), I checked these are resolved by using #[reflect_value].