clippy

Author: zeitlinger

server/src/ability_initializer.rs

@@ -1,5 +1,5 @@
 use crate::card::HandCard;
-use crate::combat::{update_combat_strength,  Combat};
+use crate::combat::{update_combat_strength, Combat};
 use crate::combat_listeners::CombatStrength;
 use crate::content::custom_phase_actions::{
     AdvanceRequest, CurrentEventHandler, CurrentEventRequest, CurrentEventResponse,

server/src/combat.rs

@@ -223,7 +223,7 @@ pub(crate) fn update_combat_strength(
     game: &mut Game,
     player: usize,
     e: &mut CombatRoundStart,
-    update: impl Fn(&mut Game, &Combat, &mut CombatStrength, CombatRole) + Clone + Sized,
+    update: impl Fn(&mut Game, &Combat, &mut CombatStrength, CombatRole) + Clone,
 ) {
     if player == e.combat.attacker {
         update(

server/src/combat_listeners.rs

@@ -1,5 +1,5 @@
 use crate::ability_initializer::AbilityInitializerSetup;
-use crate::combat::{capture_position,  Combat, CombatRetreatState};
+use crate::combat::{capture_position, Combat, CombatRetreatState};
 use crate::consts::SHIP_CAPACITY;
 use crate::content::builtin::{Builtin, BuiltinBuilder};
 use crate::content::custom_phase_actions::{new_position_request, CurrentEventType, UnitsRequest};
@@ -371,10 +371,7 @@ pub(crate) fn event_with_tactics<T: Clone + PartialEq>(
             ),
             CombatRoundType::Done => panic!("Invalid round type"),
         };
-        s = match option {
-            None => return None,
-            Some(e) => e,
-        }
+        s = option?;
     }
     *get_round_type(&mut s) = CombatRoundType::Done;
     Some(s)
@@ -463,8 +460,7 @@ pub(crate) fn offer_retreat() -> Builtin {
                     game.add_info_log_item(&format!("{player_name} does not retreat",));
                 }
                 if retreat.choice {
-                    e.combat.retreat =
-                        CombatRetreatState::EndAfterCurrentRound;
+                    e.combat.retreat = CombatRetreatState::EndAfterCurrentRound;
                 }
             },
         )

server/src/content/advances/economy.rs

@@ -74,7 +74,7 @@ fn trade_routes() -> AdvanceBuilder {
                     )
                 })
             },
-            |game, p, _| {
+            |game, p, ()| {
                 let (_, routes) =
                     trade_route_reward(game).expect("No trade route reward");
                 trade_route_log(game, p.player_index, &routes, &p.choice, p.actively_selected)

server/src/content/advances/warfare.rs

@@ -5,7 +5,7 @@ use crate::city_pieces::Building::Fortress;
 use crate::combat::CombatModifier::{
     CancelFortressExtraDie, CancelFortressIgnoreHit, SteelWeaponsAttacker, SteelWeaponsDefender,
 };
-use crate::combat::{ Combat, CombatModifier};
+use crate::combat::{Combat, CombatModifier};
 use crate::combat_listeners::CombatStrength;
 use crate::content::advances::{
     advance_group_builder, AdvanceGroup, METALLURGY, STEEL_WEAPONS, TACTICS,

server/src/content/custom_phase_actions.rs

@@ -217,7 +217,7 @@ impl CurrentEventState {
             selected_position: None,
         }
     }
-    
+
     #[must_use]
     pub fn active_player(&self) -> Option<&usize> {
         self.players_used.first()

server/src/content/incidents/earthquake.rs

@@ -9,7 +9,7 @@ use crate::content::custom_phase_actions::{
 use crate::content::wonders::get_wonder;
 use crate::game::Game;
 use crate::incident::{Incident, IncidentBaseEffect, MoodModifier};
-use crate::player_events::{IncidentInfo, IncidentTarget};
+use crate::player_events::IncidentTarget;
 use crate::position::Position;
 use itertools::Itertools;
 

server/src/content/incidents/famine.rs

@@ -5,7 +5,7 @@ use crate::content::custom_phase_actions::UnitsRequest;
 use crate::game::Game;
 use crate::incident::{Incident, IncidentBaseEffect, MoodModifier, PermanentIncidentEffect};
 use crate::player::Player;
-use crate::player_events::{IncidentInfo, IncidentTarget};
+use crate::player_events::IncidentTarget;
 use crate::playing_actions::PlayingActionType;
 use crate::position::Position;
 use crate::resource_pile::ResourcePile;

server/src/content/incidents/trade.rs

@@ -196,7 +196,10 @@ fn reformation() -> Incident {
             ))
         },
         |game, s| {
-            let &p = game.current_event().active_player().expect("should have active player");
+            let &p = game
+                .current_event()
+                .active_player()
+                .expect("should have active player");
             let donor = game.get_player_mut(p);
             let pos = s.choice[0];
             donor

server/src/content/incidents/trojan.rs

@@ -1,7 +1,5 @@
 use crate::ability_initializer::AbilityInitializerSetup;
-use crate::combat::{
-     Combat, CombatModifier, CombatRetreatState,
-};
+use crate::combat::{Combat, CombatModifier, CombatRetreatState};
 use crate::combat_listeners::CombatResult;
 use crate::content::advances::get_advance;
 use crate::content::builtin::Builtin;
@@ -68,9 +66,7 @@ pub(crate) fn decide_trojan_horse() -> Builtin {
                     ));
                     game.permanent_incident_effects
                         .retain(|e| !matches!(e, PermanentIncidentEffect::TrojanHorse));
-                    c
-                        .modifiers
-                        .push(CombatModifier::TrojanHorse);
+                    c.modifiers.push(CombatModifier::TrojanHorse);
                 }
             },
         )