@@ -459,9 +459,8 @@ pub trait Authenticator {
459
459
Request :: MakeCredential ( request) => {
460
460
debug_now ! ( "CTAP2.MC" ) ;
461
461
Ok ( Response :: MakeCredential (
462
- self . make_credential ( request) . map_err ( |e| {
463
- debug ! ( "error: {:?}" , e) ;
464
- e
462
+ self . make_credential ( request) . inspect_err ( |_e| {
463
+ debug ! ( "error: {:?}" , _e) ;
465
464
} ) ?,
466
465
) )
467
466
}
@@ -470,9 +469,8 @@ pub trait Authenticator {
470
469
Request :: GetAssertion ( request) => {
471
470
debug_now ! ( "CTAP2.GA" ) ;
472
471
Ok ( Response :: GetAssertion (
473
- self . get_assertion ( request) . map_err ( |e| {
474
- debug ! ( "error: {:?}" , e) ;
475
- e
472
+ self . get_assertion ( request) . inspect_err ( |_e| {
473
+ debug ! ( "error: {:?}" , _e) ;
476
474
} ) ?,
477
475
) )
478
476
}
@@ -481,30 +479,27 @@ pub trait Authenticator {
481
479
Request :: GetNextAssertion => {
482
480
debug_now ! ( "CTAP2.GNA" ) ;
483
481
Ok ( Response :: GetNextAssertion (
484
- self . get_next_assertion ( ) . map_err ( |e| {
485
- debug ! ( "error: {:?}" , e) ;
486
- e
482
+ self . get_next_assertion ( ) . inspect_err ( |_e| {
483
+ debug ! ( "error: {:?}" , _e) ;
487
484
} ) ?,
488
485
) )
489
486
}
490
487
491
488
// 0x7
492
489
Request :: Reset => {
493
490
debug_now ! ( "CTAP2.RST" ) ;
494
- self . reset ( ) . map_err ( |e| {
495
- debug ! ( "error: {:?}" , e) ;
496
- e
491
+ self . reset ( ) . inspect_err ( |_e| {
492
+ debug ! ( "error: {:?}" , _e) ;
497
493
} ) ?;
498
494
Ok ( Response :: Reset )
499
495
}
500
496
501
497
// 0x6
502
498
Request :: ClientPin ( request) => {
503
499
debug_now ! ( "CTAP2.PIN" ) ;
504
- Ok ( Response :: ClientPin ( self . client_pin ( request) . map_err (
505
- |e| {
506
- debug ! ( "error: {:?}" , e) ;
507
- e
500
+ Ok ( Response :: ClientPin ( self . client_pin ( request) . inspect_err (
501
+ |_e| {
502
+ debug ! ( "error: {:?}" , _e) ;
508
503
} ,
509
504
) ?) )
510
505
}
@@ -513,40 +508,36 @@ pub trait Authenticator {
513
508
Request :: CredentialManagement ( request) => {
514
509
debug_now ! ( "CTAP2.CM" ) ;
515
510
Ok ( Response :: CredentialManagement (
516
- self . credential_management ( request) . map_err ( |e| {
517
- debug ! ( "error: {:?}" , e) ;
518
- e
511
+ self . credential_management ( request) . inspect_err ( |_e| {
512
+ debug ! ( "error: {:?}" , _e) ;
519
513
} ) ?,
520
514
) )
521
515
}
522
516
523
517
// 0xB
524
518
Request :: Selection => {
525
519
debug_now ! ( "CTAP2.SEL" ) ;
526
- self . selection ( ) . map_err ( |e| {
527
- debug ! ( "error: {:?}" , e) ;
528
- e
520
+ self . selection ( ) . inspect_err ( |_e| {
521
+ debug ! ( "error: {:?}" , _e) ;
529
522
} ) ?;
530
523
Ok ( Response :: Selection )
531
524
}
532
525
533
526
// 0xC
534
527
Request :: LargeBlobs ( request) => {
535
528
debug_now ! ( "CTAP2.LB" ) ;
536
- Ok ( Response :: LargeBlobs ( self . large_blobs ( request) . map_err (
537
- |e| {
538
- debug ! ( "error: {:?}" , e) ;
539
- e
540
- } ,
541
- ) ?) )
529
+ Ok ( Response :: LargeBlobs (
530
+ self . large_blobs ( request) . inspect_err ( |_e| {
531
+ debug ! ( "error: {:?}" , _e) ;
532
+ } ) ?,
533
+ ) )
542
534
}
543
535
544
536
// Not stable
545
537
Request :: Vendor ( op) => {
546
538
debug_now ! ( "CTAP2.V" ) ;
547
- self . vendor ( * op) . map_err ( |e| {
548
- debug ! ( "error: {:?}" , e) ;
549
- e
539
+ self . vendor ( * op) . inspect_err ( |_e| {
540
+ debug ! ( "error: {:?}" , _e) ;
550
541
} ) ?;
551
542
Ok ( Response :: Vendor )
552
543
}
0 commit comments