diff --git a/serde/src/private/mod.rs b/serde/src/private/mod.rs index f1207c8a..8e8ce7d2 100644 --- a/serde/src/private/mod.rs +++ b/serde/src/private/mod.rs @@ -7,7 +7,7 @@ pub mod ser; pub mod doc; pub use crate::lib::clone::Clone; -pub use crate::lib::convert::{From, Into}; +pub use crate::lib::convert::{From, Into, TryFrom}; pub use crate::lib::default::Default; pub use crate::lib::fmt::{self, Formatter}; pub use crate::lib::marker::PhantomData; @@ -20,8 +20,6 @@ pub use self::string::from_utf8_lossy; #[cfg(any(feature = "alloc", feature = "std"))] pub use crate::lib::{ToString, Vec}; -pub use crate::lib::convert::TryFrom; - mod string { use crate::lib::*; diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index 8bbb244a..930f0b88 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -582,15 +582,6 @@ macro_rules! nonzero_integers { } } -nonzero_integers! { - NonZeroU8, - NonZeroU16, - NonZeroU32, - NonZeroU64, - NonZeroU128, - NonZeroUsize, -} - nonzero_integers! { NonZeroI8, NonZeroI16, @@ -598,6 +589,12 @@ nonzero_integers! { NonZeroI64, NonZeroI128, NonZeroIsize, + NonZeroU8, + NonZeroU16, + NonZeroU32, + NonZeroU64, + NonZeroU128, + NonZeroUsize, } impl Serialize for Cell