Skip to content

Commit 0c25a66

Browse files
committed
small serialization style changes
1 parent e559838 commit 0c25a66

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/gui_filters.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl FilterRow {
191191
FilterType::KillerTeamFilter | FilterType::VictimTeamFilter => {
192192
let mut row = Row::new();
193193
row = row.push(Button::new(&mut self.team_button_blu, Text::new("BLU")).on_press(Message::BluTeamClicked(index)).style(
194-
if self.team_button_selected == Team::Blue {
194+
if self.team_button_selected == Team::Blu {
195195
ActiveButtonHighlight::Highlighted
196196
} else {
197197
ActiveButtonHighlight::NotHighlighted
@@ -336,7 +336,7 @@ impl FilterRow {
336336
KillerTeamFilter {
337337
team: match self.team_button_selected {
338338
Team::Red => Team::Red,
339-
Team::Blue => Team::Blue,
339+
Team::Blu => Team::Blu,
340340
_ => return None,
341341
},
342342
}
@@ -346,7 +346,7 @@ impl FilterRow {
346346
VictimTeamFilter {
347347
team: match self.team_button_selected {
348348
Team::Red => Team::Red,
349-
Team::Blue => Team::Blue,
349+
Team::Blu => Team::Blu,
350350
_ => return None,
351351
},
352352
}

src/heatmap_analyser.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ impl ChatMassage {
4040
}
4141

4242
#[derive(Debug, Clone, Serialize, Deserialize, Copy, PartialEq, Eq, Hash, TryFromPrimitive)]
43-
#[serde(rename_all = "lowercase")]
4443
#[repr(u8)]
4544
pub enum Team {
4645
Other = 0,
4746
Spectator = 1,
4847
Red = 2,
49-
Blue = 3,
48+
Blu = 3,
5049
}
5150

5251
impl Team {
@@ -129,7 +128,6 @@ impl Spawn {
129128
}
130129

131130
#[derive(Debug, Clone, Serialize, Deserialize)]
132-
#[serde(rename_all = "camelCase")]
133131
pub struct UserInfo {
134132
pub name: String,
135133
pub user_id: UserId,
@@ -476,7 +474,6 @@ impl HeatmapAnalyser {
476474
}
477475

478476
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
479-
#[serde(rename_all = "camelCase")]
480477
pub struct HeatmapAnalysis {
481478
pub start_tick: u32,
482479
pub current_tick: u32,

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ impl Application for App {
566566
}
567567
Message::BluTeamClicked(index) => {
568568
let filter_row = &mut self.get_filters_pane_mut().filters[index];
569-
filter_row.team_button_selected = Team::Blue;
569+
filter_row.team_button_selected = Team::Blu;
570570
filter_row.filter = filter_row.try_generate_filter();
571571
self.try_generate_heatmap();
572572
}

0 commit comments

Comments
 (0)