Release 1.0.109

* Deserialize adjacently tagged newtype variants with optional content as None instead of erroring when content field is missing

* refactor to remove duplicate code and remove panic

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "1.0.108" # remember to update html_root_url and serde_derive dependency
+version = "1.0.109" # remember to update html_root_url and serde_derive dependency
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -14,7 +14,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "crates-io.md", "README.md",
 build = "build.rs"
 
 [dependencies]
-serde_derive = { version = "=1.0.108", optional = true, path = "../serde_derive" }
+serde_derive = { version = "=1.0.109", optional = true, path = "../serde_derive" }
 
 [dev-dependencies]
 serde_derive = { version = "1.0", path = "../serde_derive" }

serde/src/lib.rs

@@ -75,7 +75,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.108")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.109")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and

serde/src/ser/impls.rs

@@ -616,7 +616,7 @@ impl Serialize for SystemTime {
         use super::SerializeStruct;
         let duration_since_epoch = self
             .duration_since(UNIX_EPOCH)
-            .expect("SystemTime must be later than UNIX_EPOCH");
+            .map_err(|_| S::Error::custom("SystemTime must be later than UNIX_EPOCH"))?;
         let mut state = try!(serializer.serialize_struct("SystemTime", 2));
         try!(state.serialize_field("secs_since_epoch", &duration_since_epoch.as_secs()));
         try!(state.serialize_field("nanos_since_epoch", &duration_since_epoch.subsec_nanos()));

serde_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_derive"
-version = "1.0.108" # remember to update html_root_url
+version = "1.0.109" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"

serde_derive/src/de.rs

@@ -1377,39 +1377,44 @@ fn deserialize_adjacently_tagged_enum(
         }
     };
 
-    fn is_unit(variant: &Variant) -> bool {
-        match variant.style {
-            Style::Unit => true,
-            Style::Struct | Style::Tuple | Style::Newtype => false,
-        }
-    }
-
     let mut missing_content = quote! {
         _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#content))
     };
-    if variants.iter().any(is_unit) {
+    let mut missing_content_fallthrough = quote!();
-        let fallthrough = if variants.iter().all(is_unit) {
+    let mut missing_content_arms = variants
-            None
+        .iter()
-        } else {
+        .enumerate()
-            Some(quote! {
+        .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
-                _ => #missing_content
+        .filter_map(|(i, variant)| {
-            })
+            let variant_index = field_i(i);
-        };
+            let variant_ident = &variant.ident;
-        let arms = variants
+
-            .iter()
+            let arm = match variant.style {
-            .enumerate()
+                Style::Unit => quote! {
-            .filter(|&(_, variant)| !variant.attrs.skip_deserializing() && is_unit(variant))
+                    _serde::export::Ok(#this::#variant_ident)
-            .map(|(i, variant)| {
+                },
-                let variant_index = field_i(i);
+                Style::Newtype if variant.attrs.deserialize_with().is_none() => {
-                let variant_ident = &variant.ident;
+                    let span = variant.original.span();
-                quote! {
+                    let func = quote_spanned!(span=> _serde::private::de::missing_field);
-                    __Field::#variant_index => _serde::export::Ok(#this::#variant_ident),
+                    quote! {
+                        #func(#content).map(#this::#variant_ident)
+                    }
                 }
-            });
+                _ => {
+                    missing_content_fallthrough = quote!(_ => #missing_content);
+                    return None;
+                }
+            };
+            Some(quote! {
+                __Field::#variant_index => #arm,
+            })
+        })
+        .peekable();
+    if missing_content_arms.peek().is_some() {
         missing_content = quote! {
             match __field {
-                #(#arms)*
+                #(#missing_content_arms)*
-                #fallthrough
+                #missing_content_fallthrough
             }
         };
     }

serde_derive/src/lib.rs

@@ -13,7 +13,7 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.108")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.109")]
 #![allow(unknown_lints, bare_trait_objects)]
 #![deny(clippy::all, clippy::pedantic)]
 // Ignored clippy lints

serde_test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_test"
-version = "1.0.108" # remember to update html_root_url
+version = "1.0.109" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"

serde_test/src/lib.rs

@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.108")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.109")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints

test_suite/tests/test_macros.rs

@@ -1145,6 +1145,20 @@ fn test_adjacently_tagged_enum() {
         ],
     );
 
+    // optional newtype with no content field
+    assert_de_tokens(
+        &AdjacentlyTagged::Newtype::<Option<u8>>(None),
+        &[
+            Token::Struct {
+                name: "AdjacentlyTagged",
+                len: 1,
+            },
+            Token::Str("t"),
+            Token::Str("Newtype"),
+            Token::StructEnd,
+        ],
+    );
+
     // tuple with tag first
     assert_tokens(
         &AdjacentlyTagged::Tuple::<u8>(1, 1),