Skip to content

Commit 88195ff

Browse files
committed
Merge #382: Remove extern crates
b44acef Re-export serde using without extern crate (Tobin C. Harding) 15817dd docs: Remove extern crate (Tobin C. Harding) aacece4 examples: Remove crate imports (Tobin C. Harding) Pull request description: Now we have edition 2018 we can remove the usage of `extern crate`. - Patch 1 does the `examples/` - Patch 2 does the docs - Patch 3 does the main crate ACKs for top commit: apoelstra: ACK b44acef sanket1729: ACK b44acef Tree-SHA512: f66280d1484aaac7607ee71537eef173d37545da39adf0e5de759bb5dee7d856aeaeb079bd312768360e21cca85945fadb42383353709082175f49961c06a6ba
2 parents 3665ea0 + b44acef commit 88195ff

File tree

7 files changed

+1
-21
lines changed

7 files changed

+1
-21
lines changed

examples/htlc.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
//! Example: Create an HTLC with miniscript using the policy compiler
1616
17-
extern crate bitcoin;
18-
extern crate miniscript;
19-
2017
use bitcoin::Network;
2118
use miniscript::descriptor::Wsh;
2219
use miniscript::policy::{Concrete, Liftable};

examples/parse.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
//! Example: Parsing a descriptor from a string.
1616
17-
use bitcoin;
18-
use miniscript;
19-
2017
use miniscript::{descriptor::DescriptorType, Descriptor, DescriptorTrait};
2118
use std::str::FromStr;
2219

examples/psbt.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use bitcoin;
2-
31
use bitcoin::consensus::encode::deserialize;
42
use bitcoin::hashes::hex::FromHex;
53
use miniscript::psbt::PsbtExt;

examples/sign_multisig.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
//! Example: Signing a 2-of-3 multisignature.
1616
17-
use bitcoin;
18-
use miniscript;
19-
2017
use bitcoin::blockdata::witness::Witness;
2118
use bitcoin::secp256k1;
2219
use miniscript::DescriptorTrait;

examples/verify_tx.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
//! Example: Verifying a signed transaction.
1616
17-
use bitcoin;
18-
use miniscript;
19-
2017
use bitcoin::consensus::Decodable;
2118
use bitcoin::secp256k1::{self, Secp256k1};
2219
use bitcoin::util::sighash;

src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@
5353
//! ## Deriving an address from a descriptor
5454
//!
5555
//! ```rust
56-
//! extern crate bitcoin;
57-
//! extern crate miniscript;
58-
//!
5956
//! use std::str::FromStr;
6057
//! use miniscript::{DescriptorTrait};
6158
//!
@@ -100,7 +97,7 @@
10097

10198
pub use bitcoin;
10299
#[cfg(feature = "serde")]
103-
pub extern crate serde;
100+
pub use serde;
104101
#[cfg(all(test, feature = "unstable"))]
105102
extern crate test;
106103

src/miniscript/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ impl<Ctx: ScriptContext> Miniscript<Ctx::Key, Ctx> {
173173
/// ## Decode/Parse a miniscript from script hex
174174
///
175175
/// ```rust
176-
/// extern crate bitcoin;
177-
/// extern crate miniscript;
178-
///
179176
/// use miniscript::Miniscript;
180177
/// use miniscript::{Segwitv0, Tap};
181178
/// use miniscript::bitcoin::secp256k1::XOnlyPublicKey;

0 commit comments

Comments
 (0)