Resolve conflict with pr 1115

This commit is contained in:
David Tolnay
2017-12-11 20:59:54 -08:00
parent 0c2e91f28a
commit 0dac13e4db
2 changed files with 31 additions and 0 deletions
+6
View File
@@ -86,6 +86,12 @@ struct StructSkipDefault {
#[serde(skip_deserializing)] a: i32,
}
#[derive(PartialEq, Debug, Deserialize)]
#[serde(default)]
struct StructSkipDefaultGeneric<T> {
#[serde(skip_deserializing)] t: T,
}
impl Default for StructSkipDefault {
fn default() -> Self {
StructSkipDefault {