bevy_reflect: support map insertion #3701
Closed
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
alice-i-cecile
added
A-Reflection
alice-i-cecile
approved these changes
Jan 18, 2022
|
May I please have an update on the status of this merge? It's important for any scenes with components with Hashmaps. |
|
So, this needs another review before it can be considered for merge. If you're comfortable with the code base (and especially if you've tested it out), feel free to leave one. Good-faith community approvals count on Bevy :) |
MrGVSV
approved these changes
Apr 23, 2022
| @@ -166,7 +166,7 @@ impl<T: FromReflect> FromReflect for Vec<T> { | |||
| } | |||
| } | |||
|
|
|||
| impl<K: Reflect + Eq + Hash, V: Reflect> Map for HashMap<K, V> { | |||
| impl<K: FromReflect + Eq + Hash, V: FromReflect> Map for HashMap<K, V> { | |||
There was a problem hiding this comment.
I imagine this could be a breaking change. Maybe add a Migration Guide section on the PR comment explaining that key and value types now have a FromReflect bound instead of Reflect?
| let value = value.take::<V>().unwrap_or_else(|value| { | ||
| V::from_reflect(&*value).unwrap_or_else(|| { | ||
| panic!( | ||
| "Attempted to push invalid value of type {}.", |
There was a problem hiding this comment.
Nit: Why is this push and not insert?
Suggested change
| "Attempted to push invalid value of type {}.", | |
| "Attempted to insert invalid value of type {}.", |
Comment on lines
+255
to
+261
| /// Applies the elements of `b` to the corresponding elements of `a`. | ||
| /// | ||
| /// If a key from `b` does not exist in `a`, the value is cloned and inserted. | ||
| /// | ||
| /// # Panics | ||
| /// | ||
| /// This function panics if `b` is not a map. |
There was a problem hiding this comment.
Nit: Maybe reiterate that these two parameters are maps (as opposed to an iterator of tuples or something else).
Suggested change
| /// Applies the elements of `b` to the corresponding elements of `a`. | |
| /// | |
| /// If a key from `b` does not exist in `a`, the value is cloned and inserted. | |
| /// | |
| /// # Panics | |
| /// | |
| /// This function panics if `b` is not a map. | |
| /// Applies the elements of reflected map `b` to the corresponding elements of map `a`. | |
| /// | |
| /// If a key from `b` does not exist in `a`, the value is cloned and inserted. | |
| /// | |
| /// # Panics | |
| /// | |
| /// This function panics if `b` is not a reflected map. |
Feel free to change my wording if preferred.
alice-i-cecile
added
the
S-Adopt-Me
bors bot
pushed a commit
that referenced
this pull request
Jul 4, 2022
# Objective This is a rebase of #3701 which is currently scheduled for 0.8 but is marked for adoption. > Fixes #3609 ## Solution > - add an `insert_boxed()` method on the `Map` trait > - implement it for `HashMap` using a new `FromReflect` generic bound > - add a `map_apply()` helper method to implement `Map::apply()`, that inserts new values instead of ignoring them --- ## Changelog TODO Co-authored-by: james7132 <contact@jamessliu.com>
|
Adopted and finished in #5173 |
inodentry
pushed a commit
to IyesGames/bevy
that referenced
this pull request
Aug 8, 2022
# Objective This is a rebase of bevyengine#3701 which is currently scheduled for 0.8 but is marked for adoption. > Fixes bevyengine#3609 ## Solution > - add an `insert_boxed()` method on the `Map` trait > - implement it for `HashMap` using a new `FromReflect` generic bound > - add a `map_apply()` helper method to implement `Map::apply()`, that inserts new values instead of ignoring them --- ## Changelog TODO Co-authored-by: james7132 <contact@jamessliu.com>
james7132
added a commit
to james7132/bevy
that referenced
this pull request
Oct 28, 2022
# Objective This is a rebase of bevyengine#3701 which is currently scheduled for 0.8 but is marked for adoption. > Fixes bevyengine#3609 ## Solution > - add an `insert_boxed()` method on the `Map` trait > - implement it for `HashMap` using a new `FromReflect` generic bound > - add a `map_apply()` helper method to implement `Map::apply()`, that inserts new values instead of ignoring them --- ## Changelog TODO Co-authored-by: james7132 <contact@jamessliu.com>
ItsDoot
pushed a commit
to ItsDoot/bevy
that referenced
this pull request
Feb 1, 2023
# Objective This is a rebase of bevyengine#3701 which is currently scheduled for 0.8 but is marked for adoption. > Fixes bevyengine#3609 ## Solution > - add an `insert_boxed()` method on the `Map` trait > - implement it for `HashMap` using a new `FromReflect` generic bound > - add a `map_apply()` helper method to implement `Map::apply()`, that inserts new values instead of ignoring them --- ## Changelog TODO Co-authored-by: james7132 <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
Fixes #3609
Solution
insert_boxed()method on theMaptraitHashMapusing a newFromReflectgeneric boundmap_apply()helper method to implementMap::apply(), that inserts new values instead of ignoring them