Formatted

squire_core/build.rs

@@ -7,7 +7,7 @@ use std::{env, process::Command};
 
 fn main() -> Result<(), i32> {
     if env::var("CARGO_FEATURE_IGNORE_FRONTEND").is_ok() {
-        return Ok(())
+        return Ok(());
     }
 
     let wd = env::var("CARGO_MANIFEST_DIR").unwrap();

squire_core/src/main.rs

@@ -25,7 +25,10 @@ pub fn create_router(state: AppState) -> Router {
         .add_route::<0, POST, Reauth, _, _>(reauth)
         .add_route::<0, DELETE, Terminate, _, _>(terminate)
         .into_router()
-        .route("/api/v1/tournaments/subscribe/other/:t_id", get(tournaments::join_gathering))
+        .route(
+            "/api/v1/tournaments/subscribe/other/:t_id",
+            get(tournaments::join_gathering),
+        )
         .route("/", get(assets::landing))
         .route("/squire_web_bg.wasm", get(assets::get_wasm))
         .route("/squire_web.js", get(assets::get_js))

squire_core/src/state/boilerplate.rs

@@ -35,7 +35,10 @@ impl Trackable<AnyUser, SessionToken> for SessionCommand {
 }
 
 impl Trackable<SessionToken, Option<watch::Receiver<SquireSession>>> for SessionCommand {
-    fn track(msg: SessionToken, send: OneshotSender<Option<watch::Receiver<SquireSession>>>) -> Self {
+    fn track(
+        msg: SessionToken,
+        send: OneshotSender<Option<watch::Receiver<SquireSession>>>,
+    ) -> Self {
         Self::Subscribe(msg, send)
     }
 }
@@ -48,7 +51,7 @@ impl Trackable<AnyUser, bool> for SessionCommand {
 
 impl Debug for SessionCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self{
+        match self {
             Self::Create(value, _) => write!(f, "Create({value:?})"),
             Self::Guest(_) => write!(f, "Guest()"),
             Self::Get(value, _) => write!(f, "Get({value:?})"),

squire_core/src/state/tournaments.rs

@@ -1,13 +1,14 @@
-use std::{sync::Arc, ops::Range};
+use std::{ops::Range, sync::Arc};
 
 use futures::StreamExt;
 use mongodb::{
     bson::{doc, spec::BinarySubtype, Binary, Document},
-    Collection, Database, options::{UpdateModifications, UpdateOptions, Hint, FindOptions},
+    options::{FindOptions, Hint, UpdateModifications, UpdateOptions},
+    Collection, Database,
 };
 use squire_sdk::{
-    actor::*, model::tournament::TournamentId, server::gathering::PersistMessage,
-    sync::TournamentManager, api::TournamentSummary,
+    actor::*, api::TournamentSummary, model::tournament::TournamentId,
+    server::gathering::PersistMessage, sync::TournamentManager,
 };
 use tracing::Level;
 

squire_sdk/src/client/builder.rs

@@ -89,7 +89,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, ()> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 
     /// Creates a client but does not check if the URL is valid.
@@ -99,7 +103,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, ()> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        SquireClient { client, tourns, user }
+        SquireClient {
+            client,
+            tourns,
+            user,
+        }
     }
 }
 
@@ -112,7 +120,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, Credentials> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 }
 
@@ -129,7 +141,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, SquireAccount> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 
     /// Creates a client but does not check if the URL is valid.
@@ -143,6 +159,10 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, SquireAccount> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        SquireClient { client, tourns, user }
+        SquireClient {
+            client,
+            tourns,
+            user,
+        }
     }
 }

squire_sdk/src/compat/mod.rs

@@ -6,7 +6,11 @@
 //!
 //! By no means is this an exhuastive or future-proof module. Rather, the module just implements
 //! wrappers for functionalities that are presently needed.
-use std::{pin::Pin, fmt::Debug, task::{Context, Poll}};
+use std::{
+    fmt::Debug,
+    pin::Pin,
+    task::{Context, Poll},
+};
 
 use futures::{Future, FutureExt};
 

squire_sdk/src/lib.rs

@@ -33,14 +33,14 @@ pub mod client;
 /// The default client used by non-squire_core services to communicate with squire_core
 pub mod server;
 
+/// Contains the definition of the actor model used by both the client and server
+pub mod actor;
 /// Contains all of the API definitions
 pub mod api;
 /// The primary generic response type
 pub mod response;
 /// Contains all of the components needed for client-server synchronization
 pub mod sync;
-/// Contains the definition of the actor model used by both the client and server
-pub mod actor;
 
 /// A compatability layer to enable use in both native and WASM platforms
 pub mod compat;

squire_sdk/src/server/mod.rs

@@ -2,7 +2,7 @@ use axum::{
     body::{Body, HttpBody},
     extract::State,
     handler::Handler,
-    Router
+    Router,
 };
 
 use self::state::ServerState;

squire_sdk/src/server/state.rs

@@ -1,10 +1,10 @@
 use std::ops::Range;
 
 use async_trait::async_trait;
+use axum::extract::ws::WebSocket;
 use squire_lib::identifiers::SquireAccountId;
 
-use axum::extract::ws::WebSocket;
-use super::session::{AnyUser, SquireSession, SessionWatcher};
+use super::session::{AnyUser, SessionWatcher, SquireSession};
 use crate::{
     api::{SessionToken, TournamentSummary, Version},
     model::tournament::TournamentId,

squire_web/src/tournament/overview/mod.rs

@@ -1,11 +1,12 @@
 use std::time::Duration;
 
 use squire_sdk::{
+    compat::sleep,
     model::{
         identifiers::TournamentId, players::PlayerStatus, rounds::RoundStatus,
         tournament::TournamentStatus,
     },
-    sync::TournamentManager, compat::sleep,
+    sync::TournamentManager,
 };
 use yew::prelude::*;
 

squire_web/src/tournament/settings/mod.rs

@@ -54,7 +54,6 @@ impl SettingsView {
                 .get()
                 .unwrap()
                 .query_tourn(id, |tourn| tourn.settings())
-
                 .await
                 .unwrap_or_else(TournamentSettingsTree::new);
             SettingsMessage::QueryReady(Box::new(settings))