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

Merge pull request #1888 from joshtriplett/fix-enum-deserialization-u64

Browse Source 
Fix hand-written enum variant deserializations to allow u64 discriminant
This commit is contained in:
David Tolnay 2020-09-11 11:55:35 -07:00 committed by GitHub
commit a5490e20e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
serde/src/de/impls.rs
View File

@ -1313,7 +1313,7 @@ macro_rules! variant_identifier {
formatter.write_str($expecting_message) formatter.write_str($expecting_message)
} }
fn visit_u32<E>(self, value: u32) -> Result<Self::Value, E> fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
where where
E: Error, E: Error,
{ {
@ -1321,7 +1321,7 @@ macro_rules! variant_identifier {
$( $(
$index => Ok($name_kind :: $variant), $index => Ok($name_kind :: $variant),
)* )*
_ => Err(Error::invalid_value(Unexpected::Unsigned(value as u64), &self),), _ => Err(Error::invalid_value(Unexpected::Unsigned(value), &self),),
} }
} }
@ -2326,7 +2326,7 @@ where
formatter.write_str("`Unbounded`, `Included` or `Excluded`") formatter.write_str("`Unbounded`, `Included` or `Excluded`")
} }
fn visit_u32<E>(self, value: u32) -> Result<Self::Value, E> fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
where where
E: Error, E: Error,
{ {
@ -2335,7 +2335,7 @@ where
1 => Ok(Field::Included), 1 => Ok(Field::Included),
2 => Ok(Field::Excluded), 2 => Ok(Field::Excluded),
_ => Err(Error::invalid_value( _ => Err(Error::invalid_value(
Unexpected::Unsigned(value as u64), Unexpected::Unsigned(value),
&self, &self,
)), )),
} }
@ -2492,7 +2492,7 @@ where
formatter.write_str("`Ok` or `Err`") formatter.write_str("`Ok` or `Err`")
} }
fn visit_u32<E>(self, value: u32) -> Result<Self::Value, E> fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
where where
E: Error, E: Error,
{ {
@ -2500,7 +2500,7 @@ where
0 => Ok(Field::Ok), 0 => Ok(Field::Ok),
1 => Ok(Field::Err), 1 => Ok(Field::Err),
_ => Err(Error::invalid_value( _ => Err(Error::invalid_value(
Unexpected::Unsigned(value as u64), Unexpected::Unsigned(value),
&self, &self,
)), )),
} }