Skip to content

Commit

Permalink
Merge rust-bitcoin#2895: Re-export UnprefixedHexError in the bitcoin …
Browse files Browse the repository at this point in the history
…crate root

10440b3 api: Run just check-api (Shing Him Ng)
452a7cc 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 rust-bitcoin#2874

ACKs for top commit:
  tcharding:
    ACK 10440b3

Tree-SHA512: 78a0676aa6d6fe63d810eeeebd3bf053d679d966d0aebf752760bfb440b2d4e831b0ff6b54b0306b390126b3f96a70c0846b4a1ec20aca96994d4a7b75e438e3
  • Loading branch information
apoelstra committed Jun 27, 2024
2 parents 74519c3 + 10440b3 commit 326a6dc
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 1 deletion.
13 changes: 13 additions & 0 deletions api/bitcoin/all-features.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10566,7 +10566,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time
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::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::Time
pub use bitcoin::relative::TimeOverflowError
13 changes: 13 additions & 0 deletions api/bitcoin/default-features.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10022,7 +10022,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time
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::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::Time
pub use bitcoin::relative::TimeOverflowError
13 changes: 13 additions & 0 deletions api/bitcoin/no-features.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9092,7 +9092,20 @@ pub use bitcoin::locktime::absolute::Time
pub use bitcoin::locktime::relative::Height
pub use bitcoin::locktime::relative::Time
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::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::Time
pub use bitcoin::relative::TimeOverflowError
7 changes: 6 additions & 1 deletion bitcoin/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,12 @@ pub mod amount {
/// Unit parsing utilities.
pub mod parse {
/// 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 {
Expand Down

0 comments on commit 326a6dc

Please sign in to comment.