Skip to content

Commit 4e5a386

Browse files
committed
Merge #502: Use allow attribute
b481cba Use allow attribute (Tobin C. Harding) Pull request description: Done in an effort to clear all clippy warnings. Add two allow attributes to quieten clippy. This may not be the best solution but it at least flags the code for future improvement and allows us to enable clippy in CI (along with other clippy work). ACKs for top commit: apoelstra: ACK b481cba Tree-SHA512: bbadca63a974f3b218e558d7fd788546fc79f4e8e433659256bdf8b5184e4587ac3dccd4b983d10c08aa5e0e550f31bd4dc6a7a16f3b5e82fececdabc9526ce2
2 parents b0cd8c1 + b481cba commit 4e5a386

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/descriptor/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ impl Descriptor<DescriptorPublicKey> {
738738
///
739739
/// For multipath descriptors it will return as many descriptors as there is
740740
/// "parallel" paths. For regular descriptors it will just return itself.
741+
#[allow(clippy::blocks_in_if_conditions)]
741742
pub fn into_single_descriptors(self) -> Result<Vec<Descriptor<DescriptorPublicKey>>, Error> {
742743
// All single-path descriptors contained in this descriptor.
743744
let mut descriptors = Vec::new();

src/miniscript/types/extra_props.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,7 @@ fn sat_minus_option_dissat(
10551055
//
10561056
// Args are of form: (<max_sat_size>, <count_dissat_size>)
10571057
// max_[dis]sat_size of form: (<cost_of_witness>, <cost_of_sciptsig>)
1058+
#[allow(clippy::type_complexity)]
10581059
fn sat_minus_dissat_witness(
10591060
a: &(Option<(usize, usize)>, Option<(usize, usize)>),
10601061
b: &(Option<(usize, usize)>, Option<(usize, usize)>),

0 commit comments

Comments
 (0)