Merge rust-bitcoin#4717: script: Remove public re-exports

ae1c0ed script: Remove public re-exports (Tobin C. Harding)

Pull request description:

  By convention we do not re-export things from modules where they are used. Also the `borrowed` and `owned` modules are private so these public re-exports make no sense.
  
  FTR users can do both of these already
  
  - `use bitcoin::script::{Script, ScriptBuf};`
  - `use bitcoin::{Script, ScriptBuf};`


ACKs for top commit:
  apoelstra:
    ACK ae1c0ed; successfully ran local tests


Tree-SHA512: 1ba792597ba06462c9c73db8c28d7f14b945b19bbb1a19a45539c2257cdfbb0378018725e31fef33e7ca1df2a639606e9f729dab0455a7e76a396117f055a4da

Author: apoelstra

bitcoin/src/blockdata/script/borrowed.rs

@@ -10,7 +10,7 @@ use secp256k1::{Secp256k1, Verification};
 use super::witness_version::WitnessVersion;
 use super::{
     Builder, Instruction, InstructionIndices, Instructions, PushBytes, RedeemScriptSizeError,
-    ScriptHash, WScriptHash, WitnessScriptSizeError,
+    Script, ScriptHash, WScriptHash, WitnessScriptSizeError,
 };
 use crate::consensus::{self, Encodable};
 use crate::key::{PublicKey, UntweakedPublicKey, WPubkeyHash};
@@ -22,10 +22,6 @@ use crate::script::{self, ScriptBufExt as _};
 use crate::taproot::{LeafVersion, TapLeafHash, TapNodeHash};
 use crate::{Amount, FeeRate, ScriptBuf};
 
-#[rustfmt::skip]            // Keep public re-exports separate.
-#[doc(inline)]
-pub use primitives::script::Script;
-
 crate::internal_macros::define_extension_trait! {
     /// Extension functionality for the [`Script`] type.
     pub trait ScriptExt impl for Script {

bitcoin/src/blockdata/script/owned.rs

@@ -7,7 +7,7 @@ use hex::FromHex as _;
 use internals::ToU64 as _;
 use secp256k1::{Secp256k1, Verification};
 
-use super::{opcode_to_verify, Builder, Instruction, PushBytes, ScriptExtPriv as _};
+use super::{opcode_to_verify, Builder, Instruction, PushBytes, ScriptBuf, ScriptExtPriv as _};
 use crate::consensus;
 use crate::key::{
     PubkeyHash, PublicKey, TapTweak, TweakedPublicKey, UntweakedPublicKey, WPubkeyHash,
@@ -20,10 +20,6 @@ use crate::script::witness_version::WitnessVersion;
 use crate::script::{self, ScriptHash, WScriptHash};
 use crate::taproot::TapNodeHash;
 
-#[rustfmt::skip]            // Keep public re-exports separate.
-#[doc(inline)]
-pub use primitives::script::ScriptBuf;
-
 crate::internal_macros::define_extension_trait! {
     /// Extension functionality for the [`ScriptBuf`] type.
     pub trait ScriptBufExt impl for ScriptBuf {