Merge pull request #5 from VuiMuich/main

VuiMuich · web-flow · commit 5b82b9f51249 · 2025-07-20T10:47:57.000+02:00
chore: update dependencies and fix clippy lints
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,16 +9,15 @@ readme = "README.md"
 
 [dependencies]
 anyhow = {version="1.0.69", features=["backtrace"]}
-clap = "3.2.22"
-# clap = "4.1.0"
-xdg = "2.4.1"
+clap = "4.5.41"
+xdg = "3.0.0"
 serde = { version = "1.0.152", features = ["derive", "rc"] }
-ron = "0.8.0"
+ron = "0.10.1"
 serde_json = "1.0.94"
 log = "0.4.17"
 git-version = "0.3.5"
-thiserror = "1.0.39"
+thiserror = "2.0.12"
 tui = "0.19.0"
-crossterm = "0.26.1"
+crossterm = "0.29.0"
 glob = "0.3.1"
-toml = "0.7.2"
+toml = "0.8.2"
diff --git a/src/config/check.rs b/src/config/check.rs
@@ -2,9 +2,8 @@ use crate::config;
 use crate::config::Config;
 use crate::config::{all_ids_some, all_ids_unique, get_workspace_ids};
 use anyhow::bail;
-use anyhow::{Error, Result};
+use anyhow::Result;
 use std::collections::HashSet;
-use std::process::{Command, Stdio};
 use std::{env, fs};
 
 pub fn check_config(path: Option<&str>, verbose: bool) -> Result<()> {
@@ -28,7 +27,7 @@ pub fn check_config(path: Option<&str>, verbose: bool) -> Result<()> {
             config.check_keybinds(verbose);
         }
         Err(e) => {
-            println!("Configuration failed. Reason: {:?}", e);
+            println!("Configuration failed. Reason: {e:?}");
             bail!("Configuration failed. Reason: {:?}", e);
         }
     }
@@ -106,7 +105,7 @@ impl Config {
                 {
                     returns.push((
                         Some(keybind.clone()),
-                        format!("Modifier `{}` is not valid", m),
+                        format!("Modifier `{m}` is not valid"),
                     ));
                 }
             }
