Skip to content

Commit 7664570

Browse files
committed
Merge #510: fix formatting after #507
f0f7fd6 fix formatting after #507 (Andrew Poelstra) Pull request description: I merged #507 without checking CI, and it turns out there was a rustfmt issue. FIx that. ACKs for top commit: tcharding: ACK f0f7fd6 sanket1729: ACK f0f7fd6 Tree-SHA512: 909d0a118c0e36f40b7aa6f0d6c7718b1b77b00acbb07ae0183a26e107a24f477debebc701545a8295a31dc589b9f40174a44a0c6e935ecab445c447078c3784
2 parents 775941a + f0f7fd6 commit 7664570

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/miniscript/decode.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ use crate::miniscript::types::extra_props::ExtData;
2222
use crate::miniscript::types::{Property, Type};
2323
use crate::miniscript::ScriptContext;
2424
use crate::prelude::*;
25-
use crate::{bitcoin, hash256, Error, Miniscript, MiniscriptKey, ToPublicKey};
26-
2725
#[cfg(doc)]
2826
use crate::Descriptor;
27+
use crate::{bitcoin, hash256, Error, Miniscript, MiniscriptKey, ToPublicKey};
2928

3029
fn return_none<T>(_: usize) -> Option<T> {
3130
None

src/policy/concrete.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ use super::ENTAILMENT_MAX_TERMINALS;
2727
use crate::expression::{self, FromTree};
2828
use crate::miniscript::types::extra_props::TimelockInfo;
2929
use crate::prelude::*;
30-
use crate::{errstr, Error, ForEachKey, MiniscriptKey, Translator};
31-
3230
#[cfg(all(doc, not(feature = "compiler")))]
3331
use crate::Descriptor;
32+
use crate::{errstr, Error, ForEachKey, MiniscriptKey, Translator};
3433

3534
/// Maximum TapLeafs allowed in a compiled TapTree
3635
#[cfg(feature = "compiler")]

0 commit comments

Comments
 (0)