feat: update to edition 2024, fix deprecated warnings (#299)

kemingy · web-flow · commit ab4f10ceac40 · 2025-12-26T19:55:28.000+08:00
* feat: update to edition 2024, fix deprecated warnings

Signed-off-by: Keming &lt;kemingy94@gmail.com&gt;

* fix lint

Signed-off-by: Keming &lt;kemingy94@gmail.com&gt;

---------

Signed-off-by: Keming &lt;kemingy94@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/commands/Cargo.toml b/commands/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "horust-commands-lib"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["Federico Ponzi <me@fponzi.me>"]
 description = "A complete supervisor and init system, designed for running in containers."
 license = "MIT"
@@ -11,7 +11,7 @@ readme = "README.md"
 keywords = ["init", "container", "supervisor"]
 categories = ["command-line-utilities"]
 include = ["src/**/*", "Cargo.*", "../LICENSE.txt", "README.md"]
-rust-version = "1.74.1"
+rust-version = "1.85.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/commands/src/client.rs b/commands/src/client.rs
@@ -1,11 +1,11 @@
 use crate::proto::messages::horust_msg_message::MessageType;
 use crate::proto::messages::{
-    horust_msg_request, horust_msg_response, HorustMsgMessage, HorustMsgRequest,
-    HorustMsgServiceStatusRequest,
+    HorustMsgMessage, HorustMsgRequest, HorustMsgServiceStatusRequest, horust_msg_request,
+    horust_msg_response,
 };
 use crate::{HorustMsgServiceStatus, UdsConnectionHandler};
-use anyhow::{anyhow, Context};
-use anyhow::{bail, Result};
+use anyhow::{Context, anyhow};
+use anyhow::{Result, bail};
 use log::{debug, info};
 use std::net::Shutdown;
 use std::os::unix::net::UnixStream;
diff --git a/commands/src/server.rs b/commands/src/server.rs
@@ -1,10 +1,10 @@
+use crate::UdsConnectionHandler;
 use crate::proto::messages::horust_msg_message::MessageType::Request;
 use crate::proto::messages::{
-    horust_msg_message, horust_msg_request, horust_msg_response, HorustMsgError, HorustMsgMessage,
-    HorustMsgRequest, HorustMsgResponse, HorustMsgServiceStatus, HorustMsgServiceStatusResponse,
+    HorustMsgError, HorustMsgMessage, HorustMsgRequest, HorustMsgResponse, HorustMsgServiceStatus,
+    HorustMsgServiceStatusResponse, horust_msg_message, horust_msg_request, horust_msg_response,
 };
-use crate::UdsConnectionHandler;
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use log::{error, info};
 use std::io::ErrorKind;
 use std::os::unix::net::UnixListener;
diff --git a/horust/Cargo.toml b/horust/Cargo.toml
@@ -3,15 +3,15 @@ name = "horust"
 version = "0.1.11"
 authors = ["Federico Ponzi <me@fponzi.me>"]
 description = "A complete supervisor and init system, designed for running in containers."
-edition = "2021"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/FedericoPonzi/horust"
 homepage = "https://github.com/FedericoPonzi/horust"
 readme = "../README.md"
 keywords = ["init", "container", "supervisor"]
 categories = ["command-line-utilities"]
 include = ["src/**/*", "Cargo.*", "LICENSE.txt", "example_services/**/*"]
-rust-version = "1.74.1"
+rust-version = "1.85.1"
 
 [dependencies]
 clap = { version = "~4.5", features = ["derive"] }
diff --git a/horust/src/horust/bus.rs b/horust/src/horust/bus.rs
@@ -11,7 +11,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crossbeam::channel::{unbounded, Receiver, Sender};
+use crossbeam::channel::{Receiver, Sender, unbounded};
 
 /// Bus state shared between `Bus` and all `BusConnector` instances.
 /// It contains all necessary components to send data and join the bus.
diff --git a/horust/src/horust/commands_handler.rs b/horust/src/horust/commands_handler.rs
@@ -1,7 +1,7 @@
+use crate::horust::Event;
 use crate::horust::bus::BusConnector;
 use crate::horust::formats::{ServiceName, ServiceStatus};
-use crate::horust::Event;
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use horust_commands_lib::{CommandsHandlerTrait, HorustMsgServiceStatus};
 use std::collections::HashMap;
 use std::os::unix::net::UnixListener;
diff --git a/horust/src/horust/formats/service.rs b/horust/src/horust/formats/service.rs
@@ -660,7 +660,7 @@ impl ResourceLimit {
     #[cfg(target_os = "linux")]
     pub(crate) fn apply(&self, name: &str, pid: unistd::Pid) -> anyhow::Result<()> {
         use libcgroups::common::{
-            create_cgroup_manager, CgroupConfig, CgroupManager, ControllerOpt, DEFAULT_CGROUP_ROOT,
+            CgroupConfig, CgroupManager, ControllerOpt, DEFAULT_CGROUP_ROOT, create_cgroup_manager,
         };
         use oci_spec::runtime::{
             LinuxCpuBuilder, LinuxMemoryBuilder, LinuxPidsBuilder, LinuxResources,
@@ -770,8 +770,8 @@ mod test {
 
     use crate::horust::formats::ResourceLimit;
     use crate::horust::formats::{
-        validate, Environment, Failure, FailureStrategy, Healthiness, Restart, RestartStrategy,
-        Service, Termination, TerminationSignal::TERM,
+        Environment, Failure, FailureStrategy, Healthiness, Restart, RestartStrategy, Service,
+        Termination, TerminationSignal::TERM, validate,
     };
     use crate::horust::get_sample_service;
 
diff --git a/horust/src/horust/healthcheck/mod.rs b/horust/src/horust/healthcheck/mod.rs
@@ -5,7 +5,7 @@ use std::thread;
 use std::thread::JoinHandle;
 use std::time::Duration;
 
-use crossbeam::channel::{unbounded, Receiver, RecvTimeoutError, Sender};
+use crossbeam::channel::{Receiver, RecvTimeoutError, Sender, unbounded};
 
 use checks::*;
 
diff --git a/horust/src/horust/mod.rs b/horust/src/horust/mod.rs
@@ -6,14 +6,14 @@ use std::path::{Path, PathBuf};
 use anyhow::Result;
 use bus::BusConnector;
 #[cfg(target_os = "linux")]
-use libc::{prctl, PR_SET_CHILD_SUBREAPER};
+use libc::{PR_SET_CHILD_SUBREAPER, prctl};
 
 pub use formats::Event;
 
 use crate::horust::bus::Bus;
-use crate::horust::formats::{validate, Service};
+use crate::horust::formats::{Service, validate};
 
-pub use self::formats::{get_sample_service, ExitStatus, HorustConfig};
+pub use self::formats::{ExitStatus, HorustConfig, get_sample_service};
 
 pub mod bus;
 mod commands_handler;
diff --git a/horust/src/horust/supervisor/process_spawner.rs b/horust/src/horust/supervisor/process_spawner.rs
@@ -1,9 +1,9 @@
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use crossbeam::channel::{after, tick};
 use nix::errno::Errno;
 use nix::fcntl;
 use nix::unistd;
-use nix::unistd::{fork, ForkResult, Pid, Uid};
+use nix::unistd::{ForkResult, Pid, Uid, fork};
 use std::ffi::{CStr, CString};
 use std::os::unix::io::AsRawFd;
 use std::path::{Path, PathBuf};
diff --git a/horust/src/horust/supervisor/reaper.rs b/horust/src/horust/supervisor/reaper.rs
@@ -3,11 +3,11 @@
 //! collect its exit status. This module will make sure to reap also zombie processes and not only
 //! child services.
 
-use nix::sys::wait::{waitpid, WaitPidFlag, WaitStatus};
+use nix::sys::wait::{WaitPidFlag, WaitStatus, waitpid};
 use nix::unistd::Pid;
 
-use crate::horust::supervisor::repo::Repo;
 use crate::horust::Event;
+use crate::horust::supervisor::repo::Repo;
 
 /// Reaps up to `max_iterations` dead processes
 ///
diff --git a/horust/src/horust/supervisor/repo.rs b/horust/src/horust/supervisor/repo.rs
@@ -2,10 +2,10 @@ use std::collections::HashMap;
 
 use nix::unistd::Pid;
 
+use crate::horust::Event;
 use crate::horust::bus::BusConnector;
 use crate::horust::formats::{Service, ServiceName};
 use crate::horust::supervisor::service_handler::ServiceHandler;
-use crate::horust::Event;
 
 #[derive(Debug)]
 pub(crate) struct Repo {
diff --git a/horust/src/horust/supervisor/service_handler.rs b/horust/src/horust/supervisor/service_handler.rs
@@ -2,11 +2,11 @@ use std::time::Instant;
 
 use nix::unistd::Pid;
 
+use crate::horust::Event;
 use crate::horust::formats::{
     FailureStrategy, HealthinessStatus, RestartStrategy, Service, ServiceName, ServiceStatus,
 };
 use crate::horust::supervisor::repo::Repo;
-use crate::horust::Event;
 
 use super::{LifecycleStatus, ShuttingDown};
 
@@ -362,11 +362,11 @@ mod test {
 
     use nix::unistd::Pid;
 
+    use crate::horust::Event;
     use crate::horust::formats::{FailureStrategy, Service, ServiceStatus, ShuttingDown};
     use crate::horust::supervisor::service_handler::{
-        handle_failed_service, handle_restart_strategy, should_force_kill, ServiceHandler,
+        ServiceHandler, handle_failed_service, handle_restart_strategy, should_force_kill,
     };
-    use crate::horust::Event;
 
     #[test]
     fn test_handle_restart_strategy() {
diff --git a/horust/src/horust/supervisor/signal_handling.rs b/horust/src/horust/supervisor/signal_handling.rs
@@ -1,4 +1,4 @@
-use nix::sys::signal::{sigaction, SaFlags, SigAction, SigHandler, SigSet, SIGINT, SIGTERM};
+use nix::sys::signal::{SIGINT, SIGTERM, SaFlags, SigAction, SigHandler, SigSet, sigaction};
 
 use crate::horust::signal_safe::panic_ssafe;
 
diff --git a/horust/src/lib.rs b/horust/src/lib.rs
@@ -5,6 +5,6 @@ extern crate log;
 #[macro_use]
 extern crate maplit;
 
-pub use crate::horust::{get_sample_service, Horust};
+pub use crate::horust::{Horust, get_sample_service};
 
 pub mod horust;
diff --git a/horust/src/main.rs b/horust/src/main.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 use anyhow::{Context, Result};
 use clap::Parser;
-use horust::horust::{ExitStatus, HorustConfig};
 use horust::Horust;
+use horust::horust::{ExitStatus, HorustConfig};
 use log::{error, info};
 use nix::unistd::getpid;
 
diff --git a/horust/tests/horust.rs b/horust/tests/horust.rs
@@ -1,7 +1,7 @@
 use assert_cmd::prelude::*;
 use predicates::str::contains;
-use rand::distr::Alphanumeric;
 use rand::Rng;
+use rand::distr::Alphanumeric;
 use std::time::Duration;
 
 #[allow(dead_code)]
diff --git a/horust/tests/section_general.rs b/horust/tests/section_general.rs
@@ -3,7 +3,7 @@ use predicates::str::{contains, is_empty};
 use tempfile::TempDir;
 
 mod utils;
-use nix::sys::signal::{kill, Signal};
+use nix::sys::signal::{Signal, kill};
 use std::thread::sleep;
 use std::time::Duration;
 use utils::*;
@@ -95,10 +95,12 @@ sync
     assert!(last_output.exists());
 
     // it is effectively the last output
-    assert!(temp_dir
-        .path()
-        .join(format!("out.log.{}", num_logs))
-        .exists());
+    assert!(
+        temp_dir
+            .path()
+            .join(format!("out.log.{}", num_logs))
+            .exists()
+    );
 
     let content = std::fs::read_to_string(&last_output).unwrap();
     let last_file_first_number = total_iterations - (patterns_per_file);
@@ -149,7 +151,7 @@ pwd"#;
     store_service_script(temp_dir.path(), script, None, Some("a"));
     cmd.assert()
         .success()
-        .stdout(contains(&temp_dir.path().display().to_string()));
+        .stdout(contains(temp_dir.path().display().to_string()));
 }
 
 #[test]
diff --git a/horust/tests/section_healthiness.rs b/horust/tests/section_healthiness.rs
@@ -58,8 +58,8 @@ http-endpoint = "{}""#,
         handle_requests(listener, sl_receiver).unwrap();
         sender.send(()).expect("Chan closed");
     });
-    let mut cmd = cmd.args(vec!["--unsuccessful-exit-finished-failed"]);
-    run_async(&mut cmd, true).recv_or_kill(Duration::from_secs(15));
+    let cmd = cmd.args(vec!["--unsuccessful-exit-finished-failed"]);
+    run_async(cmd, true).recv_or_kill(Duration::from_secs(15));
     stop_listener.send(()).unwrap();
     receiver
         .recv_timeout(Duration::from_millis(3000))
@@ -86,7 +86,7 @@ file-path = "{}""#,
     exit 0;
     "#;
     store_service_script(tempdir.path(), script, Some(service.as_str()), None);
-    let mut cmd = cmd.args(vec!["--unsuccessful-exit-finished-failed"]);
-    run_async(&mut cmd, true).recv_or_kill(Duration::from_secs(70));
+    let cmd = cmd.args(vec!["--unsuccessful-exit-finished-failed"]);
+    run_async(cmd, true).recv_or_kill(Duration::from_secs(70));
     Ok(())
 }
diff --git a/horust/tests/section_restart.rs b/horust/tests/section_restart.rs
@@ -4,8 +4,8 @@ use assert_cmd::cmd::Command;
 #[cfg(target_os = "linux")]
 use libc::SIGPOLL;
 use libc::{
-    c_int, SIGABRT, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGKILL, SIGPIPE, SIGPROF, SIGQUIT,
-    SIGSEGV, SIGSYS, SIGTERM, SIGTRAP, SIGUSR1, SIGUSR2, SIGVTALRM, SIGXCPU, SIGXFSZ,
+    SIGABRT, SIGBUS, SIGFPE, SIGHUP, SIGILL, SIGINT, SIGKILL, SIGPIPE, SIGPROF, SIGQUIT, SIGSEGV,
+    SIGSYS, SIGTERM, SIGTRAP, SIGUSR1, SIGUSR2, SIGVTALRM, SIGXCPU, SIGXFSZ, c_int,
 };
 use predicates::prelude::predicate;
 use utils::*;
@@ -132,7 +132,7 @@ fn test_restart_always_killed_by_signals() -> Result<(), std::io::Error> {
         SIGSEGV, SIGSYS, SIGTERM, SIGTRAP, SIGUSR1, SIGUSR2, SIGVTALRM, SIGXCPU, SIGXFSZ,
     ];
     for sig in DEFAULT_TERMINATE {
-        test_restart_always_signal(sig as i32)?;
+        test_restart_always_signal(sig)?;
     }
     Ok(())
 }
diff --git a/horust/tests/section_termination.rs b/horust/tests/section_termination.rs
@@ -1,4 +1,4 @@
-use nix::sys::signal::{kill, Signal};
+use nix::sys::signal::{Signal, kill};
 use std::time::Duration;
 
 pub mod utils;
diff --git a/horust/tests/utils/mod.rs b/horust/tests/utils/mod.rs
@@ -1,8 +1,12 @@
-use assert_cmd::prelude::*;
-use nix::sys::signal::{kill, Signal};
+#[expect(
+    deprecated,
+    reason = "false alert: https://github.com/rust-lang/rust/issues/148426"
+)]
+use assert_cmd::cargo::cargo_bin;
+use nix::sys::signal::{Signal, kill};
 use nix::unistd::Pid;
-use rand::distr::Alphanumeric;
 use rand::Rng;
+use rand::distr::Alphanumeric;
 use std::path::Path;
 use std::process::Command;
 use std::sync::mpsc;
@@ -58,7 +62,7 @@ pub fn store_service_script(
 pub fn get_cli_multiple() -> (Command, TempDir, TempDir) {
     let temp_dir = TempDir::with_prefix("horust").unwrap();
     let temp_dir_2 = TempDir::with_prefix("horust_2").unwrap();
-    let mut cmd = Command::cargo_bin("horust").unwrap();
+    let mut cmd = Command::new(cargo_bin!("horust"));
     cmd.current_dir(&temp_dir).args(vec![
         "--uds-folder-path",
         temp_dir.path().display().to_string().as_str(),
@@ -73,7 +77,7 @@ pub fn get_cli_multiple() -> (Command, TempDir, TempDir) {
 
 pub fn get_cli() -> (Command, TempDir) {
     let temp_dir = TempDir::with_prefix("horust").expect("Tmp dir");
-    let mut cmd = Command::cargo_bin("horust").expect("Cargo bin");
+    let mut cmd = Command::new(cargo_bin!("horust"));
     cmd.current_dir(&temp_dir).args(vec![
         "--uds-folder-path",
         temp_dir.path().display().to_string().as_str(),
diff --git a/horustctl/Cargo.toml b/horustctl/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "horustctl"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["Federico Ponzi <me@fponzi.me>"]
-rust-version = "1.74.1"
+rust-version = "1.85.1"
 
 [dependencies]
 anyhow = "~1.0"
@@ -14,6 +14,7 @@ horust-commands-lib = { version = "0.1.0" }
 
 [dev-dependencies]
 assert_cmd = "~2.1"
+escargot = "0.5.15"
 predicates = "~3.1"
 rand = "~0.9"
 tempfile = "~3"
diff --git a/horustctl/src/main.rs b/horustctl/src/main.rs
@@ -1,7 +1,7 @@
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use clap::{Args, Parser, Subcommand};
 use env_logger::Env;
-use horust_commands_lib::{get_path, ClientHandler};
+use horust_commands_lib::{ClientHandler, get_path};
 use log::debug;
 use std::fs::read_dir;
 use std::os::unix::fs::FileTypeExt;
@@ -87,7 +87,9 @@ fn get_uds_path(pid: Option<i32>, sockets_folder_path: PathBuf) -> Result<PathBu
                 .next()
                 .ok_or_else(|| anyhow!("No socket found in {sockets_folder_path:?}"))?;
             if readdir_iter.count() > 0 {
-                bail!("There is more than one socket in {sockets_folder_path:?}.Please use --pid to specify the pid of the horust process you want to talk to.");
+                bail!(
+                    "There is more than one socket in {sockets_folder_path:?}.Please use --pid to specify the pid of the horust process you want to talk to."
+                );
             }
             sockets_folder_path.join(ret)
         }
diff --git a/horustctl/tests/cli.rs b/horustctl/tests/cli.rs
