Release 1.0.58

Fix generated code for deserializing untagged newtype variant

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "1.0.57" # remember to update html_root_url
+version = "1.0.58" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"

serde/src/de/from_primitive.rs

@@ -39,12 +39,10 @@ macro_rules! uint_to {
 }
 
 pub trait FromPrimitive: Sized {
-    fn from_isize(n: isize) -> Option<Self>;
     fn from_i8(n: i8) -> Option<Self>;
     fn from_i16(n: i16) -> Option<Self>;
     fn from_i32(n: i32) -> Option<Self>;
     fn from_i64(n: i64) -> Option<Self>;
-    fn from_usize(n: usize) -> Option<Self>;
     fn from_u8(n: u8) -> Option<Self>;
     fn from_u16(n: u16) -> Option<Self>;
     fn from_u32(n: u32) -> Option<Self>;
@@ -54,10 +52,6 @@ pub trait FromPrimitive: Sized {
 macro_rules! impl_from_primitive_for_int {
     ($t:ident) => {
         impl FromPrimitive for $t {
-            #[inline]
-            fn from_isize(n: isize) -> Option<Self> {
-                int_to_int!($t, n)
-            }
             #[inline]
             fn from_i8(n: i8) -> Option<Self> {
                 int_to_int!($t, n)
@@ -75,10 +69,6 @@ macro_rules! impl_from_primitive_for_int {
                 int_to_int!($t, n)
             }
             #[inline]
-            fn from_usize(n: usize) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
             fn from_u8(n: u8) -> Option<Self> {
                 uint_to!($t, n)
             }
@@ -101,10 +91,6 @@ macro_rules! impl_from_primitive_for_int {
 macro_rules! impl_from_primitive_for_uint {
     ($t:ident) => {
         impl FromPrimitive for $t {
-            #[inline]
-            fn from_isize(n: isize) -> Option<Self> {
-                int_to_uint!($t, n)
-            }
             #[inline]
             fn from_i8(n: i8) -> Option<Self> {
                 int_to_uint!($t, n)
@@ -122,10 +108,6 @@ macro_rules! impl_from_primitive_for_uint {
                 int_to_uint!($t, n)
             }
             #[inline]
-            fn from_usize(n: usize) -> Option<Self> {
-                uint_to!($t, n)
-            }
-            #[inline]
             fn from_u8(n: u8) -> Option<Self> {
                 uint_to!($t, n)
             }
@@ -148,10 +130,6 @@ macro_rules! impl_from_primitive_for_uint {
 macro_rules! impl_from_primitive_for_float {
     ($t:ident) => {
         impl FromPrimitive for $t {
-            #[inline]
-            fn from_isize(n: isize) -> Option<Self> {
-                Some(n as Self)
-            }
             #[inline]
             fn from_i8(n: i8) -> Option<Self> {
                 Some(n as Self)
@@ -169,10 +147,6 @@ macro_rules! impl_from_primitive_for_float {
                 Some(n as Self)
             }
             #[inline]
-            fn from_usize(n: usize) -> Option<Self> {
-                Some(n as Self)
-            }
-            #[inline]
             fn from_u8(n: u8) -> Option<Self> {
                 Some(n as Self)
             }

serde/src/lib.rs

@@ -79,7 +79,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.57")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.58")]
 // 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_derive/Cargo.toml

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

serde_derive/src/de.rs

@@ -1802,10 +1802,8 @@ fn deserialize_untagged_newtype_variant(
         }
         Some(path) => {
             quote_block! {
-                let __value: #field_ty = _serde::export::Result::map(
+                let __value: _serde::export::Result<#field_ty, _> = #path(#deserializer);
-                    #path(#deserializer),
+                _serde::export::Result::map(__value, #this::#variant_ident)
-                    #this::#variant_ident);
-                __value
             }
         }
     }

serde_derive/src/lib.rs

@@ -22,7 +22,7 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.57")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.58")]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Whitelisted clippy lints
 #![cfg_attr(

serde_test/Cargo.toml

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

serde_test/src/lib.rs

@@ -161,7 +161,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.57")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.58")]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Whitelisted clippy lints
 #![cfg_attr(feature = "cargo-clippy", allow(float_cmp))]

test_suite/tests/test_gen.rs

@@ -643,6 +643,16 @@ fn test_gen() {
     struct ImpliciltyBorrowedOption<'a> {
         option: std::option::Option<&'a str>,
     }
+
+    #[derive(Serialize, Deserialize)]
+    #[serde(untagged)]
+    enum UntaggedNewtypeVariantWith {
+        Newtype(
+            #[serde(serialize_with = "ser_x")]
+            #[serde(deserialize_with = "de_x")]
+            X,
+        ),
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////