zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup clippy warnings (#495) 

Co-authored-by: Jane Lusby <jane@zfnd.org>
This commit is contained in:
Jane Lusby 2020-06-16 17:51:50 -07:00 committed by GitHub
parent a40b1a787b
commit fa6b098056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tower-batch/src/service.rs
View File

@ -67,7 +67,7 @@ where
fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
// If the inner service has errored, then we error here. // If the inner service has errored, then we error here.
if let Err(_) = ready!(self.tx.poll_ready(cx)) { if ready!(self.tx.poll_ready(cx)).is_err() {
Poll::Ready(Err(self.get_worker_error())) Poll::Ready(Err(self.get_worker_error()))
} else { } else {
Poll::Ready(Ok(())) Poll::Ready(Ok(()))

6
tower-batch/tests/ed25519.rs
View File

@ -1,5 +1,6 @@
use std::{ use std::{
future::Future, future::Future,
mem,
pin::Pin, pin::Pin,
sync::Once, sync::Once,
task::{Context, Poll}, task::{Context, Poll},
@ -24,6 +25,7 @@ pub struct Ed25519Verifier {
tx: Sender<Result<(), Error>>, tx: Sender<Result<(), Error>>,
} }
#[allow(clippy::new_without_default)]
impl Ed25519Verifier { impl Ed25519Verifier {
pub fn new() -> Self { pub fn new() -> Self {
let batch = batch::Verifier::default(); let batch = batch::Verifier::default();
@ -65,7 +67,7 @@ impl<'msg> Service<BatchControl<Ed25519Item>> for Ed25519Verifier {
} }
BatchControl::Flush => { BatchControl::Flush => {
tracing::trace!("got flush command"); tracing::trace!("got flush command");
let batch = std::mem::replace(&mut self.batch, batch::Verifier::default()); let batch = mem::take(&mut self.batch);
let _ = self.tx.send(batch.verify(thread_rng())); let _ = self.tx.send(batch.verify(thread_rng()));
Box::pin(async { Ok(()) }) Box::pin(async { Ok(()) })
} }
@ -76,7 +78,7 @@ impl<'msg> Service<BatchControl<Ed25519Item>> for Ed25519Verifier {
impl Drop for Ed25519Verifier { impl Drop for Ed25519Verifier {
fn drop(&mut self) { fn drop(&mut self) {
// We need to flush the current batch in case there are still any pending futures. // We need to flush the current batch in case there are still any pending futures.
let batch = std::mem::replace(&mut self.batch, batch::Verifier::default()); let batch = mem::take(&mut self.batch);
let _ = self.tx.send(batch.verify(thread_rng())); let _ = self.tx.send(batch.verify(thread_rng()));
} }
} }