Skip to content

Commit

Permalink
Merge #510: fix formatting after #507
Browse files Browse the repository at this point in the history
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
  • Loading branch information
sanket1729 committed Dec 29, 2022
2 parents 775941a + f0f7fd6 commit 7664570
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/miniscript/decode.rs
Expand Up @@ -22,10 +22,9 @@ use crate::miniscript::types::extra_props::ExtData;
use crate::miniscript::types::{Property, Type};
use crate::miniscript::ScriptContext;
use crate::prelude::*;
use crate::{bitcoin, hash256, Error, Miniscript, MiniscriptKey, ToPublicKey};

#[cfg(doc)]
use crate::Descriptor;
use crate::{bitcoin, hash256, Error, Miniscript, MiniscriptKey, ToPublicKey};

fn return_none<T>(_: usize) -> Option<T> {
None
Expand Down
3 changes: 1 addition & 2 deletions src/policy/concrete.rs
Expand Up @@ -27,10 +27,9 @@ use super::ENTAILMENT_MAX_TERMINALS;
use crate::expression::{self, FromTree};
use crate::miniscript::types::extra_props::TimelockInfo;
use crate::prelude::*;
use crate::{errstr, Error, ForEachKey, MiniscriptKey, Translator};

#[cfg(all(doc, not(feature = "compiler")))]
use crate::Descriptor;
use crate::{errstr, Error, ForEachKey, MiniscriptKey, Translator};

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

0 comments on commit 7664570

Please sign in to comment.