Upgrade dependencies, fix clippy lints

Cargo.toml

@@ -22,21 +22,21 @@ clap = { version = "4.5.8", features = ["derive", "string"] }
 clap_complete = "4.5.37"
 clap_mangen = "0.2.24"
 criterion = { version = "0.5.1", features = ["html_reports"] }
-crossterm = "0.27.0"
-derive_more = "0.99.18"
+crossterm = "0.28.1"
+derive_more = { version = "1.0.0", features = ["as_ref", "display", "from", "into"] }
 dialoguer = "0.11.0"
 diesel = { version = "2.2.1", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
 diesel_migrations = "2.2.0"
 dirs = "5.0.1"
 elf = "0.7.4"
 indicatif = "0.17.8"
 itertools = "0.13.0"
-fs-err = { version = "2.11.0", features = ["tokio"] }
-futures = "0.3.30"
+fs-err = { version = "3.0.0", features = ["tokio"] }
+futures-util = "0.3.31"
 glob = "0.3.1"
 hex = "0.4.3"
 indextree = "4.6.1"
-libsqlite3-sys = { version = "0.28.0", features = ["bundled"] }
+libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 log = "0.4.22"
 nom = "7.1.3"
 nix = { version = "0.27.1", features = ["user", "fs", "sched", "process", "mount", "hostname", "signal", "term"] }
@@ -50,7 +50,7 @@ serde_json = "1.0.120"
 serde_yaml = "0.9.34"
 sha2 = "0.10.8"
 strum = { version = "0.26.3", features = ["derive"] }
-thiserror = "1.0.61"
+thiserror = "2.0.3"
 thread-priority = "1.1.0"
 tokio = { version = "1.38.0", features = ["full"] }
 tokio-stream = { version = "0.1.15", features = ["time"] }
@@ -61,7 +61,7 @@ varlink_generator = "10.1.0"
 xxhash-rust = { version = "0.8.11", features = ["xxh3"] }
 zstd = { version = "0.13.2", features = ["zstdmt"] }
 mailparse = "0.15.0"
-zbus = "4.4.0"
+zbus = "5.1.1"
 
 [profile.release]
 lto = "thin"

boulder/Cargo.toml

@@ -33,7 +33,7 @@ dirs.workspace = true
 elf.workspace = true
 glob.workspace = true
 fs-err.workspace = true
-futures.workspace = true
+futures-util.workspace = true
 hex.workspace = true
 itertools.workspace = true
 nix.workspace = true

boulder/src/architecture.rs

@@ -39,9 +39,9 @@ impl Architecture {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Display)]
 pub enum BuildTarget {
-    #[display(fmt = "{_0}")]
+    #[display("{_0}")]
     Native(Architecture),
-    #[display(fmt = "emul32/{_0}")]
+    #[display("emul32/{_0}")]
     Emul32(Architecture),
 }
 

boulder/src/build.rs

