From d45ca2f5e4050832a79f187eecb6a6f20ec11565 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 25 Mar 2018 12:30:30 +0200
Subject: [PATCH] Re-export NonZero* types from ::lib

---
 serde/src/de/impls.rs  | 5 +----
 serde/src/lib.rs       | 2 +-
 serde/src/ser/impls.rs | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
index 5ea67a21..20652af3 100644
--- a/serde/src/de/impls.rs
+++ b/serde/src/de/impls.rs
@@ -1936,7 +1936,7 @@ where
 }
 
 macro_rules! nonzero_integers {
-    ( @ $( $T: ty, )+ ) => {
+    ( $( $T: ty, )+ ) => {
         $(
             #[cfg(feature = "unstable")]
             impl<'de> Deserialize<'de> for $T {
@@ -1953,9 +1953,6 @@ macro_rules! nonzero_integers {
             }
         )+
     };
-    ( $( $T: ident, )+ ) => {
-        nonzero_integers!(@ $(::lib::num::$T,)+ );
-    }
 }
 
 nonzero_integers! {
diff --git a/serde/src/lib.rs b/serde/src/lib.rs
index b42c0f39..df49ff72 100644
--- a/serde/src/lib.rs
+++ b/serde/src/lib.rs
@@ -215,7 +215,7 @@ mod lib {
     pub use core::nonzero::{NonZero, Zeroable};
 
     #[cfg(feature = "unstable")]
-    pub use core::num;
+    pub use core::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroUsize};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs
index bba65a71..fc6d99a0 100644
--- a/serde/src/ser/impls.rs
+++ b/serde/src/ser/impls.rs
@@ -368,7 +368,7 @@ macro_rules! nonzero_integers {
     ( $( $T: ident, )+ ) => {
         $(
             #[cfg(feature = "unstable")]
-            impl Serialize for ::lib::num::$T {
+            impl Serialize for $T {
                 fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                 where
                     S: Serializer,