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

Merge rust-bitcoin/rust-bitcoin#3069: Remove re-export of `ParseIntError` 

ab581a90f8 Remove re-export of ParseIntError (Tobin C. Harding)

Pull request description:

  In d242125 I claimed that `ParseIntError` was somehow special, I no longer thing this is the case. As we pin down the re-export policy (for errors and other types) it is hard if we have one non-typical re-export.

  We have https://github.com/rust-bitcoin/rust-bitcoin/issues/3068 to discuss the policy, for now just remove the unusual re-export.

ACKs for top commit:
  Kixunil:
    ACK ab581a90f8
  shinghim:
    ACK ab581a90f8
  apoelstra:
    ACK ab581a90f8

Tree-SHA512: 5ac4123aeb27c8cee78e5760f21e70be8035d526ba7e14e72759cba27f98b51cc2cba9b2bf0eeb99e0f6b7210ec4a750986bb6c5dc0725ed892730fdec8a7e06
This commit is contained in:
merge-script 2024-07-19 15:36:21 +00:00
parent ff5d437d42 ab581a90f8
commit e1478b1802
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/src/blockdata/script/witness_version.rs
View File

@ -11,7 +11,7 @@ use core::fmt;
use core::str::FromStr; use core::str::FromStr;
use internals::write_err; use internals::write_err;
use units::{parse, ParseIntError}; use units::parse::{self, ParseIntError};
use crate::opcodes::all::*; use crate::opcodes::all::*;
use crate::opcodes::Opcode; use crate::opcodes::Opcode;

2
units/src/lib.rs
View File

@ -51,7 +51,5 @@ pub use self::amount::{Amount, SignedAmount};
pub use self::{ pub use self::{
block::{BlockHeight, BlockInterval}, block::{BlockHeight, BlockInterval},
fee_rate::FeeRate, fee_rate::FeeRate,
// ParseIntError is used by other modules, so we re-export it.
parse::ParseIntError,
weight::Weight weight::Weight
}; };