diff --git a/bitcoin/src/blockdata/script/mod.rs b/bitcoin/src/blockdata/script/mod.rs index c79e6d856..d0e269975 100644 --- a/bitcoin/src/blockdata/script/mod.rs +++ b/bitcoin/src/blockdata/script/mod.rs @@ -75,10 +75,10 @@ use crate::OutPoint; #[doc(inline)] pub use self::{ borrowed::ScriptExt, - builder::*, - instruction::*, + builder::Builder, + instruction::{Instruction, Instructions, InstructionIndices}, owned::ScriptBufExt, - push_bytes::*, + push_bytes::{PushBytes, PushBytesBuf, PushBytesError, PushBytesErrorReport}, }; #[doc(inline)] pub use primitives::script::*; diff --git a/bitcoin/src/blockdata/script/push_bytes.rs b/bitcoin/src/blockdata/script/push_bytes.rs index 654342b14..fc8cf163d 100644 --- a/bitcoin/src/blockdata/script/push_bytes.rs +++ b/bitcoin/src/blockdata/script/push_bytes.rs @@ -9,7 +9,8 @@ use crate::script; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] -pub use self::primitive::*; +// This is not the usual re-export, `primitive` here is an code audit thing. +pub use self::primitive::{PushBytes, PushBytesBuf}; /// This module only contains required operations so that outside functions wouldn't accidentally /// break invariants. Therefore auditing this module should be sufficient. @@ -421,7 +422,8 @@ impl PushBytesErrorReport for core::convert::Infallible { fn input_len(&self) -> usize { match *self {} } } -pub use error::*; +#[doc(inline)] +pub use error::PushBytesError; #[cfg(any(target_pointer_width = "16", target_pointer_width = "32"))] mod error { diff --git a/primitives/src/script/mod.rs b/primitives/src/script/mod.rs index 3791165de..c06c57c70 100644 --- a/primitives/src/script/mod.rs +++ b/primitives/src/script/mod.rs @@ -24,8 +24,8 @@ use crate::prelude::{Borrow, BorrowMut, Box, Cow, ToOwned, Vec}; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] pub use self::{ - borrowed::*, - owned::*, + borrowed::Script, + owned::ScriptBuf, }; // We keep all the `Script` and `ScriptBuf` impls together since its easier to see side-by-side.