@@ -377,7 +377,7 @@ fn breakpoint_line(
 
     let has_key = |line: &str, key: &str| {
         line.split_once(':')
-            .map_or(false, |(leading, _)| leading.trim().ends_with(key))
+            .is_some_and(|(leading, _)| leading.trim().ends_with(key))
     };
 
     let mut lines = recipe

boulder/src/build/upstream.rs

@@ -10,7 +10,7 @@ use std::{
 };
 
 use fs_err as fs;
-use futures::{stream, StreamExt, TryStreamExt};
+use futures_util::{stream, StreamExt, TryStreamExt};
 use moss::runtime;
 use nix::unistd::{linkat, LinkatFlags};
 use sha2::{Digest, Sha256};

boulder/src/cli/recipe.rs

@@ -14,7 +14,7 @@ use boulder::{
 };
 use clap::Parser;
 use fs_err as fs;
-use futures::StreamExt;
+use futures_util::StreamExt;
 use itertools::Itertools;
 use moss::{request, runtime};
 use sha2::{Digest, Sha256};

boulder/src/draft/upstream.rs

@@ -1,7 +1,7 @@
 use std::{io, path::Path, process::ExitStatus, time::Duration};
 
 use fs_err::tokio::{self as fs, File};
-use futures::{stream, StreamExt, TryStreamExt};
+use futures_util::{stream, StreamExt, TryStreamExt};
 use moss::{environment, request, runtime};
 use sha2::{Digest, Sha256};
 use thiserror::Error;

moss/Cargo.toml

@@ -29,7 +29,7 @@ diesel_migrations.workspace = true
 itertools.workspace = true
 fnmatch = { path = "../crates/fnmatch" }
 fs-err.workspace = true
-futures.workspace = true
+futures-util.workspace = true
 hex.workspace = true
 libsqlite3-sys.workspace = true
 log.workspace = true

moss/src/client/cache.rs

@@ -12,7 +12,7 @@ use std::{
 };
 
 use fs_err::tokio::{self as fs, File};
-use futures::StreamExt;
+use futures_util::StreamExt;
 use thiserror::Error;
 use tokio::io::AsyncWriteExt;
 use url::Url;

moss/src/client/mod.rs

@@ -17,7 +17,7 @@ use std::{
 };
 
 use fs_err::{self as fs, create_dir_all};
-use futures::{stream, StreamExt, TryStreamExt};
+use futures_util::{stream, StreamExt, TryStreamExt};
 use nix::{
     errno::Errno,
     fcntl::{self, OFlag},

moss/src/dependency.rs

@@ -98,7 +98,7 @@ impl From<Kind> for payload::meta::Dependency {
 /// A Dependency in moss is simplistic in that it only contains
 /// a target and a Kind, ie. `pkgconfig(zlib)`
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Display)]
-#[display(fmt = "{kind}({name})")]
+#[display("{kind}({name})")]
 pub struct Dependency {
     /// Specific type of dependency
     pub kind: Kind,
@@ -168,7 +168,7 @@ impl TryFrom<String> for Dependency {
 
 /// A provider is the inverse of a [`Dependency`] - providing the matching requirement
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Display)]
-#[display(fmt = "{kind}({name})")]
+#[display("{kind}({name})")]
 pub struct Provider {
     /// Specific type of dependency
     pub kind: Kind,

moss/src/repository/manager.rs

@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 use std::time::Duration;
 
 use fs_err::{self as fs, File};
-use futures::{stream, StreamExt, TryStreamExt};
+use futures_util::{stream, StreamExt, TryStreamExt};
 use thiserror::Error;
 use xxhash_rust::xxh3::xxh3_64;
 

moss/src/repository/mod.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use derive_more::{Display, From, Into};
 use fs_err::tokio::File;
-use futures::StreamExt;
+use futures_util::StreamExt;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::io::{self, AsyncWriteExt};

moss/src/request.rs

@@ -6,7 +6,7 @@ use std::{io, path::PathBuf, sync::OnceLock};
 
 use bytes::Bytes;
 use fs_err::tokio::File;
-use futures::{
+use futures_util::{
     stream::{self, BoxStream},
     Stream, StreamExt,
 };

moss/src/signal.rs

@@ -30,7 +30,7 @@ pub fn ignore(signals: impl IntoIterator<Item = Signal>) -> Result<Guard, Error>
 
 // https://www.freedesktop.org/wiki/Software/systemd/inhibit/
 pub fn inhibit(what: Vec<&str>, who: String, why: String, mode: String) -> Result<message::Body, Error> {
-    let conn = zbus::blocking::ConnectionBuilder::system()?.build()?;
+    let conn = zbus::blocking::Connection::system()?;
     let msg = conn.call_method(
         Some("org.freedesktop.login1"),
         "/org/freedesktop/login1",

moss/src/varlink/com_serpentos_moss.rs

@@ -107,7 +107,7 @@
     }
 }
 pub trait VarlinkCallError: varlink::CallTrait {}
-impl<'a> VarlinkCallError for varlink::Call<'a> {}
+impl VarlinkCallError for varlink::Call<'_> {}
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Version_Reply {
     pub r#version: String,
@@ -120,7 +120,7 @@
         self.reply_struct(Version_Reply { r#version }.into())
     }
 }
-impl<'a> Call_Version for varlink::Call<'a> {}
+impl Call_Version for varlink::Call<'_> {}
 pub trait VarlinkInterface {
     fn version(&self, call: &mut dyn Call_Version) -> varlink::Result<()>;
     fn call_upgraded(&self, _call: &mut varlink::Call, _bufreader: &mut dyn BufRead) -> varlink::Result<Vec<u8>> {