Readability fixes for cargo clippy

rc_core/src/persist/weapon.rs

@@ -88,71 +88,71 @@ fn group_fire_scales_default() -> Vec<f32> {
     vec![1.0]
 }
 
-impl std::convert::Into<crate::data::weapon_list::WeaponData> for WeaponData {
-    fn into(self) -> crate::data::weapon_list::WeaponData {
+impl std::convert::From<WeaponData> for crate::data::weapon_list::WeaponData {
+    fn from(val: WeaponData) -> Self {
         crate::data::weapon_list::WeaponData {
-            damage_inflicted: self.damage_inflicted,
-            protonium_damage_scale: self.protonium_damage_scale,
-            projectile_speed: self.projectile_speed,
-            projectile_range: self.projectile_range,
-            base_inaccuracy: self.base_inaccuracy,
-            base_air_inaccuracy: self.base_air_inaccuracy,
-            movement_inaccuracy: self.movement_inaccuracy,
-            movement_max_speed: self.movement_max_speed,
-            movement_min_speed: self.movement_min_speed,
-            gun_rotation_slow: self.gun_rotation_slow,
-            movement_inaccuracy_decay: self.movement_inaccuracy_decay,
-            slow_rotation_decay: self.slow_rotation_decay,
-            quick_rotation_decay: self.quick_rotation_decay,
-            movement_inaccuracy_recovery: self.movement_inaccuracy_recovery,
-            repeat_fire_inaccuracy_total_degrees: self.repeat_fire_inaccuracy_total_degrees,
-            repeat_fire_inaccuracy_decay: self.repeat_fire_inaccuracy_decay,
-            repeat_fire_innaccuracy_recovery: self.repeat_fire_innaccuracy_recovery,
-            fire_instant_accuracy_decay: self.fire_instant_accuracy_decay, // degrees
-            accuracy_non_recover_time: self.accuracy_non_recover_time,
-            accuracy_decay: self.accuracy_decay,
-            damage_radius: self.damage_radius,
-            plasma_time_to_full_damage: self.plasma_time_to_full_damage,
-            plasma_starting_radius_scale: self.plasma_starting_radius_scale,
-            nano_dps: self.nano_dps,
-            nano_hps: self.nano_hps,
-            tesla_damage: self.tesla_damage,
-            tesla_charges: self.tesla_charges,
-            aeroflak_proximity_damage: self.aeroflak_proximity_damage,
-            aeroflak_damage_radius: self.aeroflak_damage_radius,
-            aeroflak_explosion_radius: self.aeroflak_explosion_radius,
-            aeroflak_ground_clearance: self.aeroflak_ground_clearance,
-            aeroflak_max_stacks: self.aeroflak_max_stacks,
-            aeroflak_damage_per_stack: self.aeroflak_damage_per_stack,
-            aeroflak_stack_expire: self.aeroflak_stack_expire,
-            shot_cooldown: self.shot_cooldown,
-            smart_rotation_cooldown: self.smart_rotation_cooldown,
-            smart_rotation_cooldown_extra: self.smart_rotation_cooldown_extra,
-            smart_rotation_max_stacks: self.smart_rotation_max_stacks,
-            spin_up_time: self.spin_up_time,
-            spin_down_time: self.spin_down_time,
-            spin_initial_cooldown: self.spin_initial_cooldown,
-            group_fire_scales: self.group_fire_scales,
-            mana_cost: self.mana_cost,
-            lock_time: self.lock_time,
-            full_lock_release: self.full_lock_release,
-            change_lock_time: self.change_lock_time,
-            max_rotation_speed: self.max_rotation_speed,
-            initial_rotation_speed: self.initial_rotation_speed,
-            rotation_acceleration: self.rotation_acceleration,
-            nano_healing_priority_time: self.nano_healing_priority_time,
-            module_range: self.module_range,
-            shield_lifetime: self.shield_lifetime,
-            teleport_time: self.teleport_time,
-            camera_time: self.camera_time,
-            camera_delay: self.camera_delay,
-            to_invisible_speed: self.to_invisible_speed,
-            to_invisible_duration: self.to_invisible_duration,
-            to_visible_duration: self.to_visible_duration,
-            countdown_time: self.countdown_time,
-            stun_time: self.stun_time,
-            stun_radius: self.stun_radius,
-            effect_duration: self.effect_duration,
+            damage_inflicted: val.damage_inflicted,
+            protonium_damage_scale: val.protonium_damage_scale,
+            projectile_speed: val.projectile_speed,
+            projectile_range: val.projectile_range,
+            base_inaccuracy: val.base_inaccuracy,
+            base_air_inaccuracy: val.base_air_inaccuracy,
+            movement_inaccuracy: val.movement_inaccuracy,
+            movement_max_speed: val.movement_max_speed,
+            movement_min_speed: val.movement_min_speed,
+            gun_rotation_slow: val.gun_rotation_slow,
+            movement_inaccuracy_decay: val.movement_inaccuracy_decay,
+            slow_rotation_decay: val.slow_rotation_decay,
+            quick_rotation_decay: val.quick_rotation_decay,
+            movement_inaccuracy_recovery: val.movement_inaccuracy_recovery,
+            repeat_fire_inaccuracy_total_degrees: val.repeat_fire_inaccuracy_total_degrees,
+            repeat_fire_inaccuracy_decay: val.repeat_fire_inaccuracy_decay,
+            repeat_fire_innaccuracy_recovery: val.repeat_fire_innaccuracy_recovery,
+            fire_instant_accuracy_decay: val.fire_instant_accuracy_decay, // degrees
+            accuracy_non_recover_time: val.accuracy_non_recover_time,
+            accuracy_decay: val.accuracy_decay,
+            damage_radius: val.damage_radius,
+            plasma_time_to_full_damage: val.plasma_time_to_full_damage,
+            plasma_starting_radius_scale: val.plasma_starting_radius_scale,
+            nano_dps: val.nano_dps,
+            nano_hps: val.nano_hps,
+            tesla_damage: val.tesla_damage,
+            tesla_charges: val.tesla_charges,
+            aeroflak_proximity_damage: val.aeroflak_proximity_damage,
+            aeroflak_damage_radius: val.aeroflak_damage_radius,
+            aeroflak_explosion_radius: val.aeroflak_explosion_radius,
+            aeroflak_ground_clearance: val.aeroflak_ground_clearance,
+            aeroflak_max_stacks: val.aeroflak_max_stacks,
+            aeroflak_damage_per_stack: val.aeroflak_damage_per_stack,
+            aeroflak_stack_expire: val.aeroflak_stack_expire,
+            shot_cooldown: val.shot_cooldown,
+            smart_rotation_cooldown: val.smart_rotation_cooldown,
+            smart_rotation_cooldown_extra: val.smart_rotation_cooldown_extra,
+            smart_rotation_max_stacks: val.smart_rotation_max_stacks,
+            spin_up_time: val.spin_up_time,
+            spin_down_time: val.spin_down_time,
+            spin_initial_cooldown: val.spin_initial_cooldown,
+            group_fire_scales: val.group_fire_scales,
+            mana_cost: val.mana_cost,
+            lock_time: val.lock_time,
+            full_lock_release: val.full_lock_release,
+            change_lock_time: val.change_lock_time,
+            max_rotation_speed: val.max_rotation_speed,
+            initial_rotation_speed: val.initial_rotation_speed,
+            rotation_acceleration: val.rotation_acceleration,
+            nano_healing_priority_time: val.nano_healing_priority_time,
+            module_range: val.module_range,
+            shield_lifetime: val.shield_lifetime,
+            teleport_time: val.teleport_time,
+            camera_time: val.camera_time,
+            camera_delay: val.camera_delay,
+            to_invisible_speed: val.to_invisible_speed,
+            to_invisible_duration: val.to_invisible_duration,
+            to_visible_duration: val.to_visible_duration,
+            countdown_time: val.countdown_time,
+            stun_time: val.stun_time,
+            stun_radius: val.stun_radius,
+            effect_duration: val.effect_duration,
         }
     }
 }