From 83ed703ad5113769b99f16f1ffb56a8789b4e211 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 11 Jun 2023 10:58:18 +0200 Subject: [PATCH] style: reordered some imports --- src/ui/first_run/default_paths.rs | 7 ++++--- src/ui/first_run/dependencies.rs | 1 + src/ui/first_run/download_components.rs | 1 + src/ui/first_run/finish.rs | 1 + src/ui/first_run/select_voiceovers.rs | 1 + src/ui/first_run/tos_warning.rs | 1 + src/ui/first_run/welcome.rs | 1 + src/ui/main/apply_patch.rs | 1 + src/ui/main/create_prefix.rs | 1 + src/ui/main/download_wine.rs | 1 + src/ui/main/launch.rs | 1 + src/ui/main/migrate_folder.rs | 5 +++-- src/ui/main/repair_game.rs | 5 +++-- 13 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/ui/first_run/default_paths.rs b/src/ui/first_run/default_paths.rs index dc5731f..ae3e8c1 100644 --- a/src/ui/first_run/default_paths.rs +++ b/src/ui/first_run/default_paths.rs @@ -1,15 +1,16 @@ +use std::path::PathBuf; + use relm4::prelude::*; use relm4::component::*; use adw::prelude::*; -use std::path::PathBuf; - use crate::*; use crate::i18n::*; -use super::main::*; use crate::ui::components::progress_bar::*; +use super::main::*; + pub struct DefaultPathsApp { progress_bar: AsyncController, diff --git a/src/ui/first_run/dependencies.rs b/src/ui/first_run/dependencies.rs index 8f64341..63419b5 100644 --- a/src/ui/first_run/dependencies.rs +++ b/src/ui/first_run/dependencies.rs @@ -6,6 +6,7 @@ use adw::prelude::*; use anime_launcher_sdk::is_available; use crate::i18n::*; + use super::main::FirstRunAppMsg; pub struct DependenciesApp { diff --git a/src/ui/first_run/download_components.rs b/src/ui/first_run/download_components.rs index ee70fdb..1e8c64a 100644 --- a/src/ui/first_run/download_components.rs +++ b/src/ui/first_run/download_components.rs @@ -15,6 +15,7 @@ use anime_launcher_sdk::config::ConfigExt; use anime_launcher_sdk::genshin::config::Config; use super::main::FirstRunAppMsg; + use crate::ui::components::*; use crate::i18n::*; use crate::*; diff --git a/src/ui/first_run/finish.rs b/src/ui/first_run/finish.rs index 96662e4..b59cee6 100644 --- a/src/ui/first_run/finish.rs +++ b/src/ui/first_run/finish.rs @@ -4,6 +4,7 @@ use relm4::component::*; use adw::prelude::*; use crate::i18n::*; + use super::main::*; pub struct FinishApp; diff --git a/src/ui/first_run/select_voiceovers.rs b/src/ui/first_run/select_voiceovers.rs index 397e90a..53a5a5c 100644 --- a/src/ui/first_run/select_voiceovers.rs +++ b/src/ui/first_run/select_voiceovers.rs @@ -7,6 +7,7 @@ use anime_launcher_sdk::config::ConfigExt; use anime_launcher_sdk::genshin::config::Config; use crate::i18n::*; + use super::main::*; pub struct SelectVoiceoversApp { diff --git a/src/ui/first_run/tos_warning.rs b/src/ui/first_run/tos_warning.rs index 364632b..e9fe030 100644 --- a/src/ui/first_run/tos_warning.rs +++ b/src/ui/first_run/tos_warning.rs @@ -6,6 +6,7 @@ use adw::prelude::*; use anime_launcher_sdk::is_available; use crate::i18n::*; + use super::main::FirstRunAppMsg; use super::main::MAIN_WINDOW; diff --git a/src/ui/first_run/welcome.rs b/src/ui/first_run/welcome.rs index abbba8b..9feb986 100644 --- a/src/ui/first_run/welcome.rs +++ b/src/ui/first_run/welcome.rs @@ -4,6 +4,7 @@ use relm4::component::*; use adw::prelude::*; use crate::i18n::*; + use super::main::FirstRunAppMsg; pub struct WelcomeApp; diff --git a/src/ui/main/apply_patch.rs b/src/ui/main/apply_patch.rs index 0a5a9da..17515aa 100644 --- a/src/ui/main/apply_patch.rs +++ b/src/ui/main/apply_patch.rs @@ -2,6 +2,7 @@ use relm4::prelude::*; use crate::*; use crate::i18n::*; + use super::{App, AppMsg}; pub fn apply_patch(sender: ComponentSender, patch: T) { diff --git a/src/ui/main/create_prefix.rs b/src/ui/main/create_prefix.rs index ebe3d3a..20773a0 100644 --- a/src/ui/main/create_prefix.rs +++ b/src/ui/main/create_prefix.rs @@ -6,6 +6,7 @@ use anime_launcher_sdk::config::ConfigExt; use anime_launcher_sdk::genshin::config::Config; use crate::i18n::*; + use super::{App, AppMsg}; pub fn create_prefix(sender: ComponentSender) { diff --git a/src/ui/main/download_wine.rs b/src/ui/main/download_wine.rs index c70308f..a7acda8 100644 --- a/src/ui/main/download_wine.rs +++ b/src/ui/main/download_wine.rs @@ -10,6 +10,7 @@ use anime_launcher_sdk::components::wine; use crate::*; use crate::i18n::*; use crate::ui::components::*; + use super::{App, AppMsg}; pub fn download_wine(sender: ComponentSender, progress_bar_input: Sender) { diff --git a/src/ui/main/launch.rs b/src/ui/main/launch.rs index 481bead..9db2c6e 100644 --- a/src/ui/main/launch.rs +++ b/src/ui/main/launch.rs @@ -1,6 +1,7 @@ use relm4::prelude::*; use crate::i18n::*; + use super::{App, AppMsg}; pub fn launch(sender: ComponentSender) { diff --git a/src/ui/main/migrate_folder.rs b/src/ui/main/migrate_folder.rs index 74d6b61..97616c7 100644 --- a/src/ui/main/migrate_folder.rs +++ b/src/ui/main/migrate_folder.rs @@ -1,8 +1,9 @@ -use relm4::prelude::*; - use std::path::PathBuf; +use relm4::prelude::*; + use crate::*; + use super::{App, AppMsg}; pub fn migrate_folder(sender: ComponentSender, from: PathBuf, to: PathBuf, cleanup_folder: Option) { diff --git a/src/ui/main/repair_game.rs b/src/ui/main/repair_game.rs index 1b4b7cc..ce33d17 100644 --- a/src/ui/main/repair_game.rs +++ b/src/ui/main/repair_game.rs @@ -1,3 +1,5 @@ +use std::path::Path; + use relm4::{ prelude::*, Sender @@ -5,11 +7,10 @@ use relm4::{ use gtk::glib::clone; -use std::path::Path; - use crate::*; use crate::i18n::*; use crate::ui::components::*; + use super::{App, AppMsg}; #[allow(unused_must_use)]