⬆️ update Rust crate optional_struct to 0.5

Cargo.toml

@@ -29,7 +29,7 @@ clap = { version = "4.5", default-features = false, features = [
 directories = "5.0"
 dialoguer = { version = "0.11", default-features = false }
 futures = "0.3"
-optional_struct = "0.3"
+optional_struct = "0.5"
 regex = { version = "1.10" }
 reqwest = { version = "0.12", features = ["json"] }
 ron = "0.8"

src/modules/config.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use dialoguer::console::style;
 use directories::ProjectDirs;
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::{optional_struct, Applicable};
 use ron::{
 	extensions::Extensions,
 	ser::{to_string_pretty, PrettyConfig},

src/modules/display/graph.rs

@@ -1,4 +1,4 @@
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::optional_struct;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 

src/modules/display/gui_config.rs

@@ -1,5 +1,5 @@
 use dialoguer::console::{style, StyledObject};
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::{optional_struct, Applicable};
 use serde::{Deserialize, Serialize};
 
 use crate::modules::display::{

src/modules/display/historical.rs

@@ -130,7 +130,7 @@ impl HistoricalWeather {
 
 		// Helpers
 		let weather = &product.historical_weather.as_ref().unwrap()[date];
-		let weather_daily = weather.daily.as_ref().unwrap();
+		let weather_daily = &weather.daily;
 		let weather_daily_units = weather.daily_units.as_ref().unwrap();
 		let lang = &params.config.language;
 		// Times
@@ -183,7 +183,7 @@ impl HistoricalWeather {
 		let sunrise = format!(" {sunrise}");
 		let sunset = format!(" {sunset}");
 		let wmo_code = WeatherCode::resolve(
-			weather.daily.as_ref().unwrap().weathercode.as_ref().unwrap()[0],
+			weather.daily.weathercode.as_ref().unwrap()[0],
 			false,
 			&params.texts.weather.weather_code,
 		)?;

src/modules/display/hourly.rs

@@ -300,25 +300,25 @@ impl HourlyForecast {
 		// Therefore we'll extend the values by 1. For this we simply use the last value of the array twice.
 		let (mut temps, mut codes, mut prec);
 		let temperatures = {
-			temps = weather.hourly.as_ref().unwrap().temperature_2m.as_ref().unwrap()[0..].to_vec();
+			temps = weather.hourly.temperature_2m.as_ref().unwrap()[0..].to_vec();
 			temps.push(temps[temps.len() - 1]);
 			&temps
 		};
 		let weather_codes = {
-			codes = weather.hourly.as_ref().unwrap().weathercode.as_ref().unwrap()[0..].to_vec();
+			codes = weather.hourly.weathercode.as_ref().unwrap()[0..].to_vec();
 			codes.push(codes[codes.len() - 1]);
 			&codes
 		};
 		let sunrise_sunset = (
-			weather.daily.as_ref().unwrap().sunrise.as_ref().unwrap()[0][11..13]
+			weather.daily.sunrise.as_ref().unwrap()[0][11..13]
 				.parse::<usize>()
 				.unwrap_or_default(),
-			weather.daily.as_ref().unwrap().sunset.as_ref().unwrap()[0][11..13]
+			weather.daily.sunset.as_ref().unwrap()[0][11..13]
 				.parse::<usize>()
 				.unwrap_or_default(),
 		);
 		let precipitation = {
-			prec = weather.hourly.as_ref().unwrap().precipitation.as_ref().unwrap()[0..].to_vec();
+			prec = weather.hourly.precipitation.as_ref().unwrap()[0..].to_vec();
 			prec.push(prec[prec.len() - 1]);
 			prec.iter().map(|x| x.ceil() as u8).collect::<Vec<u8>>()
 		};

src/modules/localization.rs

@@ -2,7 +2,7 @@ use anyhow::{Context, Result};
 use chrono::{Local, NaiveDate};
 use directories::ProjectDirs;
 use futures::{stream::FuturesOrdered, TryStreamExt};
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::{optional_struct, Applicable};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;

src/modules/params.rs

@@ -3,7 +3,6 @@ use std::collections::HashSet;
 use anyhow::{Context, Result};
 use chrono::NaiveDate;
 use dialoguer::{theme::ColorfulTheme, Confirm, Select};
-use optional_struct::Applyable;
 
 use super::{
 	args::{Cli, Forecast},
@@ -69,7 +68,7 @@ impl Params {
 		})
 	}
 
-	pub fn handle_next(mut self, args: Cli, mut config_file: Config) -> Result<()> {
+	pub fn handle_next(mut self, args: Cli, config_file: Config) -> Result<()> {
 		if !args.save && !config_file.address.is_empty() {
 			return Ok(());
 		}
@@ -79,13 +78,10 @@ impl Params {
 
 		if config_file.address.is_empty() {
 			// Prompt to save
-			self.config.apply_to(&mut config_file);
-			self.config = config_file;
 			self.save_prompt(&args.address.unwrap_or_default())?;
 		} else {
 			// Handle explicit save call
-			self.config.apply_to(&mut config_file);
-			config_file.store().context("Error saving config file.")?;
+			self.config.store().context("Error saving config file.")?;
 			self.texts.store(&config_file.language);
 		}
 

src/modules/units.rs

@@ -1,4 +1,4 @@
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::optional_struct;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use strum::VariantNames;

src/modules/weather.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
 use chrono::{Local, NaiveDate};
-use optional_struct::{optional_struct, Applyable};
+use optional_struct::{optional_struct, Applicable};
 use serde::Deserialize;
 use std::collections::{HashMap, HashSet};