Skip to content

Commit cb90aa7

Browse files
sanket1729sanket1729
committed
Cargo fmt with default nightly
1 parent 245acbd commit cb90aa7

File tree

20 files changed

+65
-44
lines changed

20 files changed

+65
-44
lines changed

‎examples/taproot.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ fn main() {
124124
assert_eq!(max_sat_wt, 273);
125125

126126
// Compute the bitcoin address and check if it matches
127-
let addr = real_desc.address(&elements::AddressParams::ELEMENTS).unwrap();
127+
let addr = real_desc
128+
.address(&elements::AddressParams::ELEMENTS)
129+
.unwrap();
128130
let expected_addr = elements::Address::from_str(
129131
"ert1pxx6wkfdnnx97akwws8l8xdmx5n03qftvx2t269k4sn9adm2emz0sdnytn4",
130132
)

‎src/descriptor/bare.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use crate::miniscript::context::ScriptContext;
2929
use crate::policy::{semantic, Liftable};
3030
use crate::util::{varint_len, witness_to_scriptsig};
3131
use crate::{
32-
elementssig_to_rawsig, BareCtx, Error, ForEachKey, Miniscript, MiniscriptKey,
33-
Satisfier, ToPublicKey, TranslatePk, Translator,
32+
elementssig_to_rawsig, BareCtx, Error, ForEachKey, Miniscript, MiniscriptKey, Satisfier,
33+
ToPublicKey, TranslatePk, Translator,
3434
};
3535

3636
/// Create a Bare Descriptor. That is descriptor that is

‎src/descriptor/mod.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,15 +1065,24 @@ impl<Ext: Extension> Descriptor<DefiniteDescriptorKey, Ext> {
10651065
Ok(*sha256)
10661066
}
10671067

1068-
fn hash256(&mut self, hash256: &hash256::Hash) -> Result<hash256::Hash, ConversionError> {
1068+
fn hash256(
1069+
&mut self,
1070+
hash256: &hash256::Hash,
1071+
) -> Result<hash256::Hash, ConversionError> {
10691072
Ok(*hash256)
10701073
}
10711074

1072-
fn ripemd160(&mut self, ripemd160: &ripemd160::Hash) -> Result<ripemd160::Hash, ConversionError> {
1075+
fn ripemd160(
1076+
&mut self,
1077+
ripemd160: &ripemd160::Hash,
1078+
) -> Result<ripemd160::Hash, ConversionError> {
10731079
Ok(*ripemd160)
10741080
}
10751081

1076-
fn hash160(&mut self, hash160: &hash160::Hash) -> Result<hash160::Hash, ConversionError> {
1082+
fn hash160(
1083+
&mut self,
1084+
hash160: &hash160::Hash,
1085+
) -> Result<hash160::Hash, ConversionError> {
10771086
Ok(*hash160)
10781087
}
10791088
}

‎src/descriptor/segwitv0.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ use crate::miniscript::context::{ScriptContext, ScriptContextError};
2828
use crate::policy::{semantic, Liftable};
2929
use crate::util::varint_len;
3030
use crate::{
31-
elementssig_to_rawsig, Error, ForEachKey, Miniscript, MiniscriptKey, Satisfier,
32-
Segwitv0, ToPublicKey, TranslatePk, Translator,
31+
elementssig_to_rawsig, Error, ForEachKey, Miniscript, MiniscriptKey, Satisfier, Segwitv0,
32+
ToPublicKey, TranslatePk, Translator,
3333
};
3434
/// A Segwitv0 wsh descriptor
3535
#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]

‎src/descriptor/sortedmulti.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ use crate::miniscript::decode::Terminal;
2727
use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
2828
use crate::miniscript::{self};
2929
use crate::{
30-
errstr, expression, policy, script_num_size, Error, ForEachKey, Miniscript,
31-
MiniscriptKey, Satisfier, ToPublicKey, Translator,
30+
errstr, expression, policy, script_num_size, Error, ForEachKey, Miniscript, MiniscriptKey,
31+
Satisfier, ToPublicKey, Translator,
3232
};
3333

3434
/// Contents of a "sortedmulti" descriptor

‎src/descriptor/tr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::policy::semantic::Policy;
2020
use crate::policy::Liftable;
2121
use crate::util::{varint_len, witness_size};
2222
use crate::{
23-
errstr, Error, Extension, ForEachKey, MiniscriptKey, NoExt, Satisfier, Tap,
24-
ToPublicKey, TranslateExt, TranslatePk, Translator,
23+
errstr, Error, Extension, ForEachKey, MiniscriptKey, NoExt, Satisfier, Tap, ToPublicKey,
24+
TranslateExt, TranslatePk, Translator,
2525
};
2626

2727
/// A Taproot Tree representation.

‎src/interpreter/inner.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ use crate::descriptor::{CovOperations, LegacyCSFSCov};
2424
use crate::extensions::ParseableExt;
2525
use crate::miniscript::context::{NoChecks, ScriptContext};
2626
use crate::util::is_v1_p2tr;
27-
use crate::{hash256, BareCtx, Extension, Legacy, Miniscript, MiniscriptKey, Segwitv0, Tap, Translator};
27+
use crate::{
28+
hash256, BareCtx, Extension, Legacy, Miniscript, MiniscriptKey, Segwitv0, Tap, Translator,
29+
};
2830

2931
/// Attempts to parse a slice as a Bitcoin public key, checking compressedness
3032
/// if asked to, but otherwise dropping it

‎src/interpreter/stack.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ use super::error::PkEvalErrInner;
2424
use super::{
2525
verify_sersig, BitcoinKey, Error, HashLockType, KeySigPair, SatisfiedConstraint, TypedHash160,
2626
};
27-
use crate::hash256;
28-
use crate::Extension;
27+
use crate::{hash256, Extension};
2928

3029
/// Definition of Stack Element of the Stack used for interpretation of Miniscript.
3130
/// All stack elements with vec![] go to Dissatisfied and vec![1] are marked to Satisfied.

‎src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ compile_error!(
110110
"elements-miniscript currently only supports architectures with pointers wider than 16 bits"
111111
);
112112

113-
pub use {bitcoin, elements};
114113
#[cfg(feature = "serde")]
115114
pub use actual_serde as serde;
115+
pub use {bitcoin, elements};
116116
#[cfg(all(test, feature = "unstable"))]
117117
extern crate test;
118118

@@ -123,14 +123,14 @@ extern crate test;
123123
pub(crate) use bitcoin_miniscript::expression::{FromTree as BtcFromTree, Tree as BtcTree};
124124
pub(crate) use bitcoin_miniscript::policy::semantic::Policy as BtcPolicy;
125125
pub(crate) use bitcoin_miniscript::policy::Liftable as BtcLiftable;
126-
pub(crate) use bitcoin_miniscript::{
127-
Descriptor as BtcDescriptor, Error as BtcError, Miniscript as BtcMiniscript,
128-
Satisfier as BtcSatisfier, Segwitv0 as BtcSegwitv0, Terminal as BtcTerminal,
129-
};
130126
// re-export imports
131127
pub use bitcoin_miniscript::{
132128
hash256, DummyKey, DummyKeyHash, ForEachKey, MiniscriptKey, ToPublicKey,
133129
};
130+
pub(crate) use bitcoin_miniscript::{
131+
Descriptor as BtcDescriptor, Error as BtcError, Miniscript as BtcMiniscript,
132+
Satisfier as BtcSatisfier, Segwitv0 as BtcSegwitv0, Terminal as BtcTerminal,
133+
};
134134
// End imports
135135

136136
#[macro_use]

‎src/miniscript/astelem.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ use std::str::FromStr;
2424
use std::sync::Arc;
2525

2626
use elements::{opcodes, script};
27+
2728
use super::limits::{MAX_SCRIPT_ELEMENT_SIZE, MAX_STANDARD_P2WSH_STACK_ITEM_SIZE};
2829
use crate::extensions::ParseableExt;
2930
use crate::miniscript::context::SigType;
3031
use crate::miniscript::types::{self, Property};
3132
use crate::miniscript::ScriptContext;
3233
use crate::util::MsKeyBuilder;
3334
use crate::{
34-
errstr, expression, script_num_size, Error, ExtTranslator, Extension, ForEachKey,
35-
Miniscript, MiniscriptKey, Terminal, ToPublicKey, TranslateExt, TranslatePk, Translator,
35+
errstr, expression, script_num_size, Error, ExtTranslator, Extension, ForEachKey, Miniscript,
36+
MiniscriptKey, Terminal, ToPublicKey, TranslateExt, TranslatePk, Translator,
3637
};
3738

3839
impl<Pk: MiniscriptKey, Ctx: ScriptContext, Ext: Extension> Terminal<Pk, Ctx, Ext> {

0 commit comments

Comments
 (0)