Skip to content

Commit 4b3953a

Browse files
Prefer inspect_err over map_err
This fixes a new clippy lint.
1 parent 699539a commit 4b3953a

File tree

1 file changed

+22
-31
lines changed

1 file changed

+22
-31
lines changed

src/ctap2.rs

+22-31
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,8 @@ pub trait Authenticator {
459459
Request::MakeCredential(request) => {
460460
debug_now!("CTAP2.MC");
461461
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);
465464
})?,
466465
))
467466
}
@@ -470,9 +469,8 @@ pub trait Authenticator {
470469
Request::GetAssertion(request) => {
471470
debug_now!("CTAP2.GA");
472471
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);
476474
})?,
477475
))
478476
}
@@ -481,30 +479,27 @@ pub trait Authenticator {
481479
Request::GetNextAssertion => {
482480
debug_now!("CTAP2.GNA");
483481
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);
487484
})?,
488485
))
489486
}
490487

491488
// 0x7
492489
Request::Reset => {
493490
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);
497493
})?;
498494
Ok(Response::Reset)
499495
}
500496

501497
// 0x6
502498
Request::ClientPin(request) => {
503499
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);
508503
},
509504
)?))
510505
}
@@ -513,40 +508,36 @@ pub trait Authenticator {
513508
Request::CredentialManagement(request) => {
514509
debug_now!("CTAP2.CM");
515510
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);
519513
})?,
520514
))
521515
}
522516

523517
// 0xB
524518
Request::Selection => {
525519
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);
529522
})?;
530523
Ok(Response::Selection)
531524
}
532525

533526
// 0xC
534527
Request::LargeBlobs(request) => {
535528
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+
))
542534
}
543535

544536
// Not stable
545537
Request::Vendor(op) => {
546538
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);
550541
})?;
551542
Ok(Response::Vendor)
552543
}

0 commit comments

Comments
 (0)