clippy

Author: rklaehn

src/api/downloader.rs

@@ -180,9 +180,9 @@ async fn handle_download_split_impl(
             },
             res = futs.next() => {
                 match res {
-                    Some((hash, Ok(()))) => {
+                    Some((_hash, Ok(()))) => {
                     }
-                    Some((hash, Err(e))) => {
+                    Some((_hash, Err(_e))) => {
                         tx.send(DownloadProgessItem::DownloadError).await?;
                     }
                     None => break,
@@ -388,7 +388,7 @@ async fn split_request<'a>(
 ) -> anyhow::Result<Box<dyn Iterator<Item = GetRequest> + Send + 'a>> {
     Ok(match request {
         FiniteRequest::Get(req) => {
-            let Some(first) = req.ranges.iter_infinite().next() else {
+            let Some(_first) = req.ranges.iter_infinite().next() else {
                 return Ok(Box::new(std::iter::empty()));
             };
             let first = GetRequest::blob(req.hash);
@@ -437,6 +437,7 @@ enum SlotState {
     Initial,
     Connected(Connection),
     AttemptFailed(SystemTime),
+    #[allow(dead_code)]
     Evil(String),
 }
 
@@ -457,11 +458,13 @@ impl ConnectionPool {
         }
     }
 
+    #[allow(dead_code)]
     async fn mark_evil(&self, id: NodeId, reason: String) {
         let slot = self.connections.lock().await.entry(id).or_default().clone();
         *slot.lock().await = SlotState::Evil(reason)
     }
 
+    #[allow(dead_code)]
     async fn mark_closed(&self, id: NodeId) {
         let slot = self.connections.lock().await.entry(id).or_default().clone();
         *slot.lock().await = SlotState::Initial
@@ -511,15 +514,15 @@ async fn execute_get(
             )
             .await
         {
-            Ok(stats) => {
+            Ok(_stats) => {
                 progress
                     .send(DownloadProgessItem::PartComplete {
                         request: request.clone(),
                     })
                     .await?;
                 return Ok(());
             }
-            Err(cause) => {
+            Err(_cause) => {
                 progress
                     .send(DownloadProgessItem::ProviderFailed {
                         id: provider,
@@ -717,7 +720,7 @@ mod tests {
         if false {
             let conn = r3.endpoint().connect(node1_addr, crate::ALPN).await?;
             let remote = store3.remote();
-            let rh = remote
+            let _rh = remote
                 .execute(
                     conn.clone(),
                     GetRequest::builder()
@@ -785,7 +788,7 @@ mod tests {
         if false {
             let conn = r3.endpoint().connect(node1_addr, crate::ALPN).await?;
             let remote = store3.remote();
-            let rh = remote
+            let _rh = remote
                 .execute(
                     conn.clone(),
                     GetRequest::builder()

src/api/proto/bitfield.rs

@@ -258,6 +258,7 @@ impl CombineInPlace for Bitfield {
     }
 }
 
+#[allow(clippy::enum_variant_names)]
 #[derive(Debug, Clone, Copy)]
 pub enum UpdateResult {
     NoChange(BitfieldState),

src/api/remote.rs

@@ -363,7 +363,7 @@ impl Remote {
         &self,
         conn: Connection,
         request: PushRequest,
-        progress: Option<spsc::Sender<u64>>,
+        _progress: Option<spsc::Sender<u64>>,
     ) -> anyhow::Result<Stats> {
         let hash = request.hash;
         debug!(%hash, "pushing");

src/protocol/range_spec.rs

@@ -153,6 +153,7 @@ mod nodelta {
         }
 
         pub fn is_blob(&self) -> bool {
+            #[allow(clippy::match_like_matches_macro)]
             match self.as_single() {
                 Some((0, _)) => true,
                 _ => false,
@@ -305,20 +306,18 @@ mod nodelta {
         type Item = &'a ChunkRanges;
 
         fn next(&mut self) -> Option<Self::Item> {
-            loop {
-                match self.remaining.peek()? {
-                    (offset, _) if self.offset < *offset => {
-                        // emit current value until we reach the next offset
-                        self.offset += 1;
-                        return Some(self.current);
-                    }
-                    (_, ranges) => {
-                        // get next current value, new count, and set remaining
-                        self.current = ranges;
-                        self.remaining.next();
-                        self.offset += 1;
-                        return Some(self.current);
-                    }
+            match self.remaining.peek()? {
+                (offset, _) if self.offset < *offset => {
+                    // emit current value until we reach the next offset
+                    self.offset += 1;
+                    Some(self.current)
+                }
+                (_, ranges) => {
+                    // get next current value, new count, and set remaining
+                    self.current = ranges;
+                    self.remaining.next();
+                    self.offset += 1;
+                    Some(self.current)
                 }
             }
         }
@@ -623,6 +622,7 @@ mod delta {
         }
 
         pub fn is_raw(&self) -> bool {
+            #[allow(clippy::match_like_matches_macro)]
             match self.as_single() {
                 Some((0, _)) => true,
                 _ => false,
@@ -705,7 +705,7 @@ mod delta {
             let before_all = ChunkRanges::empty();
             for v in children.into_iter() {
                 let prev = res.last().map(|(_count, spec)| spec).unwrap_or(&before_all);
-                if &v == prev {
+                if v == prev {
                     count += 1;
                 } else {
                     res.push((count, v.clone()));

src/store/fs/bao_file.rs

@@ -931,7 +931,7 @@ impl BaoFileStorageSubscriber {
         tokio::select! {
             _ = tx.closed() => {
                 // the sender is closed, we are done
-                return Err(irpc::channel::SendError::ReceiverClosed.into());
+                Err(irpc::channel::SendError::ReceiverClosed.into())
             }
             e = self.receiver.changed() => Ok(e?),
         }

src/store/fs/entry_state.rs

@@ -38,6 +38,7 @@ impl<I: AsRef<[u8]>, E: Debug> DataLocation<I, E> {
 }
 
 impl<X> DataLocation<X, u64> {
+    #[allow(clippy::result_large_err)]
     fn union(self, that: DataLocation<X, u64>) -> ActorResult<Self> {
         Ok(match (self, that) {
             (
@@ -215,6 +216,7 @@ impl<I: AsRef<[u8]>> EntryState<I> {
 }
 
 impl EntryState {
+    #[allow(clippy::result_large_err)]
     pub fn union(old: Self, new: Self) -> ActorResult<Self> {
         match (old, new) {
             (

src/tests.rs

@@ -4,7 +4,7 @@ use bao_tree::ChunkRanges;
 use bytes::Bytes;
 use iroh::{Endpoint, NodeId, protocol::Router};
 use irpc::{RpcMessage, channel::spsc};
-use n0_future::{SinkExt, StreamExt, pin, task::AbortOnDropHandle};
+use n0_future::{StreamExt, pin, task::AbortOnDropHandle};
 use tempfile::TempDir;
 use testresult::TestResult;
 use tokio::{
@@ -208,6 +208,7 @@ use crate::{
 //     Ok(())
 // }
 
+#[allow(dead_code)]
 async fn drain<T: RpcMessage>(mut rx: mpsc::Receiver<T>) -> Vec<T> {
     let mut items = Vec::new();
     while let Some(item) = rx.recv().await {

src/util.rs

@@ -130,7 +130,6 @@ pub mod outboard_with_progress {
         iter::BaoChunk,
     };
     use blake3::guts::parent_cv;
-    
     use smallvec::SmallVec;
 
     use super::sink::Sink;