Skip to content

Commit 4dbb0c1

Browse files
tchardingtcharding
committed
Update to use edition 2018
Use `cargo fix --edition` to update the codebase to edition 2018, the only changes made are adding `crate::` prefix to use statements. In addition; do a bunch of manual additions of `crate::`. Includes `integration_test` crate also.
1 parent eee1cef commit 4dbb0c1

34 files changed

+200
-194
lines changed

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <sanket
55
repository = "https://github.com/apoelstra/miniscript"
66
description = "Miniscript: a subset of Bitcoin Script designed for analysis"
77
license = "CC0-1.0"
8+
edition = "2018"
89

910
[features]
1011
compiler = []

‎integration_test/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use bitcoincore_rpc::{Auth, Client, RpcApi};
1313
mod test_cpp;
1414
mod test_desc;
1515
mod test_util;
16-
use test_util::TestData;
16+
use crate::test_util::TestData;
1717

1818
struct StdLogger;
1919

‎src/descriptor/bare.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ use std::{fmt, str::FromStr};
2222

2323
use bitcoin::{self, blockdata::script, Script};
2424

25-
use expression::{self, FromTree};
26-
use miniscript::context::ScriptContext;
27-
use policy::{semantic, Liftable};
28-
use util::{varint_len, witness_to_scriptsig};
29-
use {
25+
use crate::expression::{self, FromTree};
26+
use crate::miniscript::context::ScriptContext;
27+
use crate::policy::{semantic, Liftable};
28+
use crate::util::{varint_len, witness_to_scriptsig};
29+
use crate::{
3030
BareCtx, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey, Satisfier, ToPublicKey,
3131
TranslatePk,
3232
};

‎src/descriptor/checksum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
use std::iter::FromIterator;
77

8-
use Error;
8+
use crate::Error;
99

1010
const INPUT_CHARSET: &str = "0123456789()[],'/*abcdefgh@:$%{}IJKLMNOPQRSTUVWXYZ&+-.;<=>?!^_|~ijklmnopqrstuvwxyzABCDEFGH`#\"\\ ";
1111
const CHECKSUM_CHARSET: &str = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";

‎src/descriptor/key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bitcoin::{
1010
XOnlyPublicKey, XpubIdentifier,
1111
};
1212

13-
use {MiniscriptKey, ToPublicKey};
13+
use crate::{MiniscriptKey, ToPublicKey};
1414

1515
/// Single public key without any origin or range information
1616
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash)]

‎src/descriptor/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ use bitcoin::blockdata::witness::Witness;
3333
use bitcoin::{self, secp256k1, Script};
3434

