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

Simplify Option that is always Some

Browse Source
This commit is contained in:
David Tolnay 2018-04-13 00:12:30 -07:00
parent 1157ac0118
commit 1651f86d56
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serde_derive/src/de.rs
View File

@ -1894,7 +1894,7 @@ fn deserialize_identifier(
let variant_indices = 0u64..; let variant_indices = 0u64..;
let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len()); let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len());
let visit_other = if collect_other_fields { let visit_other = if collect_other_fields {
Some(quote! { quote! {
fn visit_bool<__E>(self, __value: bool) -> Result<Self::Value, __E> fn visit_bool<__E>(self, __value: bool) -> Result<Self::Value, __E>
where __E: _serde::de::Error where __E: _serde::de::Error
{ {
@ -1972,9 +1972,9 @@ fn deserialize_identifier(
{ {
Ok(__Field::__other(_serde::private::de::Content::Unit)) Ok(__Field::__other(_serde::private::de::Content::Unit))
} }
}) }
} else { } else {
Some(quote! { quote! {
fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result<Self::Value, __E> fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result<Self::Value, __E>
where __E: _serde::de::Error where __E: _serde::de::Error
{ {
@ -1987,7 +1987,7 @@ fn deserialize_identifier(
&#fallthrough_msg)) &#fallthrough_msg))
} }
} }
}) }
}; };
let bytes_to_str = if fallthrough.is_some() || collect_other_fields { let bytes_to_str = if fallthrough.is_some() || collect_other_fields {