@@ -383,7 +383,7 @@ impl Plan {
383
383
. entry ( pk)
384
384
. and_modify ( |( leaf_hashes, _) | {
385
385
if let Some ( lh) = leaf_hash {
386
- if leaf_hashes. iter ( ) . find ( |& & i| i == lh) . is_none ( ) {
386
+ if leaf_hashes. iter ( ) . all ( |& i| i != lh) {
387
387
leaf_hashes. push ( lh) ;
388
388
}
389
389
}
@@ -661,15 +661,15 @@ pub trait IntoAssets {
661
661
}
662
662
663
663
impl IntoAssets for KeyMap {
664
- fn into_assets ( self ) -> Assets { Assets :: from_iter ( self . into_iter ( ) . map ( | ( k , _ ) | k ) ) }
664
+ fn into_assets ( self ) -> Assets { Assets :: from_iter ( self . into_keys ( ) ) }
665
665
}
666
666
667
667
impl IntoAssets for DescriptorPublicKey {
668
668
fn into_assets ( self ) -> Assets { vec ! [ self ] . into_assets ( ) }
669
669
}
670
670
671
671
impl IntoAssets for Vec < DescriptorPublicKey > {
672
- fn into_assets ( self ) -> Assets { Assets :: from_iter ( self . into_iter ( ) ) }
672
+ fn into_assets ( self ) -> Assets { Assets :: from_iter ( self ) }
673
673
}
674
674
675
675
impl IntoAssets for sha256:: Hash {
@@ -723,14 +723,14 @@ impl Assets {
723
723
}
724
724
725
725
fn append ( & mut self , b : Self ) {
726
- self . keys . extend ( b. keys . into_iter ( ) ) ;
727
- self . sha256_preimages . extend ( b. sha256_preimages . into_iter ( ) ) ;
726
+ self . keys . extend ( b. keys ) ;
727
+ self . sha256_preimages . extend ( b. sha256_preimages ) ;
728
728
self . hash256_preimages
729
- . extend ( b. hash256_preimages . into_iter ( ) ) ;
729
+ . extend ( b. hash256_preimages ) ;
730
730
self . ripemd160_preimages
731
- . extend ( b. ripemd160_preimages . into_iter ( ) ) ;
731
+ . extend ( b. ripemd160_preimages ) ;
732
732
self . hash160_preimages
733
- . extend ( b. hash160_preimages . into_iter ( ) ) ;
733
+ . extend ( b. hash160_preimages ) ;
734
734
735
735
self . relative_timelock = b. relative_timelock . or ( self . relative_timelock ) ;
736
736
self . absolute_timelock = b. absolute_timelock . or ( self . absolute_timelock ) ;
0 commit comments