mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update explanation of correct_aliases

Browse Source
This commit is contained in:
David Tolnay 2023-08-05 16:26:02 -07:00
parent 431636af0d
commit e3617e1f28
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
serde_derive/src/internals/attr.rs
View File

@ -186,13 +186,14 @@ impl Name {
self.deserialize_aliases.clone() self.deserialize_aliases.clone()
} }
fn correct_aliases(&mut self) { fn insert_deserialize_name_into_aliases(&mut self) {
// `deserialize_aliases` got from a BTreeSet, so it sorted and does not // `deserialize_aliases` was constructed from a BTreeSet, so it is
// contain duplicates. // sorted and does not contain duplicates.
// We cannot insert main name in `new` because rename_all rules not yet //
// applied there. // In `Name::from_attrs` it's too early to insert the field's real name
// because rename_all rules have not yet gotten applied at that point.
match self.deserialize_aliases.binary_search(&self.deserialize) { match self.deserialize_aliases.binary_search(&self.deserialize) {
Ok(_) => {} // element already here Ok(_) => {} // already present
Err(pos) => self Err(pos) => self
.deserialize_aliases .deserialize_aliases
.insert(pos, self.deserialize.clone()), .insert(pos, self.deserialize.clone()),
@ -996,7 +997,7 @@ impl Variant {
if !self.name.deserialize_renamed { if !self.name.deserialize_renamed {
self.name.deserialize = rules.deserialize.apply_to_variant(&self.name.deserialize); self.name.deserialize = rules.deserialize.apply_to_variant(&self.name.deserialize);
} }
self.name.correct_aliases(); self.name.insert_deserialize_name_into_aliases();
} }
pub fn rename_all_rules(&self) -> RenameAllRules { pub fn rename_all_rules(&self) -> RenameAllRules {
@ -1336,7 +1337,7 @@ impl Field {
if !self.name.deserialize_renamed { if !self.name.deserialize_renamed {
self.name.deserialize = rules.deserialize.apply_to_field(&self.name.deserialize); self.name.deserialize = rules.deserialize.apply_to_field(&self.name.deserialize);
} }
self.name.correct_aliases(); self.name.insert_deserialize_name_into_aliases();
} }
pub fn skip_serializing(&self) -> bool { pub fn skip_serializing(&self) -> bool {