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

Merge pull request #1971 from arthurprs/untagged-enum-fix-pr

Browse Source 
Allow floats to be deserialized from ints in untagged unions (part 2)
This commit is contained in:
David Tolnay 2021-01-26 14:41:56 -08:00 committed by GitHub
commit 9a84622c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
serde/src/private/de.rs
View File

@ -1741,6 +1741,25 @@ mod content {
_ => Err(self.invalid_type(&visitor)), _ => Err(self.invalid_type(&visitor)),
} }
} }
fn deserialize_float<V>(self, visitor: V) -> Result<V::Value, E>
where
V: Visitor<'de>,
{
match *self.content {
Content::F32(v) => visitor.visit_f32(v),
Content::F64(v) => visitor.visit_f64(v),
Content::U8(v) => visitor.visit_u8(v),
Content::U16(v) => visitor.visit_u16(v),
Content::U32(v) => visitor.visit_u32(v),
Content::U64(v) => visitor.visit_u64(v),
Content::I8(v) => visitor.visit_i8(v),
Content::I16(v) => visitor.visit_i16(v),
Content::I32(v) => visitor.visit_i32(v),
Content::I64(v) => visitor.visit_i64(v),
_ => Err(self.invalid_type(&visitor)),
}
}
} }
fn visit_content_seq_ref<'a, 'de, V, E>( fn visit_content_seq_ref<'a, 'de, V, E>(
@ -1888,25 +1907,14 @@ mod content {
where where
V: Visitor<'de>, V: Visitor<'de>,
{ {
match *self.content { self.deserialize_float(visitor)
Content::F32(v) => visitor.visit_f32(v),
Content::F64(v) => visitor.visit_f64(v),
Content::U64(v) => visitor.visit_u64(v),
Content::I64(v) => visitor.visit_i64(v),
_ => Err(self.invalid_type(&visitor)),
}
} }
fn deserialize_f64<V>(self, visitor: V) -> Result<V::Value, Self::Error> fn deserialize_f64<V>(self, visitor: V) -> Result<V::Value, Self::Error>
where where
V: Visitor<'de>, V: Visitor<'de>,
{ {
match *self.content { self.deserialize_float(visitor)
Content::F64(v) => visitor.visit_f64(v),
Content::U64(v) => visitor.visit_u64(v),
Content::I64(v) => visitor.visit_i64(v),
_ => Err(self.invalid_type(&visitor)),
}
} }
fn deserialize_char<V>(self, visitor: V) -> Result<V::Value, Self::Error> fn deserialize_char<V>(self, visitor: V) -> Result<V::Value, Self::Error>