From 17f2b05940f1b791800ca78fde6de15e8a9c8589 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 02:39:14 +0000 Subject: [PATCH] Format Rust code using rustfmt --- src/common/menu.rs | 11 ++++------- src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/common/menu.rs b/src/common/menu.rs index 17c76fa..8c9dfea 100644 --- a/src/common/menu.rs +++ b/src/common/menu.rs @@ -11,7 +11,7 @@ use skyline_web::{Background, WebSession, Webpage}; use smash::lib::lua_const::*; use std::fs; use std::path::Path; -use training_mod_consts::{TrainingModpackMenu, MenuJsonStruct}; +use training_mod_consts::{MenuJsonStruct, TrainingModpackMenu}; use training_mod_tui::Color; static mut FRAME_COUNTER_INDEX: usize = 0; @@ -93,7 +93,7 @@ pub unsafe fn set_menu_from_json(message: &str) { DEFAULTS_MENU = message_json.defaults_menu; std::fs::write( MENU_CONF_PATH, - serde_json::to_string_pretty(&message_json).unwrap() + serde_json::to_string_pretty(&message_json).unwrap(), ) .expect("Failed to write menu conf file"); } else if let Ok(message_json) = serde_json::from_str::(message) { @@ -105,11 +105,8 @@ pub unsafe fn set_menu_from_json(message: &str) { menu: MENU, defaults_menu: DEFAULTS_MENU, }; - std::fs::write( - MENU_CONF_PATH, - serde_json::to_string_pretty(&conf).unwrap() - ) - .expect("Failed to write menu conf file"); + std::fs::write(MENU_CONF_PATH, serde_json::to_string_pretty(&conf).unwrap()) + .expect("Failed to write menu conf file"); } else { skyline::error::show_error( 0x70, diff --git a/src/lib.rs b/src/lib.rs index 601e1e2..ebf7066 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,7 +28,7 @@ use std::fs; use crate::menu::{quick_menu_loop, web_session_loop}; use owo_colors::OwoColorize; -use training_mod_consts::{OnOff, MenuJsonStruct}; +use training_mod_consts::{MenuJsonStruct, OnOff}; fn nro_main(nro: &NroInfo<'_>) { if nro.module.isLoaded {