From fe077f3f8bd4f6750153dd95046454a5b653725f Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Mon, 19 Aug 2024 07:37:38 +0200 Subject: [PATCH] chore: small cleanup --- src/cmd_runner.rs | 11 +++++------ src/config.rs | 11 +++++------ src/constants.rs.in | 3 +-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/cmd_runner.rs b/src/cmd_runner.rs index b8faf6e..2b720ba 100644 --- a/src/cmd_runner.rs +++ b/src/cmd_runner.rs @@ -1,3 +1,8 @@ +use crate::{ + file_utils::get_writer, + profile::{Profile, XRServiceType}, + runner::{Runner, RunnerStatus}, +}; use nix::{ sys::signal::{ kill, @@ -5,12 +10,6 @@ use nix::{ }, unistd::Pid, }; - -use crate::{ - file_utils::get_writer, - profile::{Profile, XRServiceType}, - runner::{Runner, RunnerStatus}, -}; use std::{ collections::HashMap, io::{BufRead, BufReader, Write}, diff --git a/src/config.rs b/src/config.rs index fb91051..8806692 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,5 +1,3 @@ -use serde::{de::Error, Deserialize, Serialize}; - use crate::{ constants::CMD_NAME, device_prober::PhysicalXRDevice, @@ -11,15 +9,16 @@ use crate::{ survive::survive_profile, wivrn::wivrn_profile, wmr::wmr_profile, }, }; +use serde::{de::Error, Deserialize, Serialize}; use std::{ fs::File, io::BufReader, path::{Path, PathBuf}, }; -fn default_win_size() -> [i32; 2] { - [360, 400] -} +const DEFAULT_WIN_SIZE: [i32; 2] = [360, 400]; + +const fn default_win_size() -> [i32; 2] { DEFAULT_WIN_SIZE } #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct Config { @@ -37,7 +36,7 @@ impl Default for Config { selected_profile_uuid: "".to_string(), debug_view_enabled: false, user_profiles: vec![], - win_size: default_win_size(), + win_size: DEFAULT_WIN_SIZE, } } } diff --git a/src/constants.rs.in b/src/constants.rs.in index 0dee19e..2685f1d 100644 --- a/src/constants.rs.in +++ b/src/constants.rs.in @@ -1,5 +1,4 @@ use crate::paths::get_exec_prefix; - use std::path::PathBuf; pub const APP_NAME: &str = "@PRETTY_NAME@"; @@ -18,7 +17,7 @@ pub const BUILD_PROFILE: &str = "@PROFILE@"; pub const BUILD_DATETIME: &str = "@BUILD_DATETIME@"; pub fn get_developers() -> Vec { - vec!["Gabriele Musco ".to_string()] + vec!["Gabriele Musco ".into()] } pub fn pkg_data_dir() -> PathBuf {