3535
use self::checksum::verify_checksum;
36-
use expression;
37-
use miniscript;
38-
use miniscript::{Legacy, Miniscript, Segwitv0};
39-
use {
36+
use crate::expression;
37+
use crate::miniscript;
38+
use crate::miniscript::{Legacy, Miniscript, Segwitv0};
39+
use crate::{
4040
BareCtx, Error, ForEach, ForEachKey, MiniscriptKey, Satisfier, ToPublicKey, TranslatePk,
4141
TranslatePk2,
4242
};
@@ -827,25 +827,25 @@ mod tests {
827827
use super::checksum::desc_checksum;
828828
use super::tr::Tr;
829829
use super::*;
830+
use crate::descriptor::key::Wildcard;
831+
use crate::descriptor::{
832+
DescriptorPublicKey, DescriptorSecretKey, DescriptorSinglePub, DescriptorXKey,
833+
};
834+
use crate::hex_script;
835+
use crate::{Descriptor, DummyKey, Error, Miniscript, Satisfier, TranslatePk2};
830836
use bitcoin::blockdata::opcodes::all::{OP_CLTV, OP_CSV};
831837
use bitcoin::blockdata::script::Instruction;
832838
use bitcoin::blockdata::{opcodes, script};
833839
use bitcoin::hashes::hex::{FromHex, ToHex};
834840
use bitcoin::hashes::{hash160, sha256};
835841
use bitcoin::util::bip32;
836842
use bitcoin::{self, secp256k1, EcdsaSighashType, PublicKey};
837-
use descriptor::key::Wildcard;
838-
use descriptor::{
839-
DescriptorPublicKey, DescriptorSecretKey, DescriptorSinglePub, DescriptorXKey,
840-
};
841-
use hex_script;
842843
use std::cmp;
843844
use std::collections::HashMap;
844845
use std::str::FromStr;
845-
use {Descriptor, DummyKey, Error, Miniscript, Satisfier, TranslatePk2};
846846

847847
#[cfg(feature = "compiler")]
848-
use policy;
848+
use crate::policy;
849849

850850
type StdDescriptor = Descriptor<PublicKey>;
851851
const TEST_PK: &'static str =

‎src/descriptor/pretaproot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::{
66
use bitcoin::{self, Script};
77

88
use super::{checksum::verify_checksum, Bare, Pkh, Sh, Wpkh, Wsh};
9-
use {expression, DescriptorTrait, Error, MiniscriptKey, Satisfier, ToPublicKey};
9+
use crate::{expression, DescriptorTrait, Error, MiniscriptKey, Satisfier, ToPublicKey};
1010

1111
/// Script descriptor
1212
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -241,7 +241,7 @@ serde_string_impl_pk!(PreTaprootDescriptor, "a pre-taproot script descriptor");
241241
pub(crate) mod traits {
242242
use bitcoin::Script;
243243

244-
use {
244+
use crate::{
245245
descriptor::{Pkh, Sh, Wpkh, Wsh},
246246
DescriptorTrait, MiniscriptKey, ToPublicKey,
247247
};

‎src/descriptor/segwitv0.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ use std::{fmt, str::FromStr};
2020

2121
use bitcoin::{self, Script};
2222

23-
use expression::{self, FromTree};
24-
use miniscript::context::{ScriptContext, ScriptContextError};
25-
use policy::{semantic, Liftable};
26-
use util::varint_len;
27-
use {
23+
use crate::expression::{self, FromTree};
24+
use crate::miniscript::context::{ScriptContext, ScriptContextError};
25+
use crate::policy::{semantic, Liftable};
26+
use crate::util::varint_len;
27+
use crate::{
2828
Error, ForEach, ForEachKey, Miniscript, MiniscriptKey, Satisfier, Segwitv0, ToPublicKey,
2929
TranslatePk,
3030
};

‎src/descriptor/sh.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ use std::{fmt, str::FromStr};
2222

2323
use bitcoin::{self, blockdata::script, Script};
2424

25-
use expression::{self, FromTree};
26-
use miniscript::context::ScriptContext;
27-
use policy::{semantic, Liftable};
28-
use push_opcode_size;
29-
use util::{varint_len, witness_to_scriptsig};
30-
use {
25+
use crate::expression::{self, FromTree};
26+
use crate::miniscript::context::ScriptContext;
27+
use crate::policy::{semantic, Liftable};
28+
use crate::push_opcode_size;
29+
use crate::util::{varint_len, witness_to_scriptsig};
30+
use crate::{
3131
Error, ForEach, ForEachKey, Legacy, Miniscript, MiniscriptKey, Satisfier, Segwitv0,
3232
ToPublicKey, TranslatePk,
3333
};

‎src/descriptor/sortedmulti.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ use std::{fmt, marker::PhantomData, str::FromStr};
2020

2121
use bitcoin::blockdata::script;
2222

23-
use expression;
24-
use miniscript::{
23+
use crate::expression;
24+
use crate::miniscript::{
2525
self, context::ScriptContext, decode::Terminal, limits::MAX_PUBKEYS_PER_MULTISIG,
2626
};
27-
use policy;
28-
use script_num_size;
29-
use {errstr, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey, Satisfier, ToPublicKey};
27+
use crate::policy;
28+
use crate::script_num_size;
29+
use crate::{
30+
errstr, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey, Satisfier, ToPublicKey,
31+
};
3032

3133
/// Contents of a "sortedmulti" descriptor
3234
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]

‎src/descriptor/tr.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
// Tapscript
22

3-
use policy::semantic::Policy;
4-
use policy::Liftable;
5-
use util::{varint_len, witness_size};
6-
use {DescriptorTrait, ForEach, ForEachKey, Satisfier, ToPublicKey, TranslatePk};
3+
use crate::policy::semantic::Policy;
4+
use crate::policy::Liftable;
5+
use crate::util::{varint_len, witness_size};
6+
use crate::{DescriptorTrait, ForEach, ForEachKey, Satisfier, ToPublicKey, TranslatePk};
77

88
use super::checksum::{desc_checksum, verify_checksum};
9+
use crate::errstr;
10+
use crate::expression::{self, FromTree};
11+
use crate::miniscript::Miniscript;
12+
use crate::Tap;
13+
use crate::{Error, MiniscriptKey};
914
use bitcoin::blockdata::opcodes;
1015
use bitcoin::util::taproot::{
1116
LeafVersion, TaprootBuilder, TaprootBuilderError, TaprootSpendInfo, TAPROOT_CONTROL_BASE_SIZE,
1217
TAPROOT_CONTROL_MAX_NODE_COUNT, TAPROOT_CONTROL_NODE_SIZE,
1318
};
1419
use bitcoin::{self, secp256k1, Script};
15-
use errstr;
16-
use expression::{self, FromTree};
17-
use miniscript::Miniscript;
1820
use std::cmp::{self, max};
1921
use std::hash;
2022
use std::sync::{Arc, Mutex};
2123
use std::{fmt, str::FromStr};
22-
use Tap;
23-
use {Error, MiniscriptKey};
2424

2525
/// A Taproot Tree representation.
2626
// Hidden leaves are not yet supported in descriptor spec. Conceptually, it should
@@ -749,7 +749,7 @@ where
749749
#[cfg(test)]
750750
mod tests {
751751
use super::*;
752-
use ForEachKey;
752+
use crate::ForEachKey;
753753

754754
#[test]
755755
fn test_for_each() {

‎src/expression.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
1818
use std::str::FromStr;
1919

20-
use errstr;
21-
use Error;
20+
use crate::errstr;
21+
use crate::Error;
2222

23-
use MAX_RECURSION_DEPTH;
23+
use crate::MAX_RECURSION_DEPTH;
2424

2525
#[derive(Debug)]
2626
/// A token of the form `x(...)` or `x`

‎src/interpreter/error.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub enum Error {
6060
/// Last byte of this signature isn't a standard sighash type
6161
NonStandardSighash(Vec<u8>),
6262
/// Miniscript error
63-
Miniscript(::Error),
63+
Miniscript(crate::Error),
6464
/// MultiSig requires 1 extra zero element apart from the `k` signatures
6565
MissingExtraZeroMultiSig,
6666
/// Script abortion because of incorrect dissatisfaction for multisig.
@@ -173,8 +173,8 @@ impl From<bitcoin::SchnorrSigError> for Error {
173173
}
174174

175175
#[doc(hidden)]
176-
impl From<::Error> for Error {
177-
fn from(e: ::Error) -> Error {
176+
impl From<crate::Error> for Error {
177+
fn from(e: crate::Error) -> Error {
178178
Error::Miniscript(e)
179179
}
180180
}

‎src/interpreter/inner.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ use bitcoin::blockdata::witness::Witness;
1717
use bitcoin::hashes::{hash160, sha256, Hash};
1818
use bitcoin::util::taproot::{ControlBlock, TAPROOT_ANNEX_PREFIX};
1919

20-
use {BareCtx, Legacy, Segwitv0, Tap};
20+
use crate::{BareCtx, Legacy, Segwitv0, Tap};
2121

2222
use super::{stack, BitcoinKey, Error, Stack, TypedHash160};
23-
use miniscript::context::{NoChecks, ScriptContext};
24-
use {Miniscript, MiniscriptKey};
23+
use crate::miniscript::context::{NoChecks, ScriptContext};
24+
use crate::{Miniscript, MiniscriptKey};
2525

2626
/// Attempts to parse a slice as a Bitcoin public key, checking compressedness
2727
/// if asked to, but otherwise dropping it
@@ -58,9 +58,11 @@ fn script_from_stackelem<'a, Ctx: ScriptContext>(
5858
stack::Element::Push(sl) => {
5959
Miniscript::parse_insane(&bitcoin::Script::from(sl.to_owned())).map_err(Error::from)
6060
}
61-
stack::Element::Satisfied => Miniscript::from_ast(::Terminal::True).map_err(Error::from),
61+
stack::Element::Satisfied => {
62+
Miniscript::from_ast(crate::Terminal::True).map_err(Error::from)
63+
}
6264
stack::Element::Dissatisfied => {
63-
Miniscript::from_ast(::Terminal::False).map_err(Error::from)
65+
Miniscript::from_ast(crate::Terminal::False).map_err(Error::from)
6466
}
6567
}
6668
}

‎src/interpreter/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ use std::borrow::Borrow;
2525
use std::fmt;
2626
use std::str::FromStr;
2727

28+
use crate::miniscript::context::NoChecks;
29+
use crate::miniscript::ScriptContext;
30+
use crate::Miniscript;
31+
use crate::Terminal;
32+
use crate::{Descriptor, ToPublicKey};
2833
use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d};
2934
use bitcoin::{self, secp256k1, TxOut};
30-
use miniscript::context::NoChecks;
31-
use miniscript::ScriptContext;
32-
use Miniscript;
33-
use Terminal;
34-
use {Descriptor, ToPublicKey};
3535

3636
mod error;
3737
mod inner;
3838
mod stack;
3939

40-
use MiniscriptKey;
40+
use crate::MiniscriptKey;
4141

4242
pub use self::error::Error;
4343
use self::error::PkEvalErrInner;
@@ -444,7 +444,7 @@ impl<'txin> Interpreter<'txin> {
444444
/// since it cannot distinguish between sorted and unsorted multisigs (and anyway
445445
/// it can only see the final keys, keyorigin info is lost in serializing to Bitcoin).
446446
/// x-only keys are translated to [`bitcoin::PublicKey`] with 0x02 prefix.
447-
pub fn inferred_descriptor(&self) -> Result<Descriptor<bitcoin::PublicKey>, ::Error> {
447+
pub fn inferred_descriptor(&self) -> Result<Descriptor<bitcoin::PublicKey>, crate::Error> {
448448
Descriptor::from_str(&self.inferred_descriptor_string())
449449
}
450450
}
@@ -1032,13 +1032,13 @@ mod tests {
10321032

10331033
use super::inner::ToNoChecks;
10341034
use super::*;
1035+
use crate::miniscript::context::NoChecks;
1036+
use crate::Miniscript;
1037+
use crate::MiniscriptKey;
1038+
use crate::ToPublicKey;
10351039
use bitcoin;
10361040
use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d, Hash};
10371041
use bitcoin::secp256k1::{self, Secp256k1};
1038-
use miniscript::context::NoChecks;
1039-
use Miniscript;
1040-
use MiniscriptKey;
1041-
use ToPublicKey;
10421042

10431043
fn setup_keys_sigs(
10441044
n: usize,

‎src/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ use std::{error, fmt, hash, str};
123123
use bitcoin::blockdata::{opcodes, script};
124124
use bitcoin::hashes::{hash160, sha256, Hash};
125125

126-
pub use descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait};
127-
pub use interpreter::Interpreter;
128-
pub use miniscript::context::{BareCtx, Legacy, ScriptContext, Segwitv0, Tap};
129-
pub use miniscript::decode::Terminal;
130-
pub use miniscript::satisfy::{Preimage32, Satisfier};
131-
pub use miniscript::Miniscript;
126+
pub use crate::descriptor::{Descriptor, DescriptorPublicKey, DescriptorTrait};
127+
pub use crate::interpreter::Interpreter;
128+
pub use crate::miniscript::context::{BareCtx, Legacy, ScriptContext, Segwitv0, Tap};
129+
pub use crate::miniscript::decode::Terminal;
130+
pub use crate::miniscript::satisfy::{Preimage32, Satisfier};
131+
pub use crate::miniscript::Miniscript;
132132

133-
pub use descriptor::pretaproot::{traits::PreTaprootDescriptorTrait, PreTaprootDescriptor};
133+
pub use crate::descriptor::pretaproot::{traits::PreTaprootDescriptorTrait, PreTaprootDescriptor};
134134

135135
///Public key trait which can be converted to Hash type
136136
pub trait MiniscriptKey: Clone + Eq + Ord + fmt::Debug + fmt::Display + hash::Hash {
@@ -567,7 +567,7 @@ pub enum Error {
567567
Secp(bitcoin::secp256k1::Error),
568568
#[cfg(feature = "compiler")]
569569
/// Compiler related errors
570-
CompilerError(policy::compiler::CompilerError),
570+
CompilerError(crate::policy::compiler::CompilerError),
571571
/// Errors related to policy
572572
PolicyError(policy::concrete::PolicyError),
573573
/// Errors related to lifting
@@ -741,8 +741,8 @@ impl fmt::Display for Error {
741741

742742
#[doc(hidden)]
743743
#[cfg(feature = "compiler")]
744-
impl From<policy::compiler::CompilerError> for Error {
745-
fn from(e: policy::compiler::CompilerError) -> Error {
744+
impl From<crate::policy::compiler::CompilerError> for Error {
745+
fn from(e: crate::policy::compiler::CompilerError) -> Error {
746746
Error::CompilerError(e)
747747
}
748748
}

0 commit comments

Comments
 (0)