Format Rust code using rustfmt

src/common/button_config.rs

@@ -61,7 +61,8 @@ struct TopLevelBtnComboConfig {
 }
 
 pub fn validate_config(data: &str) -> bool {
-    let conf: TopLevelBtnComboConfig = toml::from_str(data).expect("Custom button config has invalid schema");
+    let conf: TopLevelBtnComboConfig =
+        toml::from_str(data).expect("Custom button config has invalid schema");
     let conf = conf.button_config;
     let configs = [conf.open_menu, conf.save_state, conf.load_state];
     let bad_keys = configs

src/common/menu.rs

@@ -1,7 +1,7 @@
 use crate::common::*;
 use crate::events::{Event, EVENT_QUEUE};
-use crate::training::frame_counter;
 use crate::logging::*;
+use crate::training::frame_counter;
 
 use ramhorns::Template;
 use skyline::info::get_program_id;
@@ -347,10 +347,7 @@ static mut WEB_MENU_ACTIVE: bool = false;
 unsafe fn spawn_web_session(session: WebSession) {
     info!("Opening menu session...");
     let loaded_msg = session.recv();
-    info!(
+    info!("Received loaded message from web: {}", &loaded_msg);
-        "Received loaded message from web: {}",
-        &loaded_msg
-    );
     let message_send = MenuJsonStruct {
         menu: MENU,
         defaults_menu: DEFAULTS_MENU,

src/common/release.rs

@@ -1,6 +1,6 @@
+use crate::logging::*;
 use skyline_web::DialogOk;
 use std::fs;
-use crate::logging::*;
 
 pub const CURRENT_VERSION: &str = env!("CARGO_PKG_VERSION");
 const VERSION_FILE_PATH: &str = "sd:/TrainingModpack/version.txt";
@@ -45,9 +45,12 @@ pub fn version_check() {
                 )
             );
             // Remove old menu selections, silently ignoring errors (i.e. if the file doesn't exist)
-            fs::remove_file("sd:/TrainingModpack/training_modpack_menu.conf").unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu.conf"));
+            fs::remove_file("sd:/TrainingModpack/training_modpack_menu.conf")
-            fs::remove_file("sd:/TrainingModpack/training_modpack_menu.json").unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu.json"));
+                .unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu.conf"));
-            fs::remove_file("sd:/TrainingModpack/training_modpack_menu_defaults.conf").unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu_defaults.conf"));
+            fs::remove_file("sd:/TrainingModpack/training_modpack_menu.json")
+                .unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu.json"));
+            fs::remove_file("sd:/TrainingModpack/training_modpack_menu_defaults.conf")
+                .unwrap_or_else(|_| error!("Couldn't remove training_modpack_menu_defaults.conf"));
             record_current_version(VERSION_FILE_PATH);
         }
         VersionCheck::NoFile => {

src/lib.rs

@@ -21,9 +21,9 @@ mod hazard_manager;
 mod hitbox_visualizer;
 mod training;
 
+mod logging;
 #[cfg(test)]
 mod test;
-mod logging;
 
 use crate::common::*;
 use crate::events::{Event, EVENT_QUEUE};
@@ -32,11 +32,11 @@ use skyline::libc::mkdir;
 use skyline::nro::{self, NroInfo};
 use std::fs;
 
+use crate::logging::*;
 use crate::menu::quick_menu_loop;
 #[cfg(feature = "web_session_preload")]
 use crate::menu::web_session_loop;
 use training_mod_consts::{MenuJsonStruct, OnOff};
-use crate::logging::*;
 
 fn nro_main(nro: &NroInfo<'_>) {
     if nro.module.isLoaded {
@@ -108,7 +108,8 @@ pub fn main() {
     let menu_conf_path = "sd:/TrainingModpack/training_modpack_menu.json";
     info!("Checking for previous menu in training_modpack_menu.json...");
     if fs::metadata(menu_conf_path).is_ok() {
-        let menu_conf = fs::read_to_string(menu_conf_path).expect(&format!("Could not remove {}", menu_conf_path));
+        let menu_conf = fs::read_to_string(menu_conf_path)
+            .expect(&format!("Could not remove {}", menu_conf_path));
         if let Ok(menu_conf_json) = serde_json::from_str::<MenuJsonStruct>(&menu_conf) {
             unsafe {
                 MENU = menu_conf_json.menu;
@@ -117,7 +118,10 @@ pub fn main() {
             }
         } else {
             warn!("Previous menu found but is invalid. Deleting...");
-            fs::remove_file(menu_conf_path).expect(&format!("{} has invalid schema but could not be deleted!", menu_conf_path));
+            fs::remove_file(menu_conf_path).expect(&format!(
+                "{} has invalid schema but could not be deleted!",
+                menu_conf_path
+            ));
         }
     } else {
         info!("No previous menu file found.");
@@ -127,7 +131,8 @@ pub fn main() {
     info!("Checking for previous button combo settings in training_modpack.toml...");
     if fs::metadata(combo_path).is_ok() {
         info!("Previous button combo settings found. Loading...");
-        let combo_conf = fs::read_to_string(combo_path).expect(&format!("Could not read {}", combo_path));
+        let combo_conf =
+            fs::read_to_string(combo_path).expect(&format!("Could not read {}", combo_path));
         if button_config::validate_config(&combo_conf) {
             button_config::save_all_btn_config_from_toml(&combo_conf);
         } else {
@@ -159,7 +164,11 @@ pub fn main() {
                 );
 
                 let url = format!("{host}{path}");
-                minreq::post(url).with_json(&event).expect("Failed to send info to firebase").send().ok();
+                minreq::post(url)
+                    .with_json(&event)
+                    .expect("Failed to send info to firebase")
+                    .send()
+                    .ok();
             }
         }
     });

src/training/mod.rs

@@ -2,8 +2,8 @@ use crate::common::{
     is_training_mode, menu, FIGHTER_MANAGER_ADDR, ITEM_MANAGER_ADDR, STAGE_MANAGER_ADDR,
 };
 use crate::hitbox_visualizer;
-use crate::training::character_specific::items;
 use crate::logging::*;
+use crate::training::character_specific::items;
 use skyline::hooks::{getRegionAddress, InlineCtx, Region};
 use skyline::nn::hid::*;
 use skyline::nn::ro::LookupSymbol;