pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 13:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts between transparent and proc-macro2 upgrade

Browse Source
This commit is contained in:
David Tolnay
2018-05-20 21:57:23 -07:00
parent b13875dd97
commit 6bbc415fdf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/internals/attr.rs
+1 -1
View File
@@ -231,7 +231,7 @@ impl Container {
} }
// Parse `#[serde(transparent)]` // Parse `#[serde(transparent)]`
Meta(Word(word)) if word == "transparent" => { Meta(Word(ref word)) if word == "transparent" => {
transparent.set_true(); transparent.set_true();
} }
serde_derive/src/ser.rs
+1 -1
View File
@@ -193,7 +193,7 @@ fn serialize_transparent(cont: &Container, params: &Parameters) -> Fragment {
Data::Enum(_) => unreachable!(), Data::Enum(_) => unreachable!(),
}; };
let self_var = params.self_var; let self_var = &params.self_var;
let transparent_field = fields.iter().find(|f| f.attrs.transparent()).unwrap(); let transparent_field = fields.iter().find(|f| f.attrs.transparent()).unwrap();
let member = &transparent_field.member; let member = &transparent_field.member;