cargo fmt

src/data/area_config.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize,Debug, Default)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 pub(crate) struct AreaConfig {
     #[serde(rename = "killedEnemies")]
     pub killed_enemies: Vec<String>,

src/data/mod.rs

@@ -1,17 +1,17 @@
-mod game_config;
 mod area_config;
+mod game_config;
+mod player_config;
 mod quest_config;
 mod world_config;
-mod player_config;
 
+use area_config::AreaConfig;
+use game_config::GameConfig;
+use player_config::PlayerConfig;
+use quest_config::QuestConfig;
 use std::collections::VecDeque;
 use std::error::Error;
 use std::fs;
 use std::path::Path;
-use game_config::GameConfig;
-use area_config::AreaConfig;
-use quest_config::QuestConfig;
-use player_config::PlayerConfig;
 use world_config::WorldConfig;
 
 #[derive(Debug)]
@@ -38,11 +38,15 @@ impl CoreConfig {
         // This assumes that there are never any semicolons elsewhere!
         let mut rest: VecDeque<&str> = rest_config.split(";").collect();
 
-        let player_config: PlayerConfig = serde_json::from_str(rest.pop_front().ok_or("No Player Config")?)?;
+        let player_config: PlayerConfig =
-        let world_config: WorldConfig = serde_json::from_str(rest.pop_front().ok_or("No World Config")?)?;
+            serde_json::from_str(rest.pop_front().ok_or("No Player Config")?)?;
-        let quest_config: QuestConfig = serde_json::from_str(rest.pop_front().ok_or("No Quest Config")?)?;
+        let world_config: WorldConfig =
+            serde_json::from_str(rest.pop_front().ok_or("No World Config")?)?;
+        let quest_config: QuestConfig =
+            serde_json::from_str(rest.pop_front().ok_or("No Quest Config")?)?;
 
-        let area_configs: Vec<AreaConfig> = rest.iter()
+        let area_configs: Vec<AreaConfig> = rest
+            .iter()
             .map(|s| serde_json::from_str(s))
             .filter_map(|s| s.ok())
             .collect();
@@ -63,7 +67,8 @@ impl CoreConfig {
     pub(crate) fn to_string(&self) -> Result<String, Box<dyn Error>> {
         let game_config = serde_json::to_string(&self.game_config)?;
 
-        let area_config: Vec<String> = self.area_configs
+        let area_config: Vec<String> = self
+            .area_configs
             .iter()
             .map(|a| serde_json::to_string(a))
             .filter_map(|a| a.ok())
@@ -75,12 +80,10 @@ impl CoreConfig {
             serde_json::to_string(&self.world_config)?,
             serde_json::to_string(&self.quest_config)?,
             area_config.join(";"),
-        ].join(";");
+        ]
+        .join(";");
 
-        let full_config = [
+        let full_config = [game_config, rest_config].join(SETTINGS_SPLIT);
-            game_config,
-            rest_config,
-        ].join(SETTINGS_SPLIT);
 
         Ok(full_config)
     }

src/main.rs

@@ -1,11 +1,11 @@
 mod cli;
 mod data;
 
-use std::error::Error;
+use crate::cli::Options;
 use clap::Parser;
 use eframe;
 use eframe::egui;
-use crate::cli::Options;
+use std::error::Error;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let options = Options::parse();