milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#2994: Remove private prelude module from `units` crate 

1cce1b5aa6 Remove private prelude module from units crate (Jamil Lambert, PhD)

Pull request description:

  The private prelude module has been removed from the units crate and instead imports are stated in full when needed.  As discussed in #2926.

ACKs for top commit:
  Kixunil:
    ACK 1cce1b5aa6
  apoelstra:
    ACK 1cce1b5aa6

Tree-SHA512: 58b93ff66f74399938bc1a7f59fe8d2a21d0437c7e90e0c190d3d6a8de30f9c9268c8e4288d1db287b4d190624968937b1ad6c6e54d29025370e47e71be925c1
This commit is contained in:
merge-script 2024-07-10 21:56:03 +00:00
parent bf027fc1f2 1cce1b5aa6
commit 0511f44d99
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
units/src/lib.rs
View File

@ -55,13 +55,3 @@ pub use self::{
parse::ParseIntError, parse::ParseIntError,
weight::Weight weight::Weight
}; };
#[rustfmt::skip]
#[allow(unused_imports)]
mod prelude {
#[cfg(all(feature = "alloc", not(feature = "std")))]
pub use alloc::{string::{String, ToString}, vec::Vec, boxed::Box, borrow::{Borrow, BorrowMut, Cow, ToOwned}, slice, rc};
#[cfg(feature = "std")]
pub use std::{string::{String, ToString}, vec::Vec, boxed::Box, borrow::{Borrow, BorrowMut, Cow, ToOwned}, rc};
}

4
units/src/locktime/absolute.rs
View File

@ -2,6 +2,8 @@
//! Provides [`Height`] and [`Time`] types used by the `rust-bitcoin` `absolute::LockTime` type. //! Provides [`Height`] and [`Time`] types used by the `rust-bitcoin` `absolute::LockTime` type.
#[cfg(feature = "alloc")]
use alloc::{string::String, boxed::Box};
use core::fmt; use core::fmt;
use internals::write_err; use internals::write_err;
@ -9,8 +11,6 @@ use internals::write_err;
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
use crate::parse; use crate::parse;
use crate::parse::ParseIntError; use crate::parse::ParseIntError;
#[cfg(feature = "alloc")]
use crate::prelude::{Box, String};
/// The Threshold for deciding whether a lock time value is a height or a time (see [Bitcoin Core]). /// The Threshold for deciding whether a lock time value is a height or a time (see [Bitcoin Core]).
/// ///