Merge rust-bitcoin/rust-bitcoin#3037: `primitives`: Re-export `units` types

991c73cdf9 primitives: Re-export everything from units (Tobin C. Harding)
7a44908aee primitives: Use wildard re-export in locktimes (Tobin C. Harding)
d1c876eda5 Remove rustfmt attribute (Tobin C. Harding)
e3d9376a9b units: Remove serde re-export (Tobin C. Harding)

Pull request description:

  Re-export `units` types by doing:

  - Patch 1: Remove the public re-export of `serde` so that it does not shadow the private one in `primitives`
  - Patch2: Fix formatting (remove attribute and format)
  - Patch 3 and 4: Use wildcard re-exports

ACKs for top commit:
  Kixunil:
    ACK 991c73cdf9
  apoelstra:
    ACK 991c73cdf9

Tree-SHA512: dd71aa97fe5718a1229bfe26b776a72ebdd745a15a0e8ce8dae421c3a4c49f0f1e27d676056b24c35318cc3643a2ce712b4a69cc09f42b7c43259680bea931f3

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;
 

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).

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).
 ///

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;