@@ -584,10 +584,8 @@ impl Descriptor<DescriptorPublicKey> {
584
584
585
585
translate_hash_clone ! ( DescriptorPublicKey , DescriptorPublicKey , ConversionError ) ;
586
586
}
587
- self . translate_pk ( & mut Derivator ( index) ) . map_err ( |e| {
588
- e. try_into_translator_err ( )
589
- . expect ( "No Context errors while translating" )
590
- } )
587
+ self . translate_pk ( & mut Derivator ( index) )
588
+ . map_err ( |e| e. expect_translator_err ( "No Context errors while translating" ) )
591
589
}
592
590
593
591
#[ deprecated( note = "use at_derivation_index instead" ) ]
@@ -702,8 +700,7 @@ impl Descriptor<DescriptorPublicKey> {
702
700
let descriptor = Descriptor :: < String > :: from_str ( s) ?;
703
701
let descriptor = descriptor. translate_pk ( & mut keymap_pk) . map_err ( |e| {
704
702
Error :: Unexpected (
705
- e. try_into_translator_err ( )
706
- . expect ( "No Outer context errors" )
703
+ e. expect_translator_err ( "No Outer context errors" )
707
704
. to_string ( ) ,
708
705
)
709
706
} ) ?;
@@ -833,10 +830,9 @@ impl Descriptor<DescriptorPublicKey> {
833
830
834
831
for ( i, desc) in descriptors. iter_mut ( ) . enumerate ( ) {
835
832
let mut index_choser = IndexChoser ( i) ;
836
- * desc = desc. translate_pk ( & mut index_choser) . map_err ( |e| {
837
- e. try_into_translator_err ( )
838
- . expect ( "No Context errors possible" )
839
- } ) ?;
833
+ * desc = desc
834
+ . translate_pk ( & mut index_choser)
835
+ . map_err ( |e| e. expect_translator_err ( "No Context errors possible" ) ) ?;
840
836
}
841
837
842
838
Ok ( descriptors)
@@ -889,10 +885,7 @@ impl Descriptor<DefiniteDescriptorKey> {
889
885
let derived = self . translate_pk ( & mut Derivator ( secp) ) ;
890
886
match derived {
891
887
Ok ( derived) => Ok ( derived) ,
892
- Err ( e) => match e. try_into_translator_err ( ) {
893
- Ok ( e) => Err ( e) ,
894
- Err ( _) => unreachable ! ( "No Context errors when deriving keys" ) ,
895
- } ,
888
+ Err ( e) => Err ( e. expect_translator_err ( "No Context errors when deriving keys" ) ) ,
896
889
}
897
890
}
898
891
}
0 commit comments