Merge rust-bitcoin/rust-bitcoin#2895: Re-export UnprefixedHexError in the bitcoin crate root

10440b36a2 api: Run just check-api (Shing Him Ng)
452a7cc091 Re-export public functions, enums, and structs from units::parse in the bitcoin crate root (Shing Him Ng)

Pull request description:

  Re-export UnprefixedHexError in the bitcoin crate root

  Fixes #2874

ACKs for top commit:
  tcharding:
    ACK 10440b36a2

Tree-SHA512: 78a0676aa6d6fe63d810eeeebd3bf053d679d966d0aebf752760bfb440b2d4e831b0ff6b54b0306b390126b3f96a70c0846b4a1ec20aca96994d4a7b75e438e3
This commit is contained in:
merge-script 2024-06-27 20:00:10 +00:00
commit 326a6dce55
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
4 changed files with 45 additions and 1 deletions

View File

@ -10566,7 +10566,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time pub use bitcoin::locktime::relative::Time
pub use bitcoin::locktime::relative::TimeOverflowError pub use bitcoin::locktime::relative::TimeOverflowError
pub use bitcoin::parse::ContainsPrefixError
pub use bitcoin::parse::MissingPrefixError
pub use bitcoin::parse::ParseIntError pub use bitcoin::parse::ParseIntError
pub use bitcoin::parse::PrefixedHexError
pub use bitcoin::parse::UnprefixedHexError
pub use bitcoin::parse::hex_check_unprefixed
pub use bitcoin::parse::hex_remove_prefix
pub use bitcoin::parse::hex_u128
pub use bitcoin::parse::hex_u128_unchecked
pub use bitcoin::parse::hex_u128_unprefixed
pub use bitcoin::parse::hex_u32
pub use bitcoin::parse::hex_u32_unchecked
pub use bitcoin::parse::hex_u32_unprefixed
pub use bitcoin::parse::int
pub use bitcoin::relative::Height pub use bitcoin::relative::Height
pub use bitcoin::relative::Time pub use bitcoin::relative::Time
pub use bitcoin::relative::TimeOverflowError pub use bitcoin::relative::TimeOverflowError

View File

@ -10022,7 +10022,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time pub use bitcoin::locktime::relative::Time
pub use bitcoin::locktime::relative::TimeOverflowError pub use bitcoin::locktime::relative::TimeOverflowError
pub use bitcoin::parse::ContainsPrefixError
pub use bitcoin::parse::MissingPrefixError
pub use bitcoin::parse::ParseIntError pub use bitcoin::parse::ParseIntError
pub use bitcoin::parse::PrefixedHexError
pub use bitcoin::parse::UnprefixedHexError
pub use bitcoin::parse::hex_check_unprefixed
pub use bitcoin::parse::hex_remove_prefix
pub use bitcoin::parse::hex_u128
pub use bitcoin::parse::hex_u128_unchecked
pub use bitcoin::parse::hex_u128_unprefixed
pub use bitcoin::parse::hex_u32
pub use bitcoin::parse::hex_u32_unchecked
pub use bitcoin::parse::hex_u32_unprefixed
pub use bitcoin::parse::int
pub use bitcoin::relative::Height pub use bitcoin::relative::Height
pub use bitcoin::relative::Time pub use bitcoin::relative::Time
pub use bitcoin::relative::TimeOverflowError pub use bitcoin::relative::TimeOverflowError

View File

@ -9092,7 +9092,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time pub use bitcoin::locktime::relative::Time
pub use bitcoin::locktime::relative::TimeOverflowError pub use bitcoin::locktime::relative::TimeOverflowError
pub use bitcoin::parse::ContainsPrefixError
pub use bitcoin::parse::MissingPrefixError
pub use bitcoin::parse::ParseIntError pub use bitcoin::parse::ParseIntError
pub use bitcoin::parse::PrefixedHexError
pub use bitcoin::parse::UnprefixedHexError
pub use bitcoin::parse::hex_check_unprefixed
pub use bitcoin::parse::hex_remove_prefix
pub use bitcoin::parse::hex_u128
pub use bitcoin::parse::hex_u128_unchecked
pub use bitcoin::parse::hex_u128_unprefixed
pub use bitcoin::parse::hex_u32
pub use bitcoin::parse::hex_u32_unchecked
pub use bitcoin::parse::hex_u32_unprefixed
pub use bitcoin::parse::int
pub use bitcoin::relative::Height pub use bitcoin::relative::Height
pub use bitcoin::relative::Time pub use bitcoin::relative::Time
pub use bitcoin::relative::TimeOverflowError pub use bitcoin::relative::TimeOverflowError

View File

@ -199,7 +199,12 @@ pub mod amount {
/// Unit parsing utilities. /// Unit parsing utilities.
pub mod parse { pub mod parse {
/// Re-export everything from the [`units::parse`] module. /// Re-export everything from the [`units::parse`] module.
pub use units::parse::ParseIntError; #[doc(inline)]
pub use units::parse::{
hex_check_unprefixed, hex_remove_prefix, hex_u128, hex_u128_unchecked, hex_u128_unprefixed,
hex_u32, hex_u32_unchecked, hex_u32_unprefixed, int, ContainsPrefixError,
MissingPrefixError, ParseIntError, PrefixedHexError, UnprefixedHexError,
};
} }
mod encode_impls { mod encode_impls {