Improve DynamicStruct::insert #11068
Merged
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
Nilirad
added
C-Usability
jdm
approved these changes
Jan 28, 2024
soqb
approved these changes
Jan 31, 2024
Comment on lines
+303
to
+311
| pub fn insert_boxed<'a>(&mut self, name: impl Into<Cow<'a, str>>, value: Box<dyn Reflect>) { | ||
| let name: Cow<str> = name.into(); | ||
| if let Some(index) = self.field_indices.get(&name) { | ||
| self.fields[*index] = value; | ||
| } else { | ||
| self.fields.push(value); | ||
| self.field_indices | ||
| .insert(Cow::Owned(name.clone().into_owned()), self.fields.len() - 1); | ||
| self.field_names.push(Cow::Owned(name.into_owned())); |
There was a problem hiding this comment.
is there a reason you dropped the usage of the entry api? to me it's more readable in this case.
There was a problem hiding this comment.
I can't use the entry API because it always requires an owned String regardless of whether it needs it or not.
mockersf
reviewed
Jan 31, 2024
Comment on lines
+309
to
+311
| self.field_indices | ||
| .insert(Cow::Owned(name.clone().into_owned()), self.fields.len() - 1); | ||
| self.field_names.push(Cow::Owned(name.into_owned())); |
There was a problem hiding this comment.
Suggested change
| self.field_indices | |
| .insert(Cow::Owned(name.clone().into_owned()), self.fields.len() - 1); | |
| self.field_names.push(Cow::Owned(name.into_owned())); | |
| let name = name.into_owned(); | |
| self.field_indices | |
| .insert(Cow::Owned(name.clone()), self.fields.len() - 1); | |
| self.field_names.push(Cow::Owned(name)); |
definitely not a cow expert, but this would feel better to me
mockersf
approved these changes
Jan 31, 2024
mockersf
added
the
S-Ready-For-Final-Review
alice-i-cecile
approved these changes
Feb 5, 2024
solis-lumine-vorago
pushed a commit
to solis-lumine-vorago/bevy
that referenced
this pull request
Feb 5, 2024
# Objective I wanted to pass in a `String` to `DynamicStruct::insert_boxed` but it took in a &str. That's fine but I also saw that it immediately converted the `&str` to a `String`. Which is wasteful. ## Solution I made `DynamicStruct::insert_boxed` take in a `impl Into<Cow<str>>`. Same for `DynamicStruct::insert`. --- ## Changelog - `DynamicStruct::insert_boxed` and `DynamicStruct::insert` now support taking in anything that implements `impl Into<Cow<str>>`.
tjamaan
pushed a commit
to tjamaan/bevy
that referenced
this pull request
Feb 6, 2024
# Objective I wanted to pass in a `String` to `DynamicStruct::insert_boxed` but it took in a &str. That's fine but I also saw that it immediately converted the `&str` to a `String`. Which is wasteful. ## Solution I made `DynamicStruct::insert_boxed` take in a `impl Into<Cow<str>>`. Same for `DynamicStruct::insert`. --- ## Changelog - `DynamicStruct::insert_boxed` and `DynamicStruct::insert` now support taking in anything that implements `impl Into<Cow<str>>`.
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
I wanted to pass in a
StringtoDynamicStruct::insert_boxedbut it took in a &str. That's fine but I also saw that it immediately converted the&strto aString. Which is wasteful.Solution
I made
DynamicStruct::insert_boxedtake in aimpl Into<Cow<str>>. Same forDynamicStruct::insert.Changelog
DynamicStruct::insert_boxedandDynamicStruct::insertnow support taking in anything that implementsimpl Into<Cow<str>>.