Skip to content

Commit

Permalink
fix(clippy): apply lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@obviyus
obviyus committed Dec 13, 2022
1 parent b0937bb commit 56652d7
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ pub struct HamVerBotConfig {
}

pub fn load_config() -> Result<HamVerBotConfig, ConfigError> {
let config_path = std::env::var("CONFIG_PATH").unwrap_or("config.toml".to_string());
let config_path = std::env::var("CONFIG_PATH").unwrap_or_else(|_| "config.toml".to_string());
info!("Loading config from {}", config_path);

let config = match Config::load(config_path.clone()) {
Ok(config) => config,
Err(e) => {
error!("Error attempting to read {} : {:?}", config_path.clone(), e);
error!("Error attempting to read {} : {:?}", config_path, e);
return Err(ConfigError(e.to_string()));
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/fetch.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub async fn fetch_events() -> Result<Option<Vec<(String, String, i64)>>, Box<dy
let mut events: Vec<(String, String, i64)> = Vec::with_capacity(5);

upcoming_sessions.iter().for_each(|timetable| {
return match chrono::DateTime::parse_from_str(
match chrono::DateTime::parse_from_str(
&format!("{} {}", timetable.start_time, timetable.gmt_offset),
"%Y-%m-%dT%H:%M:%S %:z",
) {
Expand All @@ -113,7 +113,7 @@ pub async fn fetch_events() -> Result<Option<Vec<(String, String, i64)>>, Box<dy
Err(e) => {
error!("Error parsing start_time: {}", e);
}
};
}
});

Ok(Some(events))
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ async fn main() -> irc::error::Result<()> {
"{}\x00{}\x00{}",
client_clone.clone().current_nickname(),
client_clone.clone().current_nickname(),
config.irc.password().to_string()
config.irc.password()
))))?;
sender.send(Command::CAP(None, "END".parse().unwrap(), None, None))?;
}
Expand Down
4 changes: 2 additions & 2 deletions src/message.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ pub async fn handle_irc_message(

// Human readable time until event_time
pub(crate) fn string_builder(event_name: &str, event_time: i64) -> String {
let parsed_time = chrono::Utc.timestamp(event_time, 0);
let parsed_time = chrono::Utc.timestamp_opt(event_time, 0);

let time_left = parsed_time - chrono::Utc::now();
let time_left = parsed_time.single().unwrap() - chrono::Utc::now();
let mut time_left_string: String;

if time_left.num_days() > 0 {
Expand Down
44 changes: 22 additions & 22 deletions src/models.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ pub struct ArchiveStatus {
pub status: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SPFeed {
pub free: Free,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Free {
pub data: Data,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Data {
#[serde(rename = "DR")]
Expand All @@ -90,7 +90,7 @@ pub struct Data {
pub r: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct F1APIDriverStanding {
pub position: i8,
pub driver_name: String,
Expand All @@ -99,27 +99,27 @@ pub struct F1APIDriverStanding {
pub difference: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct SessionResults {
pub title: String,
pub standings: Vec<F1APIDriverStanding>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Dr4 {
#[serde(rename = "F")]
pub f: (String, String, String, String, String, i64),
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Root {
pub season_context: SeasonContext,
pub race: Race,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Race {
pub meeting_country_name: String,
Expand All @@ -128,13 +128,13 @@ pub struct Race {
pub meeting_end_date: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SeasonContext {
pub timetables: Vec<Timetable>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Timetable {
pub state: String,
Expand All @@ -145,21 +145,21 @@ pub struct Timetable {
pub start_time: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct CurrentDriverStandings {
#[serde(rename = "MRData")]
pub mrdata: DriversMrdata,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct CurrentConstructorStandings {
#[serde(rename = "MRData")]
pub mrdata: ConstructorsMrdata,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct DriversMrdata {
pub xmlns: String,
Expand All @@ -172,7 +172,7 @@ pub struct DriversMrdata {
pub standings_table: DriverStandingsTable,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ConstructorsMrdata {
pub xmlns: String,
Expand All @@ -185,23 +185,23 @@ pub struct ConstructorsMrdata {
pub standings_table: ConstructorStandingsTable,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct DriverStandingsTable {
pub season: String,
#[serde(rename = "StandingsLists")]
pub standings_lists: Vec<DriverStandingsList>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ConstructorStandingsTable {
pub season: String,
#[serde(rename = "StandingsLists")]
pub standings_lists: Vec<ConstructorStandingsList>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct DriverStandingsList {
pub season: String,
Expand All @@ -210,7 +210,7 @@ pub struct DriverStandingsList {
pub driver_standings: Vec<ErgastAPIDriverStanding>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ConstructorStandingsList {
pub season: String,
Expand All @@ -219,7 +219,7 @@ pub struct ConstructorStandingsList {
pub constructor_standings: Vec<ConstructorStanding>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ErgastAPIDriverStanding {
pub position: String,
Expand All @@ -232,7 +232,7 @@ pub struct ErgastAPIDriverStanding {
pub constructors: Vec<Constructor>,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Driver {
pub driver_id: String,
Expand All @@ -245,7 +245,7 @@ pub struct Driver {
pub nationality: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Constructor {
pub constructor_id: String,
Expand All @@ -254,7 +254,7 @@ pub struct Constructor {
pub nationality: String,
}

#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ConstructorStanding {
pub position: String,
Expand Down

0 comments on commit 56652d7

Please sign in to comment.