diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 5438df424..342352994 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -32,12 +32,12 @@ pub mod locktime; pub mod opcodes; pub mod sequence; -#[rustfmt::skip] // Keep public re-exports separate. +#[doc(inline)] +pub use units::*; + #[doc(inline)] #[cfg(feature = "alloc")] -pub use self::{ - locktime::{absolute, relative}, -}; +pub use self::locktime::{absolute, relative}; #[doc(inline)] pub use self::sequence::Sequence; diff --git a/primitives/src/locktime/absolute.rs b/primitives/src/locktime/absolute.rs index 964ee9016..93f31a2c6 100644 --- a/primitives/src/locktime/absolute.rs +++ b/primitives/src/locktime/absolute.rs @@ -17,9 +17,7 @@ use crate::absolute; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] -pub use units::locktime::absolute::{ - Height, Time, LOCK_TIME_THRESHOLD, ConversionError, ParseHeightError, ParseTimeError, -}; +pub use units::locktime::absolute::*; /// An absolute lock time value, representing either a block height or a UNIX timestamp (seconds /// since epoch). diff --git a/primitives/src/locktime/relative.rs b/primitives/src/locktime/relative.rs index 953582c9c..82b5da41d 100644 --- a/primitives/src/locktime/relative.rs +++ b/primitives/src/locktime/relative.rs @@ -18,7 +18,7 @@ use crate::Sequence; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] -pub use units::locktime::relative::{Height, Time, TimeOverflowError}; +pub use units::locktime::relative::*; /// A relative lock time value, representing either a block height or time (512 second intervals). /// diff --git a/units/src/lib.rs b/units/src/lib.rs index 249e9867b..abd1875f8 100644 --- a/units/src/lib.rs +++ b/units/src/lib.rs @@ -27,10 +27,6 @@ extern crate alloc; #[cfg(feature = "std")] extern crate std; -/// A generic serialization/deserialization framework. -#[cfg(feature = "serde")] -pub extern crate serde; - pub mod amount; #[cfg(feature = "alloc")] pub mod block;