style: rustfmt (#45)

Signed-off-by: AltF2 <contact@altf2.dev>

Author: AltF02

src-tauri/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-  tauri_build::build()
+    tauri_build::build()
 }

src-tauri/src/common/config.rs

@@ -1,5 +1,5 @@
-use std::fs;
 use serde::Deserialize;
+use std::fs;
 
 use super::errors::IncResult;
 
@@ -32,4 +32,4 @@ pub struct ConfigRange {
 pub fn load_config() -> IncResult<Config> {
     let config_contents = fs::read_to_string(CONFIG_PATH)?;
     Ok(toml::from_str(config_contents.as_str())?)
-}
+}

src-tauri/src/common/errors.rs

@@ -6,7 +6,7 @@ pub enum Error {
     Toml(#[from] toml::de::Error),
     #[error(transparent)]
     SerdeJson(#[from] serde_json::Error),
-    
+
     #[error("{0}")]
     Warning(String),
 
@@ -21,16 +21,16 @@ pub enum Error {
 
     #[error("An unexpected issue occured.")]
     DangerUnexpected,
-    
+
     #[error("An unexpected issue occured.")]
     FatalUnexpected,
 }
 
 impl serde::Serialize for Error {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: serde::Serializer {
-
+    where
+        S: serde::Serializer,
+    {
         use serde::ser::SerializeStruct;
 
         let mut state = serializer.serialize_struct("Error", 2)?;
@@ -59,4 +59,4 @@ pub enum Severity {
     Warning,
     Danger,
     Fatal,
-}
+}

src-tauri/src/common/filesystem.rs

@@ -4,18 +4,18 @@ const DATA_PATH: &str = "./data";
 const SAVES_PATH: &str = "./data/saves";
 
 fn check_data_directories() -> IncResult<()> {
-  if !std::path::Path::new(DATA_PATH).exists() {
-    std::fs::create_dir(DATA_PATH)?;
-    std::fs::create_dir(SAVES_PATH)?;
+    if !std::path::Path::new(DATA_PATH).exists() {
+        std::fs::create_dir(DATA_PATH)?;
+        std::fs::create_dir(SAVES_PATH)?;
 
-    return Ok(());
-  }
+        return Ok(());
+    }
 
-  if !std::path::Path::new(SAVES_PATH).exists() {
-    std::fs::create_dir(SAVES_PATH)?;
-  }
+    if !std::path::Path::new(SAVES_PATH).exists() {
+        std::fs::create_dir(SAVES_PATH)?;
+    }
 
-  Ok(())
+    Ok(())
 }
 
 // pub fn create_save(name: String) -> IncResult<()> {
@@ -25,6 +25,6 @@ fn check_data_directories() -> IncResult<()> {
 
 #[tauri::command]
 pub fn check_save_exists(name: String) -> IncResult<bool> {
-  check_data_directories()?;
-  Ok(std::path::Path::new(&format!("{}/{}", SAVES_PATH, name)).exists())
-}
+    check_data_directories()?;
+    Ok(std::path::Path::new(&format!("{}/{}", SAVES_PATH, name)).exists())
+}

src-tauri/src/common/mod.rs

@@ -1,5 +1,5 @@
-pub mod filesystem;
 pub mod config;
-pub mod util;
+pub mod errors;
+pub mod filesystem;
 pub mod payloads;
-pub mod errors;
+pub mod util;

src-tauri/src/common/payloads.rs

@@ -8,4 +8,4 @@ pub struct PayloadNewDay {
 #[derive(Clone, Serialize)]
 pub struct NewGame {
     pub population: i32,
-}
+}

src-tauri/src/common/util.rs

@@ -1,8 +1,11 @@
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, ops::{Index, IndexMut}};
+use std::{
+    collections::HashMap,
+    ops::{Index, IndexMut},
+};
 
-use crate::{game::structs::{HealthcareGroup, HealthcareState}};
+use crate::game::structs::{HealthcareGroup, HealthcareState};
 
 #[macro_export]
 macro_rules! percentage_of {
@@ -150,7 +153,12 @@ impl Date {
     }
 
     pub fn get_date_string(&self) -> String {
-        format!("{}/{}/{}", zerofy(self.day, 2), zerofy(self.month, 2), zerofy(self.year, 4))
+        format!(
+            "{}/{}/{}",
+            zerofy(self.day, 2),
+            zerofy(self.month, 2),
+            zerofy(self.year, 4)
+        )
     }
 }
 
@@ -223,7 +231,9 @@ impl<T: Default + Clone> SlotArray<T> {
         }
     }
 
-    pub fn len(&self) -> usize { self.array.len() }
+    pub fn len(&self) -> usize {
+        self.array.len()
+    }
 }
 
 impl<T> Index<usize> for SlotArray<T> {
@@ -240,7 +250,7 @@ impl<T> IndexMut<usize> for SlotArray<T> {
 }
 
 pub fn generate_unemployed_salary() -> i32 {
-    rand::thread_rng().gen_range(300..=1100)    
+    rand::thread_rng().gen_range(300..=1100)
 }
 
 pub fn get_healthcare_group(age: i32, healthcare: &mut HealthcareState) -> &mut HealthcareGroup {
@@ -249,4 +259,4 @@ pub fn get_healthcare_group(age: i32, healthcare: &mut HealthcareState) -> &mut
         age if age <= 65 => &mut healthcare.adultcare,
         _ => &mut healthcare.eldercare,
     }
-}
+}