From 1651f86d56309c22818c8d6de4b638d5e9ca9d3b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 13 Apr 2018 00:12:30 -0700 Subject: [PATCH] Simplify Option that is always Some --- serde_derive/src/de.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 4253c286..2fe48b85 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -1894,7 +1894,7 @@ fn deserialize_identifier( let variant_indices = 0u64..; let fallthrough_msg = format!("{} index 0 <= i < {}", index_expecting, fields.len()); let visit_other = if collect_other_fields { - Some(quote! { + quote! { fn visit_bool<__E>(self, __value: bool) -> Result where __E: _serde::de::Error { @@ -1972,9 +1972,9 @@ fn deserialize_identifier( { Ok(__Field::__other(_serde::private::de::Content::Unit)) } - }) + } } else { - Some(quote! { + quote! { fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result where __E: _serde::de::Error { @@ -1987,7 +1987,7 @@ fn deserialize_identifier( &#fallthrough_msg)) } } - }) + } }; let bytes_to_str = if fallthrough.is_some() || collect_other_fields {