Merge rust-bitcoin/rust-bitcoin#3547: Remove more wildcard re-exports

0bf1910980 Remove wildcard from script self re-exports (Tobin C. Harding)
397a4b9382 Remove wildcard in push_bytes module (Tobin C. Harding)

Pull request description:

  We thought #3436 was done (well I thought it was), turns out I was wrong.

ACKs for top commit:
  jamillambert:
    ACK 0bf1910980
  apoelstra:
    ACK 0bf1910980a13005496244ec4d4adf0553afbc73; successfully ran local tests

Tree-SHA512: 131a4aa4a907099790d14cfc2d19305943a2270cf6852c7dd92e35ea69188c9a40797fb22fd2ed8b2fefc2d6380b884401b5e32f521711f0f7b2da610d0e332f

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::*;

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 {

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.