diff --git a/src/depcheck.rs b/src/depcheck.rs index 62524b7..e94646d 100644 --- a/src/depcheck.rs +++ b/src/depcheck.rs @@ -1,6 +1,5 @@ -use std::{collections::HashMap, env, fmt::Display, path::Path}; - use crate::linux_distro::LinuxDistro; +use std::{collections::HashMap, env, fmt::Display, path::Path}; #[derive(Debug, Clone, PartialEq, Eq)] pub enum DepType { diff --git a/src/device_prober.rs b/src/device_prober.rs index a611f89..d77c64b 100644 --- a/src/device_prober.rs +++ b/src/device_prober.rs @@ -1,9 +1,8 @@ -use std::fmt::Display; - use crate::{ profile::Profile, profiles::{lighthouse::lighthouse_profile, wivrn::wivrn_profile, wmr::wmr_profile}, }; +use std::fmt::Display; #[derive(Debug, PartialEq, Eq)] pub enum PhysicalXRDevice { diff --git a/src/file_builders/monado_config_v0.rs b/src/file_builders/monado_config_v0.rs index 7e68982..5418f21 100644 --- a/src/file_builders/monado_config_v0.rs +++ b/src/file_builders/monado_config_v0.rs @@ -1,11 +1,9 @@ -use std::slice::Iter; - -use serde::{Deserialize, Serialize}; - use crate::{ file_utils::{deserialize_file, get_writer}, paths::get_xdg_config_dir, }; +use serde::{Deserialize, Serialize}; +use std::slice::Iter; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub enum XrtInputName { diff --git a/src/func_runner.rs b/src/func_runner.rs index 1397e74..b736c98 100644 --- a/src/func_runner.rs +++ b/src/func_runner.rs @@ -1,10 +1,9 @@ +use crate::runner::{Runner, RunnerStatus}; use std::{ mem, thread::{self, JoinHandle}, }; -use crate::runner::{Runner, RunnerStatus}; - #[derive(Debug, Clone, Default)] pub struct FuncRunnerOut { pub success: bool, diff --git a/src/linux_distro.rs b/src/linux_distro.rs index b112cc1..09d762e 100644 --- a/src/linux_distro.rs +++ b/src/linux_distro.rs @@ -1,6 +1,5 @@ -use std::io::Read; - use crate::file_utils::get_reader; +use std::io::Read; #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)] pub enum LinuxDistro { diff --git a/src/ui/alert.rs b/src/ui/alert.rs index c81b711..108b864 100644 --- a/src/ui/alert.rs +++ b/src/ui/alert.rs @@ -1,7 +1,4 @@ -use gtk::{ - prelude::IsA, - traits::{GtkApplicationExt, GtkWindowExt}, -}; +use gtk::traits::{GtkApplicationExt, GtkWindowExt}; use relm4::{adw::traits::MessageDialogExt, prelude::*}; fn alert_base(title: &str, msg: Option<&str>, parent: Option<>k::Window>) -> adw::MessageDialog { diff --git a/src/ui/debug_view.rs b/src/ui/debug_view.rs index 88b707c..ca925d8 100644 --- a/src/ui/debug_view.rs +++ b/src/ui/debug_view.rs @@ -1,3 +1,4 @@ +use super::term_widget::TermWidget; use crate::log_level::LogLevel; use crate::log_parser::MonadoLog; use crate::ui::app::{DebugOpenDataAction, DebugOpenPrefixAction}; @@ -8,8 +9,6 @@ use relm4::prelude::*; use relm4::{ComponentSender, SimpleComponent}; use zoha_vte4::TerminalExt; -use super::term_widget::TermWidget; - #[derive(Debug)] pub enum SearchDirection { Forward, diff --git a/src/ui/factories/device_row_factory.rs b/src/ui/factories/device_row_factory.rs index 59ed072..ba62888 100644 --- a/src/ui/factories/device_row_factory.rs +++ b/src/ui/factories/device_row_factory.rs @@ -1,10 +1,9 @@ -use adw::prelude::*; -use relm4::{factory::AsyncFactoryComponent, prelude::*, AsyncFactorySender}; - use crate::{ ui::devices_box::DevicesBoxMsg, xr_devices::{XRDevice, XRDeviceRole}, }; +use adw::prelude::*; +use relm4::{factory::AsyncFactoryComponent, prelude::*, AsyncFactorySender}; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum DeviceRowState { diff --git a/src/ui/install_wivrn_box.rs b/src/ui/install_wivrn_box.rs index ba36b73..0cb1789 100644 --- a/src/ui/install_wivrn_box.rs +++ b/src/ui/install_wivrn_box.rs @@ -1,3 +1,4 @@ +use super::alert::alert; use crate::{ adb::get_adb_install_runner, cmd_runner::CmdRunner, @@ -16,8 +17,6 @@ use relm4::{ }; use std::thread::JoinHandle; -use super::alert::alert; - #[derive(PartialEq, Eq, Debug, Clone)] pub enum InstallWivrnStatus { Success, diff --git a/src/ui/job_worker/internal_worker.rs b/src/ui/job_worker/internal_worker.rs index a04e533..3426a4c 100644 --- a/src/ui/job_worker/internal_worker.rs +++ b/src/ui/job_worker/internal_worker.rs @@ -1,9 +1,8 @@ -use crate::profile::{LighthouseDriver, Profile}; - use super::{ job::{CmdWorkerData, FuncWorkerOut, WorkerJob}, state::JobWorkerState, }; +use crate::profile::{LighthouseDriver, Profile}; use nix::unistd::Pid; use relm4::{prelude::*, Worker}; use std::{ diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 2f49e2b..99b0464 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,20 +1,20 @@ -pub mod about_dialog; -pub mod alert; +mod about_dialog; +mod alert; pub mod app; -pub mod build_window; -pub mod debug_view; -pub mod devices_box; -pub mod factories; -pub mod fbt_config_editor; -pub mod install_wivrn_box; +mod build_window; +mod debug_view; +mod devices_box; +mod factories; +mod fbt_config_editor; +mod install_wivrn_box; pub mod job_worker; -pub mod libsurvive_setup_window; -pub mod macros; -pub mod main_view; -pub mod preference_rows; -pub mod profile_editor; -pub mod steam_launch_options_box; +mod libsurvive_setup_window; +mod macros; +mod main_view; +mod preference_rows; +mod profile_editor; +mod steam_launch_options_box; mod steamvr_calibration_box; -pub mod term_widget; -pub mod util; -pub mod wivrn_conf_editor; +mod term_widget; +mod util; +mod wivrn_conf_editor; diff --git a/src/ui/steamvr_calibration_box.rs b/src/ui/steamvr_calibration_box.rs index 21061b7..54da588 100644 --- a/src/ui/steamvr_calibration_box.rs +++ b/src/ui/steamvr_calibration_box.rs @@ -1,21 +1,19 @@ -use std::{ - collections::{HashMap, VecDeque}, - path::Path, - thread::sleep, - time::Duration, -}; - -use crate::paths::get_steamvr_bin_dir_path; - use super::job_worker::{ internal_worker::JobWorkerOut, job::{FuncWorkerOut, WorkerJob}, JobWorker, }; +use crate::paths::get_steamvr_bin_dir_path; use relm4::{ gtk::{self, prelude::*}, ComponentParts, ComponentSender, RelmWidgetExt, SimpleComponent, }; +use std::{ + collections::{HashMap, VecDeque}, + path::Path, + thread::sleep, + time::Duration, +}; #[tracker::track] pub struct SteamVrCalibrationBox {