apply clippy fixes

diff --git a/src/game/mod.rs b/src/game/mod.rs
index 5e833d916b936573a920c1f3550e58f9be66bbbc..0d962a4124f632d9f6c355a2967aaf4a34b177bb 100644 (file)
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -132,15 +132,10 @@ impl GameSummary {
     }
 }
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize)]
 #[serde(untagged)]
 enum StartCondition {
+    #[default]
     WhenFull,
     AtTime(Timestamp),
 }
-
-impl Default for StartCondition {
-    fn default() -> Self {
-        StartCondition::WhenFull
-    }
-}

diff --git a/src/main.rs b/src/main.rs
index b2eaf1a252d28281d9cdf99b51a847fcdd652010..a37720fdb789f2601d6493e0597e370927ecaf3f 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -80,9 +80,10 @@ struct Args {
     command: Option<Command>,
 }
 
-#[derive(Subcommand)]
+#[derive(Default, Subcommand)]
 enum Command {
     /// Serve the website, websocket connections and start a dealer for each game (default)
+    #[default]
     All,
     /// Serve the website and websocket connections
     Server,
@@ -94,12 +95,6 @@ enum Command {
     },
 }
 
-impl Default for Command {
-    fn default() -> Self {
-        Command::All
-    }
-}
-
 #[async_std::main]
 async fn main() -> Result<(), tide::Error> {
     let args = Args::parse();
@@ -145,7 +140,7 @@ async fn main() -> Result<(), tide::Error> {
 
     loop {
         if !first_attempt {
-            let signals = Signals::new(&[SIGINT])?;
+            let signals = Signals::new([SIGINT])?;
             let signal_handler = handle_signals(signals);
             info!("Attemping redis reconnect in {} seconds...", config.redis.connect_timeout_seconds);
             let sleep = sleep(Duration::from_secs(config.redis.connect_timeout_seconds));
@@ -157,7 +152,7 @@ async fn main() -> Result<(), tide::Error> {
             first_attempt = false;
         }
 
-        let signals = Signals::new(&[SIGINT])?;
+        let signals = Signals::new([SIGINT])?;
         let signal_handler = handle_signals(signals);
 
         const REGISTER_UPDATE_STREAM_CHANNEL_BUFFER: usize = 128;
@@ -201,7 +196,7 @@ async fn main() -> Result<(), tide::Error> {
             let mut listener = ConcurrentListener::new();
             for addrs in &config.server.bind {
                 if let (Some(cert), Some(key)) = (&config.server.cert, &config.server.key) {
-                    listener.add(TlsListener::build().addrs(addrs).cert(&cert).key(&key))?;
+                    listener.add(TlsListener::build().addrs(addrs).cert(cert).key(key))?;
                 } else {
                     listener.add(addrs.to_listener()?)?;
                 }

diff --git a/src/seats.rs b/src/seats.rs
index d959437a3cfae9d6493e12b6b1fa3085e1cf08fb..68ee4e86770a778f34560c964aa7932c5f95809c 100644 (file)
--- a/src/seats.rs
+++ b/src/seats.rs
@@ -98,7 +98,7 @@ impl Seats {
     }
 
     pub fn player_set(&self) -> HashSet<Username> {
-        self.players.iter().map(|(_, player)| *player).collect()
+        self.players.values().copied().collect()
     }
 
     pub fn seat_is_available(&self, seat: u32) -> bool {

diff --git a/src/server.rs b/src/server.rs
index 2cffae5ae69cf4b893397edf7cb1e94f32f3d71f..796698e9c8c1ad7be03febb1f68ccedd360dcd7c 100644 (file)
--- a/src/server.rs
+++ b/src/server.rs
@@ -121,15 +121,15 @@ impl ServerState {
     pub async fn create_game(&mut self, settings: GameSettings) -> RedisResult<i64> {
         let now = self.now().await?;
         let id = self.redis.incr("game:next_id", 1).await?;
-        let () = self.redis.set(game_settings_key(id), AsJson(settings)).await?;
+        self.redis.set(game_settings_key(id), AsJson(settings)).await?;
         let GameStatus { created, completed, players, winner } = GameStatus::new(now);
         let status_key = game_status_key(id);
-        let () = self.redis.hset(&status_key, "created", AsJson(created)).await?;
-        let () = self.redis.hset(&status_key, "completed", AsJson(completed)).await?;
-        let () = self.redis.hset(&status_key, "players", AsJson(players)).await?;
-        let () = self.redis.hset(&status_key, "winner", AsJson(winner)).await?;
-        let () = self.redis.set(game_seed_key(id), AsJson(Seed::cha_cha_20_from_entropy())).await?;
-        let () = self.redis.rpush("game:list", id).await?;
+        self.redis.hset(&status_key, "created", AsJson(created)).await?;
+        self.redis.hset(&status_key, "completed", AsJson(completed)).await?;
+        self.redis.hset(&status_key, "players", AsJson(players)).await?;
+        self.redis.hset(&status_key, "winner", AsJson(winner)).await?;
+        self.redis.set(game_seed_key(id), AsJson(Seed::cha_cha_20_from_entropy())).await?;
+        self.redis.rpush("game:list", id).await?;
         Ok(id)
     }