pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-27 14:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch serde-rs/master into Gankro/deserialize_from

Browse Source
This commit is contained in:
David Tolnay
2017-12-11 20:49:23 -08:00
parent 13e7bee0e6 b7eb42aa6b
commit 0c2e91f28a
13 changed files with 115 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+27 -4
View File
@@ -583,7 +583,30 @@ fn deserialize_seq(
};
}
let let_default = match *cattrs.default() {
attr::Default::Default => {
Some(
quote!(
let __default: Self::Value = _serde::export::Default::default();
),
)
}
attr::Default::Path(ref path) => {
Some(
quote!(
let __default: Self::Value = #path();
),
)
}
attr::Default::None => {
// We don't need the default value, to prevent an unused variable warning
// we'll leave the line empty.
None
}
};
quote_block! {
#let_default
#(#let_values)*
_serde::export::Ok(#result)
}
@@ -2034,15 +2057,15 @@ fn deserialize_map(
attr::Default::Default => {
Some(
quote!(
let __default: Self::Value = _serde::export::Default::default();
),
let __default: Self::Value = _serde::export::Default::default();
),
)
}
attr::Default::Path(ref path) => {
Some(
quote!(
let __default: Self::Value = #path();
),
let __default: Self::Value = #path();
),
)
}
attr::Default::None => {