Rename Packet::Lap to Packet::LapData for consistency

mathieu-lemay · Jul 1, 2023 · 58b538a · 58b538a
1 parent 7133478
commit 58b538a
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/f1-telemetry-display/src/models.rs b/f1-telemetry-display/src/models.rs
@@ -55,7 +55,7 @@ impl GameState {
     fn parse(&mut self, packet: &Packet) {
         match packet {
             Packet::Session(p) => self.parse_session_data(p),
-            Packet::Lap(p) => self.parse_lap_data(p),
+            Packet::LapData(p) => self.parse_lap_data(p),
             Packet::Event(p) => self.parse_event_data(p),
             Packet::Participants(p) => self.parse_participants(p),
             // Packet::CarqSetups(p) => p.header(),

diff --git a/f1-telemetry-display/src/ui/gtk.rs b/f1-telemetry-display/src/ui/gtk.rs
@@ -103,7 +103,7 @@ fn process_packet(game_state: &RefCell<GameState>, widgets: &Rc<Widgets>, packet
             widgets.header.update(&game_state);
         }
         Packet::Participants(_) => widgets.lap_times_view.set_participants(&game_state),
-        Packet::Lap(_) => {
+        Packet::LapData(_) => {
             widgets.header.update(&game_state);
             widgets.lap_times_view.update(&game_state);
         }

diff --git a/f1-telemetry-display/src/ui/nc.rs b/f1-telemetry-display/src/ui/nc.rs
@@ -292,7 +292,7 @@ impl NcursesUi {
             Packet::Event(_) => {
                 self.print_event_info(game_state);
             }
-            Packet::Lap(_) => {
+            Packet::LapData(_) => {
                 self.print_session_info(game_state);
             }
             _ => {}
@@ -301,7 +301,7 @@ impl NcursesUi {
 
     fn render_dashboard_view(&mut self, game_state: &GameState, packet: &Packet) {
         match packet {
-            Packet::Lap(_) => {
+            Packet::LapData(_) => {
                 self.print_dashboard_lap_info(game_state);
                 self.print_track_status_lap_info(game_state);
             }
@@ -323,7 +323,7 @@ impl NcursesUi {
 
     fn render_lap_view(&mut self, game_state: &GameState, packet: &Packet) {
         match packet {
-            Packet::Lap(_) => {
+            Packet::LapData(_) => {
                 self.print_lap_details_lap_info(game_state);
                 self.print_best_sectors_lap_info(game_state);
             }
@@ -340,7 +340,7 @@ impl NcursesUi {
 
     fn render_track_view(&self, game_state: &GameState, packet: &Packet) {
         match packet {
-            Packet::Lap(_) => {
+            Packet::LapData(_) => {
                 self.print_track_status_lap_info(game_state);
             }
             Packet::Session(_) => self.print_weather_info(game_state),

diff --git a/f1-telemetry/src/f1_2019.rs b/f1-telemetry/src/f1_2019.rs
@@ -42,7 +42,7 @@ pub(crate) fn parse_packet(size: usize, packet: &[u8]) -> Result<Packet, UnpackE
         PacketType::LapData => {
             let packet = parse_lap_data(&mut cursor, header, size)?;
 
-            Ok(Packet::Lap(packet))
+            Ok(Packet::LapData(packet))
         }
         PacketType::Event => {
             let packet = parse_event_data(&mut cursor, header, size)?;

diff --git a/f1-telemetry/src/f1_2020.rs b/f1-telemetry/src/f1_2020.rs
@@ -46,7 +46,7 @@ pub(crate) fn parse_packet(size: usize, packet: &[u8]) -> Result<Packet, UnpackE
         PacketType::LapData => {
             let packet = parse_lap_data(&mut cursor, header, size)?;
 
-            Ok(Packet::Lap(packet))
+            Ok(Packet::LapData(packet))
         }
         PacketType::Event => {
             let packet = parse_event_data(&mut cursor, header, size)?;

diff --git a/f1-telemetry/src/f1_2021.rs b/f1-telemetry/src/f1_2021.rs
@@ -50,7 +50,7 @@ pub(crate) fn parse_packet(size: usize, packet: &[u8]) -> Result<Packet, UnpackE
         PacketType::LapData => {
             let packet = parse_lap_data(&mut cursor, header, size)?;
 
-            Ok(Packet::Lap(packet))
+            Ok(Packet::LapData(packet))
         }
         PacketType::Event => {
             let packet = parse_event_data(&mut cursor, header, size)?;

diff --git a/f1-telemetry/src/f1_2022.rs b/f1-telemetry/src/f1_2022.rs
@@ -50,7 +50,7 @@ pub(crate) fn parse_packet(size: usize, packet: &[u8]) -> Result<Packet, UnpackE
         PacketType::LapData => {
             let packet = parse_lap_data(&mut cursor, header, size)?;
 
-            Ok(Packet::Lap(packet))
+            Ok(Packet::LapData(packet))
         }
         PacketType::Event => {
             let packet = parse_event_data(&mut cursor, header, size)?;

diff --git a/f1-telemetry/src/f1_2023.rs b/f1-telemetry/src/f1_2023.rs
@@ -55,7 +55,7 @@ pub(crate) fn parse_packet(size: usize, packet: &[u8]) -> Result<Packet, UnpackE
         PacketType::LapData => {
             let packet = parse_lap_data(&mut cursor, header, size)?;
 
-            Ok(Packet::Lap(packet))
+            Ok(Packet::LapData(packet))
         }
         PacketType::Event => {
             let packet = parse_event_data(&mut cursor, header, size)?;

diff --git a/f1-telemetry/src/packet.rs b/f1-telemetry/src/packet.rs
@@ -49,7 +49,7 @@ impl From<Box<bincode::ErrorKind>> for UnpackError {
 pub enum Packet {
     Motion(PacketMotionData),
     Session(PacketSessionData),
-    Lap(PacketLapData),
+    LapData(PacketLapData),
     Event(PacketEventData),
     Participants(PacketParticipantsData),
     CarSetups(PacketCarSetupData),
@@ -68,7 +68,7 @@ impl Packet {
         match self {
             Packet::Motion(p) => &p.header,
             Packet::Session(p) => &p.header,
-            Packet::Lap(p) => &p.header,
+            Packet::LapData(p) => &p.header,
             Packet::Event(p) => &p.header,
             Packet::Participants(p) => &p.header,
             Packet::CarSetups(p) => &p.header,

diff --git a/f1-telemetry/tests/f1_2019_packets.rs b/f1-telemetry/tests/f1_2019_packets.rs
@@ -617,7 +617,7 @@ async fn test_parse_2019_lap_packet() {
     let p = stream.next().await.unwrap();
 
     let actual = match p {
-        Packet::Lap(s) => s,
+        Packet::LapData(s) => s,
         _ => panic!("Invalid packet. Expected Lap, got {:?}", &p),
     };
 

diff --git a/f1-telemetry/tests/f1_2020_packets.rs b/f1-telemetry/tests/f1_2020_packets.rs
@@ -747,7 +747,7 @@ async fn test_parse_2020_lap_packet() {
     let p = stream.next().await.unwrap();
 
     let actual = match p {
-        Packet::Lap(s) => s,
+        Packet::LapData(s) => s,
         _ => panic!("Invalid packet. Expected Lap, got {:?}", &p),
     };
 

diff --git a/f1-telemetry/tests/f1_2021_packets.rs b/f1-telemetry/tests/f1_2021_packets.rs
@@ -767,7 +767,7 @@ async fn test_parse_2021_lap_packet() {
     let p = stream.next().await.unwrap();
 
     let actual = match p {
-        Packet::Lap(s) => s,
+        Packet::LapData(s) => s,
         _ => panic!("Invalid packet. Expected Lap, got {:?}", &p),
     };
 

diff --git a/f1-telemetry/tests/f1_2022_packets.rs b/f1-telemetry/tests/f1_2022_packets.rs
@@ -737,7 +737,7 @@ async fn test_parse_2022_lap_packet() {
     let p = stream.next().await.unwrap();
 
     let actual = match p {
-        Packet::Lap(s) => s,
+        Packet::LapData(s) => s,
         _ => panic!("Invalid packet. Expected Lap, got {:?}", &p),
     };