style: format with style edition 2024

Author: roderickvd

audio/src/fetch/mod.rs

@@ -5,21 +5,21 @@ use std::{
     fs,
     io::{self, Read, Seek, SeekFrom},
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc, OnceLock,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     time::Duration,
 };
 
-use futures_util::{future::IntoStream, StreamExt, TryFutureExt};
-use hyper::{body::Incoming, header::CONTENT_RANGE, Response, StatusCode};
+use futures_util::{StreamExt, TryFutureExt, future::IntoStream};
+use hyper::{Response, StatusCode, body::Incoming, header::CONTENT_RANGE};
 use hyper_util::client::legacy::ResponseFuture;
 use parking_lot::{Condvar, Mutex};
 use tempfile::NamedTempFile;
 use thiserror::Error;
-use tokio::sync::{mpsc, oneshot, Semaphore};
+use tokio::sync::{Semaphore, mpsc, oneshot};
 
-use librespot_core::{cdn_url::CdnUrl, Error, FileId, Session};
+use librespot_core::{Error, FileId, Session, cdn_url::CdnUrl};
 
 use self::receive::audio_file_fetch;
 

audio/src/fetch/receive.rs

@@ -12,7 +12,7 @@ use hyper::StatusCode;
 use tempfile::NamedTempFile;
 use tokio::sync::{mpsc, oneshot};
 
-use librespot_core::{http_client::HttpClient, session::Session, Error};
+use librespot_core::{Error, http_client::HttpClient, session::Session};
 
 use crate::range_set::{Range, RangeSet};
 

connect/src/context_resolver.rs

@@ -4,7 +4,7 @@ use crate::{
         autoplay_context_request::AutoplayContextRequest, context::Context,
         transfer_state::TransferState,
     },
-    state::{context::ContextType, ConnectState},
+    state::{ConnectState, context::ContextType},
 };
 use std::{
     cmp::PartialEq,

connect/src/shuffle_vec.rs

@@ -1,4 +1,4 @@
-use rand::{rngs::SmallRng, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, rngs::SmallRng};
 use std::{
     ops::{Deref, DerefMut},
     vec::IntoIter,

connect/src/spirc.rs

@@ -1,13 +1,14 @@
 use crate::{
+    LoadContextOptions, LoadRequestOptions, PlayContext,
     context_resolver::{ContextAction, ContextResolver, ResolveContext},
     core::{
+        Error, Session, SpotifyId,
         authentication::Credentials,
         dealer::{
             manager::{BoxedStream, BoxedStreamResult, Reply, RequestReply},
             protocol::{Command, FallbackWrapper, Message, Request},
         },
         session::UserAttributes,
-        Error, Session, SpotifyId,
     },
     model::{LoadRequest, PlayingTrack, SpircPlayStatus},
     playback::{
@@ -28,15 +29,14 @@ use crate::{
         provider::IsProvider,
         {ConnectConfig, ConnectState},
     },
-    LoadContextOptions, LoadRequestOptions, PlayContext,
 };
 use futures_util::StreamExt;
 use librespot_protocol::context_page::ContextPage;
 use protobuf::MessageField;
 use std::{
     future::Future,
-    sync::atomic::{AtomicUsize, Ordering},
     sync::Arc,
+    sync::atomic::{AtomicUsize, Ordering},
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 use thiserror::Error;
@@ -951,7 +951,8 @@ impl SpircTask {
                 {
                     debug!(
                         "ignoring context update for <{:?}>, because it isn't the current context <{}>",
-                        update_context.context.uri, self.connect_state.context_uri()
+                        update_context.context.uri,
+                        self.connect_state.context_uri()
                     )
                 } else {
                     self.context_resolver.add(ResolveContext::from_context(
@@ -1615,7 +1616,9 @@ impl SpircTask {
         let uri = String::from_utf8(uri)?;
 
         if self.connect_state.context_uri() != &uri {
-            debug!("ignoring playlist modification update for playlist <{uri}>, because it isn't the current context");
+            debug!(
+                "ignoring playlist modification update for playlist <{uri}>, because it isn't the current context"
+            );
             return Ok(());
         }
 

connect/src/state.rs

@@ -9,8 +9,8 @@ mod transfer;
 
 use crate::{
     core::{
-        config::DeviceType, date::Date, dealer::protocol::Request, spclient::SpClientResult,
-        version, Error, Session,
+        Error, Session, config::DeviceType, date::Date, dealer::protocol::Request,
+        spclient::SpClientResult, version,
     },
     model::SpircPlayStatus,
     protocol::{

connect/src/state/context.rs

@@ -9,9 +9,9 @@ use crate::{
     },
     shuffle_vec::ShuffleVec,
     state::{
+        ConnectState, SPOTIFY_MAX_NEXT_TRACKS_SIZE, StateError,
         metadata::Metadata,
         provider::{IsProvider, Provider},
-        ConnectState, StateError, SPOTIFY_MAX_NEXT_TRACKS_SIZE,
     },
 };
 use protobuf::MessageField;

connect/src/state/handle.rs

@@ -1,9 +1,9 @@
 use crate::{
-    core::{dealer::protocol::SetQueueCommand, Error},
+    core::{Error, dealer::protocol::SetQueueCommand},
     state::{
+        ConnectState,
         context::{ContextType, ResetContext},
         metadata::Metadata,
-        ConnectState,
     },
 };
 use protobuf::MessageField;

connect/src/state/options.rs

@@ -2,9 +2,9 @@ use crate::{
     core::Error,
     protocol::player::ContextPlayerOptions,
     state::{
+        ConnectState, StateError,
         context::{ContextType, ResetContext},
         metadata::Metadata,
-        ConnectState, StateError,
     },
 };
 use protobuf::MessageField;

connect/src/state/restrictions.rs

@@ -1,5 +1,5 @@
-use crate::state::provider::IsProvider;
 use crate::state::ConnectState;
+use crate::state::provider::IsProvider;
 use librespot_protocol::player::Restrictions;
 use protobuf::MessageField;