Clippy tweaks for latest PR and multiplayer fixes

rc_core/src/cubes/locations_of.rs

@@ -46,7 +46,7 @@ impl CubeLocationsParser {
         let target_x = point.0 as f32;
         let target_y = point.1 as f32;
         let target_z = point.2 as f32;
-        let mut relevant_cubes: Vec<(f32, CubeLocationInfo)> = cubes.into_iter()
+        let mut relevant_cubes: Vec<(f32, CubeLocationInfo)> = cubes.iter()
             .filter(|x| x.id == locations_of_id)
             .map(|cube| {
                 let distance = (

rc_core/src/persist/user/multiplayer.rs

@@ -9,6 +9,7 @@ fn db_to_impl(client_emu: &oj_rc_database::schema::multiplayer_game_player::Clie
 }
 
 impl UserData {
+    #[allow(clippy::too_many_arguments)]
     pub(super) async fn generate_fake_players_data(
         &self,
         _guid: i64,
@@ -57,6 +58,7 @@ impl UserData {
         Ok(fakes)
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(super) async fn generate_forced_fake_players_data(
         &self,
         guid: i64,
@@ -77,6 +79,7 @@ impl UserData {
         ).await
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(super) async fn generate_filler_players_data(
         &self,
         guid: i64,

rc_core/src/persist/user/traits.rs

@@ -265,6 +265,7 @@ pub trait LobbyUser {
     fn user_id(&self) -> i32;
     async fn player_data(&self, cpu_counter: &crate::cubes::CpuListParser) -> Result<crate::data::player_data::PlayerData, polariton_server::operations::SimpleOpError>;
     async fn team_chooser(&self, game: &GameDescriptor) -> super::TeamChooser;
+    #[allow(clippy::too_many_arguments)]
     async fn start_game(&self, game: GameDescriptor, players: Vec<PlayerLobbyDescriptor>, factory: &dyn oj_rc_factory::VehicleFactoryAdapter, cpu_counter: &crate::cubes::CpuListParser, weapon_lister: &crate::cubes::WeaponListParser, team_chooser: &super::TeamChooser, missing_players: usize) -> Result<FakePlayers, polariton_server::operations::SimpleOpError>;
 }
 

rc_factory_api/src/main.rs

@@ -16,7 +16,7 @@ async fn index() -> impl Responder {
 }
 
 fn io_error(e: impl ToString) -> std::io::Error {
-    std::io::Error::new(std::io::ErrorKind::Other, e.to_string())
+    std::io::Error::other(e.to_string())
 }
 
 #[actix_web::main]

rc_factory_api/src/robocraft/factory/crf_api.rs

@@ -19,7 +19,7 @@ fn parse_filter(filter: &str) -> Vec<u32> {
 fn payload_to_query(payload: &ListPayload) -> ListQuery {
     ListQuery {
         page: (payload.page.max(1)) as usize,
-        page_size: (payload.page_size.max(1).min(100)) as usize,
+        page_size: (payload.page_size.clamp(1, 100)) as usize,
         order: FactoryOrderType::try_from(payload.order.clamp(0, u8::MAX.into()) as u8).unwrap_or(FactoryOrderType::Suggested),
         player_filter: payload.player_filter,
         movement_filter: parse_filter(&payload.movement_filter),
@@ -91,11 +91,8 @@ fn get_info(qi: VehicleQueryInfo, vi: VehicleInfo) -> FactoryRobotGetInfo {
 
 #[post("/api/roboShopItems/list")]
 pub async fn list(factory: Data<oj_rc_core::factory::Factory>, body: Json<ListPayload>) -> HttpResponse {
-    match factory.get_ref() {
-        oj_rc_core::factory::Factory::None => {
-            return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
-        }
-        _ => {}
+    if let oj_rc_core::factory::Factory::None = factory.get_ref() {
+        return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
     }
 
     let query = payload_to_query(&body.into_inner());
@@ -114,11 +111,8 @@ pub async fn list(factory: Data<oj_rc_core::factory::Factory>, body: Json<ListPa
 
 #[get("/api/roboShopItems/list")]
 pub async fn list_default(factory: Data<oj_rc_core::factory::Factory>) -> HttpResponse {
-    match factory.get_ref() {
-        oj_rc_core::factory::Factory::None => {
-            return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
-        }
-        _ => {}
+    if let oj_rc_core::factory::Factory::None = factory.get_ref() {
+        return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
     }
 
     let query = payload_to_query(&ListPayload::default());
@@ -137,11 +131,8 @@ pub async fn list_default(factory: Data<oj_rc_core::factory::Factory>) -> HttpRe
 
 #[get("/api/roboShopItems/get/{id}")]
 pub async fn get(factory: Data<oj_rc_core::factory::Factory>, id: Path<i32>) -> HttpResponse {
-    match factory.get_ref() {
-        oj_rc_core::factory::Factory::None => {
-            return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
-        }
-        _ => {}
+    if let oj_rc_core::factory::Factory::None = factory.get_ref() {
+        return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
     }
     match factory.vehicle(*id).await {
         Ok(Some((vehicle_info, query_info))) => HttpResponse::Ok().json(FactoryInfo {

utils/clippy_fix.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cargo clippy --all --fix -- \
+    -A clippy::collapsible_if \
+    -A clippy::type_complexity \
+    -A clippy::wrong_self_convention