use 'Self' keyword to refer to own type

src/main.rs

@@ -9,7 +9,8 @@
 	clippy::unused_async,
 	clippy::uninlined_format_args,
 	clippy::implicit_clone,
-	clippy::inconsistent_struct_constructor
+	clippy::inconsistent_struct_constructor,
+	clippy::use_self
 )]
 
 mod modules;

src/modules/display/border.rs

@@ -16,35 +16,35 @@ pub enum Border {
 impl Border {
 	pub fn fmt<'a>(&self, style: &BorderStyle) -> &'a str {
 		match self {
-			Border::TL => match style {
+			Self::TL => match style {
 				BorderStyle::single => "┌",
 				BorderStyle::solid => "┏",
 				BorderStyle::double => "╔",
 				BorderStyle::rounded => "╭",
 			},
-			Border::T | Border::B => match style {
+			Self::T | Self::B => match style {
 				BorderStyle::double => "═",
 				BorderStyle::solid => "━",
 				_ => "─",
 			},
-			Border::TR => match style {
+			Self::TR => match style {
 				BorderStyle::single => "┐",
 				BorderStyle::solid => "┓",
 				BorderStyle::double => "╗",
 				BorderStyle::rounded => "╮",
 			},
-			Border::R | Border::L => match style {
+			Self::R | Self::L => match style {
 				BorderStyle::double => "║",
 				BorderStyle::solid => "┃",
 				_ => "│",
 			},
-			Border::BR => match style {
+			Self::BR => match style {
 				BorderStyle::single => "┘",
 				BorderStyle::solid => "┛",
 				BorderStyle::double => "╝",
 				BorderStyle::rounded => "╯",
 			},
-			Border::BL => match style {
+			Self::BL => match style {
 				BorderStyle::single => "└",
 				BorderStyle::solid => "┗",
 				BorderStyle::double => "╚",

src/modules/display/current.rs

@@ -35,7 +35,7 @@ pub struct Dimensions {
 
 impl Current {
 	pub fn render(self, params: &Params) -> Dimensions {
-		let Current {
+		let Self {
 			address,
 			temperature,
 			apparent_temperature,
@@ -231,7 +231,7 @@ impl Current {
 			None
 		};
 
-		Ok(Current {
+		Ok(Self {
 			address,
 			temperature,
 			apparent_temperature,

src/modules/display/day.rs

@@ -27,7 +27,7 @@ pub struct Day {
 
 impl Day {
 	pub fn render(self, params: &Params) {
-		let Day {
+		let Self {
 			address,
 			temp_max_min,
 			apparent_temp_max_min,
@@ -152,7 +152,7 @@ impl Day {
 			WeatherCode::resolve(weather.daily.weathercode[day_index], night, &params.texts.weather.weather_code)?;
 		let hourly_forecast = HourlyForecast::prepare(product, params, day_index)?;
 
-		Ok(Day {
+		Ok(Self {
 			address,
 			temp_max_min,
 			apparent_temp_max_min,

src/modules/display/graph.rs

@@ -62,8 +62,8 @@ struct GraphLvls {
 }
 
 impl Graph {
-	pub fn prepare_graph(temperatures: &[f32], graph_opts: &GraphOpts) -> Graph {
-		let mut graph = Graph(String::new(), String::new());
+	pub fn prepare_graph(temperatures: &[f32], graph_opts: &GraphOpts) -> Self {
+		let mut graph = Self(String::new(), String::new());
 		let style = graph_opts.style;
 		let rowspan = graph_opts.rowspan;
 

src/modules/display/historical.rs

@@ -33,7 +33,7 @@ pub struct HistoricalWeather {
 
 impl HistoricalWeather {
 	pub fn render(self, params: &Params) {
-		let HistoricalWeather {
+		let Self {
 			address,
 			temp_max_min,
 			apparent_temp_max_min,

src/modules/display/hourly.rs

@@ -41,7 +41,7 @@ struct WeatherSummery {
 
 impl HourlyForecast {
 	pub fn render(self, params: &Params) {
-		let HourlyForecast {
+		let Self {
 			heading,
 			temperatures,
 			precipitation,
@@ -283,7 +283,7 @@ impl HourlyForecast {
 			_ => None,
 		};
 
-		Ok(HourlyForecast {
+		Ok(Self {
 			heading: params.texts.weather.hourly_forecast.to_string(),
 			temperatures: Self::prepare_temperatures(
 				temperatures,

src/modules/display/weathercode.rs

@@ -41,7 +41,7 @@ impl WeatherCode {
 			_ => return Err(anyhow!("Unknown weather code")),
 		};
 
-		Ok(WeatherCode {
+		Ok(Self {
 			interpretation: res.0.to_string(),
 			icon: res.1,
 		})

src/modules/display/week.rs

@@ -145,6 +145,6 @@ impl Week {
 			days.push(day);
 		}
 
-		Ok(Week { days, width })
+		Ok(Self { days, width })
 	}
 }

src/modules/display/wind.rs

@@ -16,14 +16,14 @@ pub enum WindDirection {
 impl WindDirection {
 	pub fn get_direction(wd: f32) -> Result<Self> {
 		let direction = match wd % 360.0 {
-			wd if (337.5..=360.0).contains(&wd) || (0.0..22.5).contains(&wd) => WindDirection::N,
-			wd if (22.5..67.5).contains(&wd) => WindDirection::NE,
-			wd if (67.5..112.5).contains(&wd) => WindDirection::E,
-			wd if (112.5..157.5).contains(&wd) => WindDirection::SE,
-			wd if (157.5..202.5).contains(&wd) => WindDirection::S,
-			wd if (202.5..247.5).contains(&wd) => WindDirection::SW,
-			wd if (247.5..292.5).contains(&wd) => WindDirection::W,
-			wd if (292.5..337.5).contains(&wd) => WindDirection::NW,
+			wd if (337.5..=360.0).contains(&wd) || (0.0..22.5).contains(&wd) => Self::N,
+			wd if (22.5..67.5).contains(&wd) => Self::NE,
+			wd if (67.5..112.5).contains(&wd) => Self::E,
+			wd if (112.5..157.5).contains(&wd) => Self::SE,
+			wd if (157.5..202.5).contains(&wd) => Self::S,
+			wd if (202.5..247.5).contains(&wd) => Self::SW,
+			wd if (247.5..292.5).contains(&wd) => Self::W,
+			wd if (292.5..337.5).contains(&wd) => Self::NW,
 			_ => return Err(anyhow!("Wind from another dimension")),
 		};
 
@@ -32,14 +32,14 @@ impl WindDirection {
 
 	pub fn get_icon(&self) -> char {
 		match *self {
-			WindDirection::N => '',
-			WindDirection::NE => '',
-			WindDirection::E => '',
-			WindDirection::SE => '',
-			WindDirection::S => '',
-			WindDirection::SW => '',
-			WindDirection::W => '',
-			WindDirection::NW => '',
+			Self::N => '',
+			Self::NE => '',
+			Self::E => '',
+			Self::SE => '',
+			Self::S => '',
+			Self::SW => '',
+			Self::W => '',
+			Self::NW => '',
 		}
 	}
 }

src/modules/localization.rs

@@ -160,7 +160,7 @@ const DATETIME_LOCALES: &str = include_str!(concat!(env!("CARGO_MANIFEST_DIR"),
 
 impl Locales {
 	pub async fn get(lang: &str) -> Result<Self> {
-		let mut texts = Locales::default();
+		let mut texts = Self::default();
 		let path = Self::get_path(lang);
 
 		if let Ok(file) = fs::read_to_string(path) {

src/modules/location.rs

@@ -66,7 +66,7 @@ impl From<&OpenMeteoGeoObj> for Location {
 }
 
 impl Location {
-	pub async fn get(address: &str, lang: &str) -> Result<Location> {
+	pub async fn get(address: &str, lang: &str) -> Result<Self> {
 		let client = Client::builder().user_agent("wthrr-the-weathercrab").build()?;
 		let results = Self::search_osm(&client, address, lang).await;
 
@@ -76,7 +76,7 @@ impl Location {
 		}
 	}
 
-	async fn search_osm(client: &Client, address: &str, language: &str) -> Result<Location> {
+	async fn search_osm(client: &Client, address: &str, language: &str) -> Result<Self> {
 		client
 			.get(
 				&ApiQuery::location(ApiName::OpenStreetMap, address, language)
@@ -88,20 +88,20 @@ impl Location {
 			.json::<Vec<OpenStreetMapGeoObj>>()
 			.await?
 			.first()
-			.ok_or_else(|| anyhow!(Location::error_message()))
-			.map(Location::from)
+			.ok_or_else(|| anyhow!(Self::error_message()))
+			.map(Self::from)
 	}
 
-	async fn search_open_meteo(client: &Client, address: &str, language: &str) -> Result<Location> {
+	async fn search_open_meteo(client: &Client, address: &str, language: &str) -> Result<Self> {
 		client
 			.get(&ApiQuery::location(ApiName::OpenMeteo, address, language).convert().assemble())
 			.send()
 			.await?
 			.json::<Vec<OpenMeteoGeoObj>>()
 			.await?
 			.first()
-			.ok_or_else(|| anyhow!(Location::error_message()))
-			.map(Location::from)
+			.ok_or_else(|| anyhow!(Self::error_message()))
+			.map(Self::from)
 	}
 
 	pub async fn resolve_input(arg_address: &str, config: &Config, texts: &Locales) -> Result<String> {

src/modules/units.rs

@@ -59,11 +59,11 @@ pub enum Precipitation {
 }
 
 impl Units {
-	pub fn merge(arg_units: &[UnitArg], cfg_units: &Units) -> Units {
+	pub fn merge(arg_units: &[UnitArg], cfg_units: &Self) -> Self {
 		cfg_units.assign_unit_args(arg_units)
 	}
 
-	pub fn assign_unit_args(mut self, arg_units: &[UnitArg]) -> Units {
+	pub fn assign_unit_args(mut self, arg_units: &[UnitArg]) -> Self {
 		for val in arg_units {
 			if Temperature::VARIANTS.as_ref().contains(&val.as_ref()) {
 				self.temperature = Temperature::from_str(val.as_ref()).unwrap();

src/modules/weather.rs

@@ -80,7 +80,7 @@ pub struct Daily {
 }
 
 impl Weather {
-	pub async fn get(lat: f64, lon: f64, units: &Units) -> Result<Weather> {
+	pub async fn get(lat: f64, lon: f64, units: &Units) -> Result<Self> {
 		// TODO: conditionally expand api call
 		let url = format!(
 			"https://api.open-meteo.com/v1/forecast?
@@ -100,7 +100,7 @@ latitude={lat}
 
 		let res = reqwest::get(url)
 			.await?
-			.json::<Weather>()
+			.json::<Self>()
 			.await
 			.with_context(|| "Weather data request failed.")?;
 
@@ -142,7 +142,7 @@ latitude={lat}
 	) -> Result<HashMap<&'a NaiveDate, OptionalWeather>> {
 		let mut res = HashMap::new();
 		for date in dates {
-			res.insert(date, Weather::get_date(*date, lat, lon, units).await?);
+			res.insert(date, Self::get_date(*date, lat, lon, units).await?);
 		}
 
 		Ok(res)