Merge pull request #616 from Nukesor/2024-edition

chore: Update to 2024 edition

Author: Nukesor

Cargo.lock

@@ -1,28 +1,28 @@
 # The following is the shared configuration for both pueue and its lib
 [workspace]
 members = ["pueue", "pueue_lib"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 authors = ["Arne Beer <contact@arne.beer>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/nukesor/pueue"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/nukesor/pueue"
-rust-version = "1.70"
+rust-version = "1.85"
 
 [workspace.dependencies]
 better-panic = "0.3"
 chrono = { version = "0.4", features = ["serde"] }
 color-eyre = "0.6.3"
 command-group = "5"
-handlebars = "5.1"
+handlebars = "6.3"
 pretty_assertions = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snap = "1.1"
-strum = { version = "0.26", features = ["derive"] }
+strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1.43", features = ["io-std", "rt-multi-thread", "time"] }
 tracing = "0.1.41"
 

Cargo.toml

@@ -16,21 +16,21 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 chrono.workspace = true
-clap = { version = "4.4.18", features = [
+clap = { version = "4.5.30", features = [
     "cargo",
     "derive",
     "help",
     "wrap_help",
 ] }
-clap_complete = "4.4.10"
-clap_complete_nushell = "4.4.2"
+clap_complete = "4.5.45"
+clap_complete_nushell = "4.5.5"
 color-eyre.workspace = true
 comfy-table = "7"
 command-group.workspace = true
 ctrlc = { version = "3", features = ["termination"] }
 flate2 = "1"
 handlebars.workspace = true
-interim = { version = "0.1.2", features = ["chrono"] }
+interim = { version = "0.2.0", features = ["chrono_0_4"] }
 pest = "2.7"
 pest_derive = "2.7"
 pueue-lib = { version = "0.28.1", path = "../pueue_lib", features = ["client"] }
@@ -68,7 +68,7 @@ procfs = { version = "0.17", default-features = false }
 
 # Linux + Mac OS
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-libproc = "0.14.8"
+libproc = "0.14.10"
 
 # Windows
 # We don't need any of the default features for crossterm.
@@ -86,11 +86,11 @@ winapi = { version = "0.3", features = [
     "processthreadsapi",
     "tlhelp32",
 ] }
-windows = { version = "0.58.0", features = [
+windows = { version = "0.59.0", features = [
     "Win32_Security",
     "Win32_System_Environment",
     "Win32_System_RemoteDesktop",
     "Win32_System_SystemServices",
     "Win32_System_Threading",
 ] }
-windows-service = "0.7.0"
+windows-service = "0.8.0"

pueue/Cargo.toml

@@ -1,13 +1,13 @@
 use std::{
-    io::{stdout, IsTerminal},
+    io::{IsTerminal, stdout},
     path::PathBuf,
 };
 
 use clap::{CommandFactory, Parser};
 use clap_complete::{generate, generate_to, shells};
 use color_eyre::{
-    eyre::{bail, WrapErr},
     Result,
+    eyre::{WrapErr, bail},
 };
 use pueue::client::{
     cli::{CliArguments, ColorChoice, Shell, SubCommand},

pueue/src/bin/pueue.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use chrono::{prelude::*, TimeDelta};
+use chrono::{TimeDelta, prelude::*};
 use clap::{ArgAction, Parser, ValueEnum, ValueHint};
 use interim::*;
 use pueue_lib::network::message::Signal;

pueue/src/client/cli.rs

@@ -7,10 +7,10 @@ use std::{
 
 use chrono::{DateTime, Local};
 use pueue_lib::{
+    Request, Response,
     client::Client,
     format::format_datetime,
     network::message::{AddMessage, AddedTaskMessage},
-    Request, Response,
 };
 
 use super::{follow as follow_cmd, group_or_default, handle_response};

pueue/src/client/commands/add.rs

@@ -1,7 +1,7 @@
 use std::{
     collections::BTreeMap,
     env,
-    fs::{create_dir, read_to_string, File},
+    fs::{File, create_dir, read_to_string},
     io::Write,
     path::{Path, PathBuf},
 };

pueue/src/client/commands/edit.rs

@@ -4,10 +4,10 @@ use std::{
 };
 
 use pueue_lib::{
+    Response,
     client::Client,
     log::{get_log_file_handle, get_log_path, seek_to_last_lines},
     network::message::StreamRequestMessage,
-    Response,
 };
 use tokio::time::sleep;
 

pueue/src/client/commands/follow.rs

@@ -7,7 +7,7 @@ use pueue_lib::{
     task::{Task, TaskResult, TaskStatus},
 };
 
-use super::{handle_response, selection_from_params, OutputStyle};
+use super::{OutputStyle, handle_response, selection_from_params};
 use crate::internal_prelude::*;
 
 mod json;

pueue/src/client/commands/log/mod.rs

@@ -5,12 +5,12 @@
 //! daemon, open some files on the filesystem, edit files and so on.
 //! All commands that cannot be simply handled by handling requests or using `pueue_lib`.
 
-use std::io::{stdin, stdout, Write};
+use std::io::{Write, stdin, stdout};
 
 use pueue_lib::{
     client::Client,
     network::message::{Request, Response, TaskSelection},
-    state::{State, PUEUE_DEFAULT_GROUP},
+    state::{PUEUE_DEFAULT_GROUP, State},
     task::Task,
 };
 
@@ -58,8 +58,8 @@ use start::start;
 use stash::stash;
 use state::state;
 use switch::switch;
-use wait::wait;
 pub use wait::WaitTargetStatus;
+use wait::wait;
 
 use super::{
     cli::SubCommand,