fix clippy warnings

diff --git a/src/game/cribbage/mod.rs b/src/game/cribbage/mod.rs
index ca5efb7c42835a7d256fad963df30bf715c04e5f..132b87e49a2b1a53bd2013070f8c53bdd8e34635 100644 (file)
--- a/src/game/cribbage/mod.rs
+++ b/src/game/cribbage/mod.rs
@@ -335,9 +335,7 @@ impl Game for Cribbage {
                     }
                 }
                 self.pegging_cards.push((username, card));
-                if self.next_player_still_in().is_none() {
-                    self.state = State::ScoringPegging;
-                } else if self.last_pegging_score().is_some() {
+                if self.next_player_still_in().is_none() || self.last_pegging_score().is_some() {
                     self.state = State::ScoringPegging;
                 } else {
                     self.active = self.next_player_still_in();

diff --git a/src/main.rs b/src/main.rs
index a773700a2ba82fc676240fd17ed1f93986c7d221..ba607060a34a0bc3e084f0dc54d84f2647998231 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -72,7 +72,7 @@ async fn append_cache_control(mut response: Response) -> Result<Response, tide::
 
 async fn verify_keyspace_events_enabled(conn: &mut MultiplexedConnection) -> RedisResult<()> {
     let keyspace_events: Vec<String> = cmd("CONFIG").arg("GET").arg("notify-keyspace-events").query_async(conn).await?;
-    if keyspace_events.len() != 2 || !keyspace_events[1].contains("K") {
+    if keyspace_events.len() != 2 || !keyspace_events[1].contains('K') {
         warn!("Redis \"CONFIG GET notify-keyspace-events\" returned {:?}. Keyspace events must be enabled for proper functioning.", keyspace_events);
     }
     Ok(())