@@ -154,7 +153,7 @@ fn check_elogind(verbose: bool) -> Result<()> {
     ) {
         (Ok(val), true) => {
             if verbose {
-                println!(":: XDG_RUNTIME_DIR: {}, LOGINCTL OKAY", val);
+                println!(":: XDG_RUNTIME_DIR: {val}, LOGINCTL OKAY");
             }
 
             println!("\x1b[0;92m    -> Environment OK \x1b[0m");
@@ -163,7 +162,7 @@ fn check_elogind(verbose: bool) -> Result<()> {
         }
         (Ok(val), false) => {
             if verbose {
-                println!(":: XDG_RUNTIME_DIR: {}, LOGINCTL not installed", val);
+                println!(":: XDG_RUNTIME_DIR: {val}, LOGINCTL not installed");
             }
 
             println!("\x1b[0;92m    -> Environment OK (has XDG_RUNTIME_DIR) \x1b[0m");
@@ -172,7 +171,7 @@ fn check_elogind(verbose: bool) -> Result<()> {
         }
         (Err(e), false) => {
             if verbose {
-                println!(":: XDG_RUNTIME_DIR_ERROR: {:?}, LOGINCTL BAD", e);
+                println!(":: XDG_RUNTIME_DIR_ERROR: {e:?}, LOGINCTL BAD");
             }
 
             bail!(
@@ -182,7 +181,7 @@ fn check_elogind(verbose: bool) -> Result<()> {
         }
         (Err(e), true) => {
             if verbose {
-                println!(":: XDG_RUNTIME_DIR: {:?}, LOGINCTL OKAY", e);
+                println!(":: XDG_RUNTIME_DIR: {e:?}, LOGINCTL OKAY");
             }
             println!(
                 "\x1b[1;93mWARN: Elogind/systemd installed but XDG_RUNTIME_DIR not set.\nThis may be because elogind isn't started. \x1b[0m",
@@ -196,7 +195,7 @@ fn check_elogind(verbose: bool) -> Result<()> {
 fn is_program_in_path(program: &str) -> bool {
     if let Ok(path) = env::var("PATH") {
         for p in path.split(':') {
-            let p_str = format!("{}/{}", p, program);
+            let p_str = format!("{p}/{program}");
             if fs::metadata(p_str).is_ok() {
                 return true;
             }
diff --git a/src/config/filehandler.rs b/src/config/filehandler.rs
@@ -11,7 +11,7 @@ use crate::config::Config;
 #[must_use]
 pub fn load() -> Config {
     load_from_file(None, false)
-        .map_err(|err| eprintln!("ERROR LOADING CONFIG: {:?}", err))
+        .map_err(|err| eprintln!("ERROR LOADING CONFIG: {err:?}"))
         .unwrap_or_default()
 }
 
@@ -23,12 +23,12 @@ pub fn load() -> Config {
 /// If a path is specified and does not exist, returns `LeftError`.
 pub fn load_from_file(fspath: Option<&str>, verbose: bool) -> Result<Config> {
     let config_filename = if let Some(fspath) = fspath {
-        println!("\x1b[1;35mNote: Using file {} \x1b[0m", fspath);
+        println!("\x1b[1;35mNote: Using file {fspath} \x1b[0m");
         PathBuf::from(fspath)
     } else {
-        let ron_file = BaseDirectories::with_prefix("leftwm")?
+        let ron_file = BaseDirectories::with_prefix("leftwm")
             .place_config_file(crate::CONFIG_NAME.to_string() + ".ron")?;
-        let toml_file = BaseDirectories::with_prefix("leftwm")?
+        let toml_file = BaseDirectories::with_prefix("leftwm")
             .place_config_file(crate::CONFIG_NAME.to_string() + ".toml")?;
         if Path::new(&ron_file).exists() {
             ron_file
@@ -61,9 +61,9 @@ pub fn load_from_file(fspath: Option<&str>, verbose: bool) -> Result<Config> {
 }
 
 pub fn get_config_file() -> Result<PathBuf> {
-    let ron_file = BaseDirectories::with_prefix("leftwm")?
+    let ron_file = BaseDirectories::with_prefix("leftwm")
         .place_config_file(crate::CONFIG_NAME.to_string() + ".ron")?;
-    let toml_file = BaseDirectories::with_prefix("leftwm")?
+    let toml_file = BaseDirectories::with_prefix("leftwm")
         .place_config_file(crate::CONFIG_NAME.to_string() + ".toml")?;
     if Path::new(&ron_file).exists() {
         Ok(ron_file)
@@ -82,7 +82,7 @@ pub fn get_config_file() -> Result<PathBuf> {
 
 pub fn save_to_file(config: &Config) -> Result<()> {
     write_to_file(
-        &BaseDirectories::with_prefix("leftwm")?
+        &BaseDirectories::with_prefix("leftwm")
             .place_config_file(crate::CONFIG_NAME.to_string() + ".ron")?,
         config,
     )
@@ -94,15 +94,15 @@ pub fn write_to_file(ron_file: &PathBuf, config: &Config) -> Result<(), anyhow::
         .extensions(ron::extensions::Extensions::IMPLICIT_SOME);
     let ron = ron::ser::to_string_pretty(&config, ron_pretty_conf)?;
     let comment_header = String::from(
-        r#"//  _        ___                                      ___ _
+        r"//  _        ___                                      ___ _
 // | |      / __)_                                   / __|_)
 // | | ____| |__| |_ _ _ _ ____      ____ ___  ____ | |__ _  ____    ____ ___  ____
 // | |/ _  )  __)  _) | | |    \    / ___) _ \|  _ \|  __) |/ _  |  / ___) _ \|  _ \
 // | ( (/ /| |  | |_| | | | | | |  ( (__| |_| | | | | |  | ( ( | |_| |  | |_| | | | |
 // |_|\____)_|   \___)____|_|_|_|   \____)___/|_| |_|_|  |_|\_|| (_)_|   \___/|_| |_|
 // A WindowManager for Adventurers                         (____/
 // For info about configuration please visit https://github.com/leftwm/leftwm/wiki
-"#,
+",
     );
     let ron_with_header = comment_header + &ron;
     let mut file = File::create(ron_file)?;
@@ -111,7 +111,7 @@ pub fn write_to_file(ron_file: &PathBuf, config: &Config) -> Result<(), anyhow::
 }
 
 pub fn generate_new_config() -> Result<()> {
-    let file = BaseDirectories::with_prefix("leftwm")?
+    let file = BaseDirectories::with_prefix("leftwm")
         .place_config_file(crate::CONFIG_NAME.to_string() + ".ron")?;
 
     if file.exists() {
diff --git a/src/config/keybind.rs b/src/config/keybind.rs
@@ -16,6 +16,8 @@ pub struct Keybind {
     pub key: String,
 }
 
+// TODO lift this allow by actually using those items
+#[allow(dead_code)]
 pub struct CoreKeybind {
     pub command: CoreCommand,
     pub modifier: Vec<String>,
diff --git a/src/config/layout.rs b/src/config/layout.rs
@@ -20,6 +20,8 @@ pub enum Layout {
     LeftWiderRightStack,
 }
 
+// TODO fix this by matching the layout handling to leftwm
+#[allow(dead_code)]
 pub const LAYOUTS: &[Layout] = &[
     Layout::MainAndVertStack,
     Layout::MainAndHorizontalStack,
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -81,7 +81,7 @@ fn default_terminal<'s>() -> &'s str {
 pub fn is_program_in_path(program: &str) -> bool {
     if let Ok(path) = env::var("PATH") {
         for p in path.split(':') {
-            let p_str = format!("{}/{}", p, program);
+            let p_str = format!("{p}/{program}");
             if fs::metadata(p_str).is_ok() {
                 return true;
             }
@@ -278,7 +278,7 @@ impl Default for Config {
             });
         }
 
-        let tags = vec!["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+        let tags = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
             .iter()
             .map(|s| (*s).to_string())
             .collect();
@@ -315,7 +315,7 @@ fn exit_strategy<'s>() -> &'s str {
 #[allow(dead_code)]
 #[must_use]
 pub fn check_workspace_ids(config: &Config) -> bool {
-    config.workspaces.clone().map_or(true, |wss| {
+    config.workspaces.clone().is_none_or(|wss| {
         let ids = get_workspace_ids(&wss);
         if ids.iter().any(Option::is_some) {
             all_ids_some(&ids) && all_ids_unique(&ids)
diff --git a/src/config/modifier.rs b/src/config/modifier.rs
@@ -53,7 +53,7 @@ impl std::convert::From<&str> for Modifier {
 impl std::fmt::Display for Modifier {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Single(modifier) => write!(f, "{}", modifier),
+            Self::Single(modifier) => write!(f, "{modifier}"),
             Self::List(modifiers) => write!(f, "{}", modifiers.join("+")),
         }
     }
diff --git a/src/main.rs b/src/main.rs
@@ -14,7 +14,7 @@ mod utils;
 use crate::config::check_config;
 use crate::config::filehandler::{load_from_file, write_to_file};
 use anyhow::Result;
-use clap::{App, Arg};
+use clap::{Arg, Command as ClapCmd};
 use std::path::Path;
 use std::process::Command;
 use std::{env, fs, io};
@@ -26,52 +26,52 @@ const CONFIG_NAME: &str = "test_config";
 const CONFIG_NAME: &str = "config";
 
 fn main() -> Result<()> {
-    let matches = App::new("LeftWM Command")
+    let matches = ClapCmd::new("LeftWM Command")
         .author("BlackDragon2447 <blackdragon2447@e.email>")
         .version(env!("CARGO_PKG_VERSION"))
         .about("a tool for managing your LeftWM config")
         .arg(
-            Arg::with_name("New")
+            Arg::new("New")
                 .short('n')
                 .long("new")
                 .help("Generate a new config file"),
         )
         .arg(
-            Arg::with_name("Editor")
+            Arg::new("Editor")
                 .short('e')
                 .long("editor")
                 .help("Open the current config file in the default editor (default)"),
         )
         .arg(
-            Arg::with_name("TUI")
+            Arg::new("TUI")
                 .short('t')
                 .long("tui")
                 .help("Open the current config file in the TUI"),
         )
         .arg(
-            Arg::with_name("Check")
+            Arg::new("Check")
                 .short('c')
                 .long("check")
                 .help("Check if the current config is valid"),
         )
         .arg(
-            Arg::with_name("Verbose")
+            Arg::new("Verbose")
                 .short('v')
                 .long("verbose")
                 .help("Outputs received configuration file."),
         )
         .arg(
-            Arg::with_name("Migrate")
+            Arg::new("Migrate")
                 .long("migrate")
                 .help("Migrate an old .toml config to the RON format."),
         )
         .get_matches();
 
-    let verbose = matches.occurrences_of("Verbose") >= 1;
+    let verbose = matches.get_flag("Verbose");
 
-    if matches.is_present("Migrate") {
+    if matches.get_flag("Migrate") {
         println!("\x1b[0;94m::\x1b[0m Migrating configuration . . .");
-        let path = BaseDirectories::with_prefix("leftwm")?;
+        let path = BaseDirectories::with_prefix("leftwm");
         let ron_file = path.place_config_file(crate::CONFIG_NAME.to_string() + ".ron")?;
         let toml_file = path.place_config_file(crate::CONFIG_NAME.to_string() + ".toml")?;
 
@@ -80,13 +80,13 @@ fn main() -> Result<()> {
         write_to_file(&ron_file, &config)?;
 
         return Ok(());
-    } else if matches.is_present("Editor") {
+    } else if matches.get_flag("Editor") {
         run_editor(config::filehandler::get_config_file()?.as_path())?;
-    } else if matches.is_present("TUI") {
+    } else if matches.get_flag("TUI") {
         crate::tui::run()?;
-    } else if matches.is_present("New") {
+    } else if matches.get_flag("New") {
         config::filehandler::generate_new_config()?;
-    } else if matches.is_present("Check") {
+    } else if matches.get_flag("Check") {
         check_config(None, verbose)?;
     } else {
         run_editor(config::filehandler::get_config_file()?.as_path())?;
diff --git a/src/tui/key_handler.rs b/src/tui/key_handler.rs
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
diff --git a/src/tui/popups.rs b/src/tui/popups.rs

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@ use crate::config;`
`2`	`2`	`use crate::config::Config;`
`3`	`3`	`use crate::config::{all_ids_some, all_ids_unique, get_workspace_ids};`
`4`	`4`	`use anyhow::bail;`
`5`		`-use anyhow::{Error, Result};`
	`5`	`+use anyhow::Result;`
`6`	`6`	`use std::collections::HashSet;`
`7`		`-use std::process::{Command, Stdio};`
`8`	`7`	`use std::{env, fs};`
`9`	`8`
`10`	`9`	`pub fn check_config(path: Option<&str>, verbose: bool) -> Result<()> {`
`@@ -28,7 +27,7 @@ pub fn check_config(path: Option<&str>, verbose: bool) -> Result<()> {`
`28`	`27`	`config.check_keybinds(verbose);`
`29`	`28`	`}`
`30`	`29`	`Err(e) => {`
`31`		`- println!("Configuration failed. Reason: {:?}", e);`
	`30`	`+ println!("Configuration failed. Reason: {e:?}");`
`32`	`31`	`bail!("Configuration failed. Reason: {:?}", e);`
`33`	`32`	`}`
`34`	`33`	`}`
`@@ -106,7 +105,7 @@ impl Config {`
`106`	`105`	`{`
`107`	`106`	`returns.push((`
`108`	`107`	`Some(keybind.clone()),`
`109`		- format!("Modifier `{}` is not valid", m),
	`108`	+ format!("Modifier `{m}` is not valid"),
`110`	`109`	`));`
`111`	`110`	`}`
`112`	`111`	`}`
`@@ -154,7 +153,7 @@ fn check_elogind(verbose: bool) -> Result<()> {`
`154`	`153`	`) {`
`155`	`154`	`(Ok(val), true) => {`
`156`	`155`	`if verbose {`
`157`		`- println!(":: XDG_RUNTIME_DIR: {}, LOGINCTL OKAY", val);`
	`156`	`+ println!(":: XDG_RUNTIME_DIR: {val}, LOGINCTL OKAY");`
`158`	`157`	`}`
`159`	`158`
`160`	`159`	`println!("\x1b[0;92m -> Environment OK \x1b[0m");`
`@@ -163,7 +162,7 @@ fn check_elogind(verbose: bool) -> Result<()> {`
`163`	`162`	`}`
`164`	`163`	`(Ok(val), false) => {`
`165`	`164`	`if verbose {`
`166`		`- println!(":: XDG_RUNTIME_DIR: {}, LOGINCTL not installed", val);`
	`165`	`+ println!(":: XDG_RUNTIME_DIR: {val}, LOGINCTL not installed");`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`println!("\x1b[0;92m -> Environment OK (has XDG_RUNTIME_DIR) \x1b[0m");`
`@@ -172,7 +171,7 @@ fn check_elogind(verbose: bool) -> Result<()> {`
`172`	`171`	`}`
`173`	`172`	`(Err(e), false) => {`
`174`	`173`	`if verbose {`
`175`		`- println!(":: XDG_RUNTIME_DIR_ERROR: {:?}, LOGINCTL BAD", e);`
	`174`	`+ println!(":: XDG_RUNTIME_DIR_ERROR: {e:?}, LOGINCTL BAD");`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`bail!(`
`@@ -182,7 +181,7 @@ fn check_elogind(verbose: bool) -> Result<()> {`
`182`	`181`	`}`
`183`	`182`	`(Err(e), true) => {`
`184`	`183`	`if verbose {`
`185`		`- println!(":: XDG_RUNTIME_DIR: {:?}, LOGINCTL OKAY", e);`
	`184`	`+ println!(":: XDG_RUNTIME_DIR: {e:?}, LOGINCTL OKAY");`
`186`	`185`	`}`
`187`	`186`	`println!(`
`188`	`187`	`"\x1b[1;93mWARN: Elogind/systemd installed but XDG_RUNTIME_DIR not set.\nThis may be because elogind isn't started. \x1b[0m",`
`@@ -196,7 +195,7 @@ fn check_elogind(verbose: bool) -> Result<()> {`
`196`	`195`	`fn is_program_in_path(program: &str) -> bool {`
`197`	`196`	`if let Ok(path) = env::var("PATH") {`
`198`	`197`	`for p in path.split(':') {`
`199`		`- let p_str = format!("{}/{}", p, program);`
	`198`	`+ let p_str = format!("{p}/{program}");`
`200`	`199`	`if fs::metadata(p_str).is_ok() {`
`201`	`200`	`return true;`
`202`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ pub struct Keybind {`
`16`	`16`	`pub key: String,`
`17`	`17`	`}`
`18`	`18`
	`19`	`+// TODO lift this allow by actually using those items`
	`20`	`+#[allow(dead_code)]`
`19`	`21`	`pub struct CoreKeybind {`
`20`	`22`	`pub command: CoreCommand,`
`21`	`23`	`pub modifier: Vec<String>,`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ pub enum Layout {`
`20`	`20`	`LeftWiderRightStack,`
`21`	`21`	`}`
`22`	`22`
	`23`	`+// TODO fix this by matching the layout handling to leftwm`
	`24`	`+#[allow(dead_code)]`
`23`	`25`	`pub const LAYOUTS: &[Layout] = &[`
`24`	`26`	`Layout::MainAndVertStack,`
`25`	`27`	`Layout::MainAndHorizontalStack,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ impl std::convert::From<&str> for Modifier {`
`53`	`53`	`impl std::fmt::Display for Modifier {`
`54`	`54`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`55`	`55`	`match self {`
`56`		`- Self::Single(modifier) => write!(f, "{}", modifier),`
	`56`	`+ Self::Single(modifier) => write!(f, "{modifier}"),`
`57`	`57`	`Self::List(modifiers) => write!(f, "{}", modifiers.join("+")),`
`58`	`58`	`}`
`59`	`59`	`}`