reflect: remove manual Reflect impls which could be handled by macros
#12025
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
soqb
added
C-Code-Quality
alice-i-cecile
approved these changes
Feb 21, 2024
MrGVSV
reviewed
Feb 24, 2024
| @@ -52,7 +47,8 @@ use thiserror::Error; | |||
| /// This means that the common case of `asset_server.load("my_scene.scn")` when it creates and | |||
| /// clones internal owned [`AssetPaths`](AssetPath). | |||
| /// This also means that you should use [`AssetPath::parse`] in cases where `&str` is the explicit type. | |||
| #[derive(Eq, PartialEq, Hash, Clone, Default)] | |||
| #[derive(Eq, PartialEq, Hash, Clone, Default, Reflect)] | |||
| #[reflect_value(Debug, PartialEq, Hash, Serialize, Deserialize)] | |||
There was a problem hiding this comment.
We don't have to update it in this PR, but any reason why this is a reflect_value type? I would have assumed CowArc would be reflectable, but maybe not?
Co-authored-by: James Liu <contact@jamessliu.com>
alice-i-cecile
added
the
S-Ready-For-Final-Review
MrGVSV
reviewed
Mar 10, 2024
| @@ -67,7 +63,9 @@ bitflags::bitflags! { | |||
| /// If you have an asset that doesn't actually need to end up in the render world, like an Image | |||
| /// that will be decoded into another Image asset, use `MAIN_WORLD` only. | |||
| #[repr(transparent)] | |||
| #[derive(Serialize, TypePath, Deserialize, Hash, Clone, Copy, PartialEq, Eq, Debug)] | |||
| #[derive(Serialize, Deserialize, Hash, Clone, Copy, PartialEq, Eq, Debug, Reflect)] | |||
| #[reflect(Serialize, Deserialize, Hash, PartialEq, Debug, Reflect)] | |||
There was a problem hiding this comment.
How is CI passing if we never import ReflectSerialize et al? 🤔
|
@soqb can you resolve merge conflicts? They're not trivial so I'm not going to tackle them in the web client. |
|
not this week i'm afraid, but i do plan on it when there's time. |
alice-i-cecile
added
the
S-Adopt-Me
|
I'm interested in adopting this PR, I think I can fix the merge conflicts at least |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 23, 2024
…#12596) # Objective * Adopted #12025 to fix merge conflicts * In some cases we used manual impls for certain types, though they are (at least, now) unnecessary. ## Solution * Use macros and reflecting-by-value to avoid this clutter. * Though there were linker issues with Reflect and the CowArc in AssetPath (see #9747), I checked these are resolved by using #[reflect_value]. --------- Co-authored-by: soqb <cb.setho@gmail.com> Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: James Liu <contact@jamessliu.com>
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
Solution
Reflectand theCowArcinAssetPath(see Build failure whendynamic_linkingfeature is used #9747), I checked these are resolved by using#[reflect_value].