Fix Clippy lints for Rust 1.85

ZcashFoundation · Feb 21, 2025 · 89aa4bd · 89aa4bd
1 parent 361fa65
commit 89aa4bd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/zebra-consensus/src/checkpoint.rs b/zebra-consensus/src/checkpoint.rs
@@ -1164,7 +1164,6 @@ where
                 let tip = match state_service
                     .oneshot(zs::Request::Tip)
                     .await
-                    .map_err(Into::into)
                     .map_err(VerifyCheckpointError::Tip)?
                 {
                     zs::Response::Tip(tip) => tip,

diff --git a/zebra-rpc/src/server/http_request_compatibility.rs b/zebra-rpc/src/server/http_request_compatibility.rs
@@ -66,7 +66,7 @@ impl<S> HttpRequestMiddleware<S> {
 
     /// Check if the request is authenticated.
     pub fn check_credentials(&self, headers: &header::HeaderMap) -> bool {
-        self.cookie.as_ref().map_or(true, |internal_cookie| {
+        self.cookie.as_ref().is_none_or(|internal_cookie| {
             headers
                 .get(header::AUTHORIZATION)
                 .and_then(|auth_header| auth_header.to_str().ok())

diff --git a/zebra-state/src/service.rs b/zebra-state/src/service.rs
@@ -935,7 +935,6 @@ impl Service<Request> for StateService {
                         // https://github.com/rust-lang/rust/issues/70142
                         .and_then(convert::identity)
                         .map(Response::Committed)
-                        .map_err(Into::into)
                 }
                 .instrument(span)
                 .boxed()
@@ -983,7 +982,6 @@ impl Service<Request> for StateService {
                         // https://github.com/rust-lang/rust/issues/70142
                         .and_then(convert::identity)
                         .map(Response::Committed)
-                        .map_err(Into::into)
                 }
                 .instrument(span)
                 .boxed()