fmt & clippy

Author: rklaehn

examples/multiprovider/downloader2.rs

@@ -17,10 +17,14 @@ use std::{
     io,
     marker::PhantomData,
     sync::Arc,
-    time::Instant,
-    u64,
+    time::{Duration, Instant},
 };
 
+use anyhow::Context;
+use bao_tree::{io::BaoContentItem, ChunkNum, ChunkRanges};
+use futures_lite::StreamExt;
+use futures_util::{stream::BoxStream, FutureExt};
+use iroh::{Endpoint, NodeId};
 use iroh_blobs::{
     get::{
         fsm::{BlobContentNext, ConnectedNext, EndBlobNext},
@@ -31,14 +35,8 @@ use iroh_blobs::{
     util::local_pool::{self, LocalPool, LocalPoolHandle},
     Hash,
 };
-use anyhow::Context;
-use bao_tree::{io::BaoContentItem, ChunkNum, ChunkRanges};
-use futures_lite::StreamExt;
-use futures_util::{stream::BoxStream, FutureExt};
-use iroh::{Endpoint, NodeId};
 use range_collections::range_set::RangeSetRange;
 use serde::{Deserialize, Serialize};
-use std::time::Duration;
 use tokio::sync::mpsc;
 use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, error, info, trace};
@@ -259,6 +257,7 @@ pub struct DownloaderBuilder<S> {
     planner: Option<BoxedDownloadPlanner>,
 }
 
+#[allow(dead_code)]
 impl<S> DownloaderBuilder<S> {
     /// Set the content discovery
     pub fn discovery<D: ContentDiscovery>(self, discovery: D) -> Self {
@@ -506,11 +505,10 @@ impl<S: Store> BitfieldSubscription for SimpleBitfieldSubscription<S> {
         }
         Box::pin(
             async move {
-                let event = match recv.await {
+                match recv.await {
                     Ok(ev) => ev,
                     Err(_) => BitfieldState::unknown().into(),
-                };
-                event
+                }
             }
             .into_stream(),
         )
@@ -591,13 +589,13 @@ mod tests {
     #![allow(clippy::single_range_in_vec_init)]
     use std::ops::Range;
 
-    use crate::{net_protocol::Blobs, store::MapMut};
-
-    use super::*;
     use bao_tree::ChunkNum;
     use iroh::{protocol::Router, SecretKey};
     use testresult::TestResult;
 
+    use super::*;
+    use crate::{net_protocol::Blobs, store::MapMut};
+
     fn print_bitfield(iter: impl IntoIterator<Item = bool>) -> String {
         let mut chars = String::new();
         for x in iter {

examples/multiprovider/downloader2/content_discovery.rs

@@ -1,11 +1,12 @@
 use std::collections::BTreeMap;
 
-use crate::Hash;
 use futures_lite::stream::StreamExt;
 use futures_util::stream::BoxStream;
 use iroh::NodeId;
 use serde::{Deserialize, Serialize};
 
+use crate::Hash;
+
 /// Announce kind
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub enum AnnounceKind {
@@ -20,6 +21,7 @@ pub enum AnnounceKind {
 #[derive(Debug, Default)]
 pub struct FindPeersOpts {
     /// Kind of announce
+    #[allow(dead_code)]
     pub kind: AnnounceKind,
 }
 

examples/multiprovider/downloader2/state.rs

@@ -931,12 +931,15 @@ fn total_chunks(chunks: &ChunkRanges) -> Option<u64> {
 mod tests {
     #![allow(clippy::single_range_in_vec_init)]
 
-    use super::super::tests::{
-        chunk_ranges, has_all_events, has_one_event, has_one_event_matching, noop_planner,
-    };
-    use super::*;
     use testresult::TestResult;
 
+    use super::{
+        super::tests::{
+            chunk_ranges, has_all_events, has_one_event, has_one_event_matching, noop_planner,
+        },
+        *,
+    };
+
     /// Test a simple scenario where a download is started and completed
     #[test]
     fn downloader_state_smoke() -> TestResult<()> {

examples/multiprovider/main.rs

@@ -9,10 +9,7 @@ use downloader2::{
     print_bitmap, BitfieldEvent, BitfieldState, BitfieldUpdate, DownloadRequest, Downloader,
     ObserveRequest, StaticContentDiscovery,
 };
-use iroh_blobs::{
-    store::Store,
-    Hash,
-};
+use iroh_blobs::{store::Store, Hash};
 
 #[derive(Debug, Parser)]
 struct Args {