wip: Run cargo +nightly fmt

Author: tcharding

src/descriptor/bare.rs

@@ -20,8 +20,8 @@ use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
-    BareCtx, Error, ForEachKey, Miniscript, Key, Satisfier, ToPublicKey, TranslateErr,
-    TranslatePk, Translator,
+    BareCtx, Error, ForEachKey, Key, Miniscript, Satisfier, ToPublicKey, TranslateErr, TranslatePk,
+    Translator,
 };
 
 /// Create a Bare Descriptor. That is descriptor that is

src/descriptor/mod.rs

@@ -25,8 +25,8 @@ use self::checksum::verify_checksum;
 use crate::miniscript::{Legacy, Miniscript, Segwitv0};
 use crate::prelude::*;
 use crate::{
-    expression, hash256, miniscript, BareCtx, Error, ForEachKey, Key, Satisfier,
-    ToPublicKey, TranslateErr, TranslatePk, Translator,
+    expression, hash256, miniscript, BareCtx, Error, ForEachKey, Key, Satisfier, ToPublicKey,
+    TranslateErr, TranslatePk, Translator,
 };
 
 mod bare;

src/descriptor/segwitv0.rs

@@ -18,7 +18,7 @@ use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::varint_len;
 use crate::{
-    Error, ForEachKey, Miniscript, Key, Satisfier, Segwitv0, ToPublicKey, TranslateErr,
+    Error, ForEachKey, Key, Miniscript, Satisfier, Segwitv0, ToPublicKey, TranslateErr,
     TranslatePk, Translator,
 };
 /// A Segwitv0 wsh descriptor

src/descriptor/sh.rs

@@ -22,8 +22,8 @@ use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
-    push_opcode_size, Error, ForEachKey, Legacy, Miniscript, Key, Satisfier, Segwitv0,
-    ToPublicKey, TranslateErr, TranslatePk, Translator,
+    push_opcode_size, Error, ForEachKey, Key, Legacy, Miniscript, Satisfier, Segwitv0, ToPublicKey,
+    TranslateErr, TranslatePk, Translator,
 };
 
 /// A Legacy p2sh Descriptor

src/descriptor/sortedmulti.rs

@@ -17,8 +17,8 @@ use crate::miniscript::decode::Terminal;
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::prelude::*;
 use crate::{
-    errstr, expression, miniscript, policy, script_num_size, Error, ForEachKey, Miniscript,
-    Key, Satisfier, ToPublicKey, TranslateErr, Translator,
+    errstr, expression, miniscript, policy, script_num_size, Error, ForEachKey, Key, Miniscript,
+    Satisfier, ToPublicKey, TranslateErr, Translator,
 };
 
 /// Contents of a "sortedmulti" descriptor

src/descriptor/tr.rs

@@ -19,8 +19,8 @@ use crate::policy::Liftable;
 use crate::prelude::*;
 use crate::util::{varint_len, witness_size};
 use crate::{
-    errstr, Error, ForEachKey, Key, Satisfier, ScriptContext, Tap, ToPublicKey,
-    TranslateErr, TranslatePk, Translator,
+    errstr, Error, ForEachKey, Key, Satisfier, ScriptContext, Tap, ToPublicKey, TranslateErr,
+    TranslatePk, Translator,
 };
 
 /// A Taproot Tree representation.

src/iter/mod.rs

@@ -16,7 +16,7 @@ pub use tree::{
 };
 
 use crate::sync::Arc;
