From 5d5966890029ac7d45da915f8bc1693d63d0ba01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20P=C4=99dzich?= Date: Thu, 20 Feb 2025 13:07:55 +0100 Subject: [PATCH] style: set rustfmt print width to 90 --- rustfmt.toml | 2 +- src/constants/mod.rs | 440 ++++------------------------ src/lib.rs | 15 +- src/packets/car_damage.rs | 4 +- src/packets/car_setups.rs | 4 +- src/packets/car_status.rs | 4 +- src/packets/car_telemetry.rs | 4 +- src/packets/event.rs | 4 +- src/packets/final_classification.rs | 4 +- src/packets/lap.rs | 4 +- src/packets/lobby.rs | 4 +- src/packets/mod.rs | 65 ++-- src/packets/motion.rs | 4 +- src/packets/participants.rs | 4 +- src/packets/session.rs | 12 +- src/packets/session_history.rs | 8 +- src/packets/tyre_sets.rs | 11 +- 17 files changed, 90 insertions(+), 503 deletions(-) diff --git a/rustfmt.toml b/rustfmt.toml index 9a3ee09..f4111e2 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ -max_width = 80 +max_width = 90 format_code_in_doc_comments = true imports_granularity = "Crate" imports_layout = "Vertical" diff --git a/src/constants/mod.rs b/src/constants/mod.rs index 338aa94..fbc5a62 100644 --- a/src/constants/mod.rs +++ b/src/constants/mod.rs @@ -11,16 +11,7 @@ pub(crate) const MAX_NUM_CARS: usize = 22; #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum PacketId { @@ -43,16 +34,7 @@ pub enum PacketId { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(i8))] pub enum MarshalZoneFlag { @@ -66,16 +48,7 @@ pub enum MarshalZoneFlag { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum Weather { @@ -89,16 +62,7 @@ pub enum Weather { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum SessionType { @@ -120,16 +84,7 @@ pub enum SessionType { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(i8))] pub enum TemperatureChange { @@ -140,16 +95,7 @@ pub enum TemperatureChange { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(i8))] pub enum TrackId { @@ -191,16 +137,7 @@ pub enum TrackId { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum Formula { @@ -218,16 +155,7 @@ pub enum Formula { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum SafetyCarStatus { @@ -239,16 +167,7 @@ pub enum SafetyCarStatus { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum ForecastAccuracy { @@ -258,16 +177,7 @@ pub enum ForecastAccuracy { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum BrakingAssist { @@ -279,16 +189,7 @@ pub enum BrakingAssist { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum GearboxAssist { @@ -300,16 +201,7 @@ pub enum GearboxAssist { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum DynamicRacingLine { @@ -320,16 +212,7 @@ pub enum DynamicRacingLine { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum DynamicRacingLineType { @@ -339,16 +222,7 @@ pub enum DynamicRacingLineType { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum GameMode { @@ -374,16 +248,7 @@ pub enum GameMode { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum RuleSet { @@ -400,16 +265,7 @@ pub enum RuleSet { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum SessionLength { @@ -424,16 +280,7 @@ pub enum SessionLength { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum PitStatus { @@ -444,16 +291,7 @@ pub enum PitStatus { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum DriverStatus { @@ -466,16 +304,7 @@ pub enum DriverStatus { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum ResultStatus { @@ -491,16 +320,7 @@ pub enum ResultStatus { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum PenaltyType { @@ -526,16 +346,7 @@ pub enum PenaltyType { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum InfringementType { @@ -595,16 +406,7 @@ pub enum InfringementType { } #[derive( - Debug, - Clone, - Copy, - PartialEq, - Eq, - Ord, - PartialOrd, - Hash, - Serialize, - Deserialize, + Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, Serialize, Deserialize, )] pub struct ButtonStatus(u32); @@ -689,16 +491,7 @@ bitflags! { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum Nationality { @@ -794,16 +587,7 @@ pub enum Nationality { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum YourTelemetry { @@ -813,16 +597,7 @@ pub enum YourTelemetry { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum Surface { @@ -841,16 +616,7 @@ pub enum Surface { } #[derive( - Debug, - Clone, - Copy, - PartialEq, - Eq, - Ord, - PartialOrd, - Hash, - Serialize, - Deserialize, + Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, Serialize, Deserialize, )] pub struct RevLights(u16); @@ -891,16 +657,7 @@ bitflags! { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum MfdPanelIndex { @@ -914,16 +671,7 @@ pub enum MfdPanelIndex { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum TractionControl { @@ -934,16 +682,7 @@ pub enum TractionControl { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum FuelMix { @@ -955,16 +694,7 @@ pub enum FuelMix { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum ErsDeployMode { @@ -976,16 +706,7 @@ pub enum ErsDeployMode { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(i8))] pub enum VehicleFiaFlag { @@ -999,16 +720,7 @@ pub enum VehicleFiaFlag { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(i8))] pub enum DrsAllowed { @@ -1019,16 +731,7 @@ pub enum DrsAllowed { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum ActualTyreCompound { @@ -1052,16 +755,7 @@ pub enum ActualTyreCompound { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum VisualTyreCompound { @@ -1082,16 +776,7 @@ pub enum VisualTyreCompound { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum ReadyStatus { @@ -1101,16 +786,7 @@ pub enum ReadyStatus { } #[derive( - Debug, - Clone, - Copy, - PartialEq, - Eq, - Ord, - PartialOrd, - Hash, - Serialize, - Deserialize, + Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, Serialize, Deserialize, )] pub struct LapValid(u8); @@ -1129,16 +805,7 @@ bitflags! { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum SpeedUnit { @@ -1148,16 +815,7 @@ pub enum SpeedUnit { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum TemperatureUnit { @@ -1167,16 +825,7 @@ pub enum TemperatureUnit { #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br(little, repr(u8))] pub enum Platform { @@ -1187,3 +836,14 @@ pub enum Platform { Origin = 6, Unknown = 255, } + +#[non_exhaustive] +#[derive( + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, +)] +#[br(little, repr(u8))] +pub enum RecoveryMode { + None = 0, + Flashbacks = 1, + AutoRecovery = 2, +} diff --git a/src/lib.rs b/src/lib.rs index 503a366..70e4993 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,10 +4,9 @@ pub mod packets; use crate::constants::PacketId; use crate::packets::{ u8_to_usize, F1PacketCarDamage, F1PacketCarSetups, F1PacketCarStatus, - F1PacketCarTelemetry, F1PacketEvent, F1PacketFinalClassification, - F1PacketLap, F1PacketLobbyInfo, F1PacketMotion, F1PacketMotionEx, - F1PacketParticipants, F1PacketSession, F1PacketSessionHistory, - F1PacketTyreSets, + F1PacketCarTelemetry, F1PacketEvent, F1PacketFinalClassification, F1PacketLap, + F1PacketLobbyInfo, F1PacketMotion, F1PacketMotionEx, F1PacketParticipants, + F1PacketSession, F1PacketSessionHistory, F1PacketTyreSets, }; use binrw::io::Cursor; @@ -33,9 +32,7 @@ pub struct F1Packet { /// F1 game packet's header. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, assert( @@ -81,9 +78,7 @@ pub struct F1PacketHeader { /// F1 game packet's body. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16, packet_id: PacketId))] pub struct F1PacketBody { /// Physics data for all cars in the session. diff --git a/src/packets/car_damage.rs b/src/packets/car_damage.rs index beee31e..17e7e92 100644 --- a/src/packets/car_damage.rs +++ b/src/packets/car_damage.rs @@ -3,9 +3,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br(little, import(_packet_format: u16))] pub struct CarDamageData { /// Tyre wear percentage for all wheels. diff --git a/src/packets/car_setups.rs b/src/packets/car_setups.rs index fabe39f..bd01218 100644 --- a/src/packets/car_setups.rs +++ b/src/packets/car_setups.rs @@ -2,9 +2,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br(little, import(_packet_format: u16))] pub struct CarSetupData { /// Front wing aero diff --git a/src/packets/car_status.rs b/src/packets/car_status.rs index fb74f8e..7364842 100644 --- a/src/packets/car_status.rs +++ b/src/packets/car_status.rs @@ -8,9 +8,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), diff --git a/src/packets/car_telemetry.rs b/src/packets/car_telemetry.rs index f9b45b6..f88317b 100644 --- a/src/packets/car_telemetry.rs +++ b/src/packets/car_telemetry.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(_packet_format: u16), diff --git a/src/packets/event.rs b/src/packets/event.rs index d3d161d..a6b1bc2 100644 --- a/src/packets/event.rs +++ b/src/packets/event.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little)] pub enum EventDataDetails { /// Sent when the session starts. diff --git a/src/packets/final_classification.rs b/src/packets/final_classification.rs index acc2105..1483c76 100644 --- a/src/packets/final_classification.rs +++ b/src/packets/final_classification.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(_packet_format: u16), diff --git a/src/packets/lap.rs b/src/packets/lap.rs index a11d6b7..9901335 100644 --- a/src/packets/lap.rs +++ b/src/packets/lap.rs @@ -6,9 +6,7 @@ use serde::{Deserialize, Serialize}; /// Lap data for a car on track. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), diff --git a/src/packets/lobby.rs b/src/packets/lobby.rs index e3546fb..56b3119 100644 --- a/src/packets/lobby.rs +++ b/src/packets/lobby.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct LobbyInfoData { /// Whether the vehicle is controlled by AI. diff --git a/src/packets/mod.rs b/src/packets/mod.rs index 8280ad2..bfc5c0d 100644 --- a/src/packets/mod.rs +++ b/src/packets/mod.rs @@ -13,10 +13,9 @@ pub mod session_history; pub mod tyre_sets; use crate::constants::{ - BrakingAssist, DynamicRacingLine, DynamicRacingLineType, ForecastAccuracy, - Formula, GameMode, GearboxAssist, MfdPanelIndex, RuleSet, SafetyCarStatus, - SessionLength, SessionType, SpeedUnit, TemperatureUnit, TrackId, Weather, - MAX_NUM_CARS, + BrakingAssist, DynamicRacingLine, DynamicRacingLineType, ForecastAccuracy, Formula, + GameMode, GearboxAssist, MfdPanelIndex, RuleSet, SafetyCarStatus, SessionLength, + SessionType, SpeedUnit, TemperatureUnit, TrackId, Weather, MAX_NUM_CARS, }; use crate::packets::car_damage::CarDamageData; use crate::packets::car_setups::CarSetupData; @@ -32,15 +31,13 @@ use crate::packets::session::{MarshalZone, WeatherForecastSample}; use crate::packets::session_history::{LapHistoryData, TyreStintHistoryData}; use crate::packets::tyre_sets::TyreSetData; -use binrw::{BinRead, BinResult}; +use binrw::BinRead; use serde::{Deserialize, Serialize}; use std::string::FromUtf8Error; /// Physics data for all the cars being driven. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketMotion { /// Motion data for all cars on track. @@ -55,9 +52,7 @@ pub struct F1PacketMotion { /// Data about the ongoing session. #[allow(clippy::struct_excessive_bools)] #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -217,9 +212,7 @@ pub struct F1PacketSession { /// Data about all the lap times of cars in the session. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketLap { /// Lap data for all cars on track. @@ -235,9 +228,7 @@ pub struct F1PacketLap { /// Various notable events that happen during a session. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(_packet_format: u16))] pub struct F1PacketEvent { /// 4-letter event code. @@ -252,9 +243,7 @@ pub struct F1PacketEvent { /// Data of participants in the session, mostly relevant for multiplayer. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -279,9 +268,7 @@ pub struct F1PacketParticipants { /// In multiplayer games, other player cars will appear as blank. /// You will only be able to see your car setup and AI cars. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketCarSetups { /// Setup data for all cars on track. @@ -292,9 +279,7 @@ pub struct F1PacketCarSetups { /// Telemetry (such as speed, DRS, throttle application, etc.) /// for all cars in the race. -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -319,9 +304,7 @@ pub struct F1PacketCarTelemetry { /// Car status data for each car in the race. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketCarStatus { /// Status data for all cars. Should have a size of 22. @@ -331,9 +314,7 @@ pub struct F1PacketCarStatus { /// Final classification confirmation at the end of a race. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -356,9 +337,7 @@ pub struct F1PacketFinalClassification { /// Packet detailing all the players that are currently in a multiplayer lobby. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -381,9 +360,7 @@ pub struct F1PacketLobbyInfo { /// Car damage parameters for all cars in the session. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketCarDamage { /// Car damage data. Should have a size of 22. @@ -393,9 +370,7 @@ pub struct F1PacketCarDamage { /// Packet detailing lap and tyre data history for a given driver in the session #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br( little, import(packet_format: u16), @@ -448,9 +423,7 @@ pub struct F1PacketSessionHistory { /// In-depth details about tyre sets assigned to a vehicle during the session. /// Available from the 2023 format onwards. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketTyreSets { /// Index of the car this packet relates to. @@ -468,9 +441,7 @@ pub struct F1PacketTyreSets { /// - part of [`F1PacketMotion`] in the 2022 format /// - standalone packet from the 2023 format onwards #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct F1PacketMotionEx { /// Positions of suspension for each wheel. diff --git a/src/packets/motion.rs b/src/packets/motion.rs index 7a33e97..49616fd 100644 --- a/src/packets/motion.rs +++ b/src/packets/motion.rs @@ -1,9 +1,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br(little, import(_packet_format: u16))] pub struct CarMotionData { /// World space X position in metres. diff --git a/src/packets/participants.rs b/src/packets/participants.rs index c10337d..70750fa 100644 --- a/src/packets/participants.rs +++ b/src/packets/participants.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct ParticipantsData { /// Whether the vehicle is controlled by AI diff --git a/src/packets/session.rs b/src/packets/session.rs index 59dbd4d..7ced12e 100644 --- a/src/packets/session.rs +++ b/src/packets/session.rs @@ -1,14 +1,10 @@ -use crate::constants::{ - MarshalZoneFlag, SessionType, TemperatureChange, Weather, -}; +use crate::constants::{MarshalZoneFlag, SessionType, TemperatureChange, Weather}; use binrw::BinRead; use serde::{Deserialize, Serialize}; /// Section of the track supervised by marshals. #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(_packet_format: u16), @@ -27,9 +23,7 @@ pub struct MarshalZone { #[non_exhaustive] /// Weather forecast sample for a given session. -#[derive( - BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize)] #[br( little, import(_packet_format: u16), diff --git a/src/packets/session_history.rs b/src/packets/session_history.rs index dc60505..6994f3e 100644 --- a/src/packets/session_history.rs +++ b/src/packets/session_history.rs @@ -5,9 +5,7 @@ use binrw::BinRead; use serde::{Deserialize, Serialize}; #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(packet_format: u16))] pub struct LapHistoryData { /// Lap time in milliseconds. @@ -36,9 +34,7 @@ pub struct LapHistoryData { } #[non_exhaustive] -#[derive( - BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize, -)] +#[derive(BinRead, PartialEq, PartialOrd, Clone, Debug, Serialize, Deserialize)] #[br(little, import(_packet_format: u16))] pub struct TyreStintHistoryData { /// Lap the tyre usage ends on (255 if current tyre). diff --git a/src/packets/tyre_sets.rs b/src/packets/tyre_sets.rs index 21068ce..0f39953 100644 --- a/src/packets/tyre_sets.rs +++ b/src/packets/tyre_sets.rs @@ -6,16 +6,7 @@ use serde::{Deserialize, Serialize}; #[non_exhaustive] #[derive( - BinRead, - Eq, - PartialEq, - Ord, - PartialOrd, - Copy, - Clone, - Debug, - Serialize, - Deserialize, + BinRead, Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Debug, Serialize, Deserialize, )] #[br( little,