-use crate::{Miniscript, Key, ScriptContext, Terminal};
+use crate::{Key, Miniscript, ScriptContext, Terminal};
 
 impl<'a, Pk: Key, Ctx: ScriptContext> TreeLike for &'a Miniscript<Pk, Ctx> {
     fn as_node(&self) -> Tree<Self> {

src/miniscript/analyzable.rs

@@ -11,7 +11,7 @@ use core::fmt;
 use std::error;
 
 use crate::prelude::*;
-use crate::{Miniscript, Key, ScriptContext, Terminal};
+use crate::{Key, Miniscript, ScriptContext, Terminal};
 
 /// Params for parsing miniscripts that either non-sane or non-specified(experimental) in the spec.
 /// Used as a parameter [`Miniscript::from_str_ext`] and [`Miniscript::parse_with_ext`].

src/miniscript/astelem.rs

@@ -20,9 +20,7 @@ use crate::miniscript::types::{self, Property};
 use crate::miniscript::ScriptContext;
 use crate::prelude::*;
 use crate::util::MsKeyBuilder;
-use crate::{
-    errstr, expression, AbsLockTime, Error, Miniscript, Key, Terminal, ToPublicKey,
-};
+use crate::{errstr, expression, AbsLockTime, Error, Key, Miniscript, Terminal, ToPublicKey};
 
 impl<Pk: Key, Ctx: ScriptContext> Terminal<Pk, Ctx> {
     /// Internal helper function for displaying wrapper types; returns

src/miniscript/context.rs

@@ -17,7 +17,7 @@ use crate::miniscript::limits::{
 use crate::miniscript::types;
 use crate::prelude::*;
 use crate::util::witness_to_scriptsig;
-use crate::{hash256, Error, ForEachKey, Miniscript, Key, Terminal};
+use crate::{hash256, Error, ForEachKey, Key, Miniscript, Terminal};
 
 /// Error for Script Context
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -269,19 +269,15 @@ where
 
     /// Check the consensus + policy(if not disabled) rules that are not based
     /// satisfaction
-    fn check_global_validity<Pk: Key>(
-        ms: &Miniscript<Pk, Self>,
-    ) -> Result<(), ScriptContextError> {
+    fn check_global_validity<Pk: Key>(ms: &Miniscript<Pk, Self>) -> Result<(), ScriptContextError> {
         Self::check_global_consensus_validity(ms)?;
         Self::check_global_policy_validity(ms)?;
         Ok(())
     }
 
     /// Check the consensus + policy(if not disabled) rules including the
     /// ones for satisfaction
-    fn check_local_validity<Pk: Key>(
-        ms: &Miniscript<Pk, Self>,
-    ) -> Result<(), ScriptContextError> {
+    fn check_local_validity<Pk: Key>(ms: &Miniscript<Pk, Self>) -> Result<(), ScriptContextError> {
         Self::check_global_consensus_validity(ms)?;
         Self::check_global_policy_validity(ms)?;
         Self::check_local_consensus_validity(ms)?;
@@ -881,17 +877,13 @@ impl ScriptContext for NoChecks {
         Ok(())
     }
 
-    fn check_global_validity<Pk: Key>(
-        ms: &Miniscript<Pk, Self>,
-    ) -> Result<(), ScriptContextError> {
+    fn check_global_validity<Pk: Key>(ms: &Miniscript<Pk, Self>) -> Result<(), ScriptContextError> {
         Self::check_global_consensus_validity(ms)?;
         Self::check_global_policy_validity(ms)?;
         Ok(())
     }
 
-    fn check_local_validity<Pk: Key>(
-        ms: &Miniscript<Pk, Self>,
-    ) -> Result<(), ScriptContextError> {
+    fn check_local_validity<Pk: Key>(ms: &Miniscript<Pk, Self>) -> Result<(), ScriptContextError> {
         Self::check_global_consensus_validity(ms)?;
         Self::check_global_policy_validity(ms)?;
         Self::check_local_consensus_validity(ms)?;

src/miniscript/decode.rs

@@ -24,7 +24,7 @@ use crate::miniscript::ScriptContext;
 use crate::prelude::*;
 #[cfg(doc)]
 use crate::Descriptor;
-use crate::{bitcoin, hash256, AbsLockTime, Error, Miniscript, Key, ToPublicKey};
+use crate::{bitcoin, hash256, AbsLockTime, Error, Key, Miniscript, ToPublicKey};
 
 fn return_none<T>(_: usize) -> Option<T> {
     None

src/miniscript/iter.rs

@@ -10,7 +10,7 @@ use core::ops::Deref;
 use sync::Arc;
 
 use super::decode::Terminal;
-use super::{Miniscript, Key, ScriptContext};
+use super::{Key, Miniscript, ScriptContext};
 use crate::prelude::*;
 
 /// Iterator-related extensions for [Miniscript]

src/miniscript/satisfy.rs

@@ -18,7 +18,7 @@ use sync::Arc;
 use super::context::SigType;
 use crate::prelude::*;
 use crate::util::witness_size;
-use crate::{Miniscript, Key, ScriptContext, Terminal, ToPublicKey};
+use crate::{Key, Miniscript, ScriptContext, Terminal, ToPublicKey};
 
 /// Type alias for 32 byte Preimage.
 pub type Preimage32 = [u8; 32];
@@ -1467,11 +1467,7 @@ impl Satisfaction {
     }
 
     /// Produce a satisfaction non-malleable satisfaction
-    pub(super) fn satisfy<
-        Pk: Key + ToPublicKey,
-        Ctx: ScriptContext,
-        Sat: Satisfier<Pk>,
-    >(
+    pub(super) fn satisfy<Pk: Key + ToPublicKey, Ctx: ScriptContext, Sat: Satisfier<Pk>>(
         term: &Terminal<Pk, Ctx>,
         stfr: &Sat,
         root_has_sig: bool,
@@ -1488,11 +1484,7 @@ impl Satisfaction {
     }
 
     /// Produce a satisfaction(possibly malleable)
-    pub(super) fn satisfy_mall<
-        Pk: Key + ToPublicKey,
-        Ctx: ScriptContext,
-        Sat: Satisfier<Pk>,
-    >(
+    pub(super) fn satisfy_mall<Pk: Key + ToPublicKey, Ctx: ScriptContext, Sat: Satisfier<Pk>>(
         term: &Terminal<Pk, Ctx>,
         stfr: &Sat,
         root_has_sig: bool,

src/policy/compiler.rs

@@ -19,7 +19,7 @@ use crate::miniscript::types::{self, ErrorKind, ExtData, Property, Type};
 use crate::miniscript::ScriptContext;
 use crate::policy::Concrete;
 use crate::prelude::*;
-use crate::{policy, Miniscript, Key, Terminal};
+use crate::{policy, Key, Miniscript, Terminal};
 
 type PolicyCache<Pk, Ctx> =
     BTreeMap<(Concrete<Pk>, OrdF64, Option<OrdF64>), BTreeMap<CompilationKey, AstElemExt<Pk, Ctx>>>;