Merge pull request #17 from jplatte/jplatte/🧹

Upgrade dependencies, fix clippy lint

Cargo.toml

@@ -11,24 +11,24 @@ edition = "2021"
 moss = { git = "https://github.com/serpent-os/tools.git" }
 stone = { git = "https://github.com/serpent-os/tools.git" }
 
-axum = "0.7.2"
-base64 = "0.21"
+axum = "0.7.9"
+base64 = "0.22.1"
 bitflags = "2.4.1"
 bytes = "1.5"
 chrono = "0.4.30"
 color-eyre = "0.6.2"
-derive_more = "0.99.17"
+derive_more = { version = "1.0.0", features = ["display", "from", "into"] }
 flate2 = "1.0"
-futures = "0.3.30"
+futures-util = { version = "0.3.30", default-features = false }
 hex = "0.4.3"
 http = "1.0"
 http-serde = "2.0"
-itertools = "0.12.0"
-prost = "0.12.3"
+itertools = "0.13.0"
+prost = "0.13.3"
 rand = "0.8.5"
 serde_json = "1.0"
 sha2 = "0.10.8"
-thiserror = "1.0.56"
+thiserror = "2.0.3"
 tokio-stream = "0.1.14"
 tokio-util = "0.7"
 toml = "0.8.8"
@@ -40,11 +40,10 @@ ed25519-dalek = { version = "2.1.0", features = ["rand_core", "pkcs8", "pem"] }
 jsonwebtoken = { version = "9.2.0", default-features = false }
 reqwest = { version = "0.12.9", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
-sqlx = { version = "=0.8.0", features = ["sqlite", "chrono", "uuid", "runtime-tokio"] }
-strum = { version = "0.25", features = ["derive"] }
+sqlx = { version = "=0.8.2", features = ["sqlite", "chrono", "uuid", "runtime-tokio"] }
+strum = { version = "0.26.3", features = ["derive"] }
 tokio = { version = "1.35.1", features = ["full"] }
-tower = { version = "0.4.13", features = ["util"] }
-tower-http = { version = "0.5.1", features = ["fs"] }
-tracing-futures = { version = "0.2.5", features = ["futures-03"] }
+tower = { version = "0.5.1", features = ["util"] }
+tower-http = { version = "0.6.2", features = ["fs"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 uuid = { version = "1.6.1", features = ["v4"] }

crates/avalanche/Cargo.toml

@@ -9,7 +9,6 @@ service = { path = "../service" }
 clap.workspace = true
 color-eyre.workspace = true
 flate2.workspace = true
-futures.workspace = true
 hex.workspace = true
 http.workspace = true
 itertools.workspace = true

crates/service/Cargo.toml

@@ -8,13 +8,10 @@ service-core = { path = "../service-core" }
 
 axum.workspace = true
 base64.workspace = true
-bitflags.workspace = true
-bytes.workspace = true
 chrono.workspace = true
-clap.workspace = true
 derive_more.workspace = true
 ed25519-dalek.workspace = true
-futures.workspace = true
+futures-util.workspace = true
 hex.workspace = true
 http.workspace = true
 http-serde.workspace = true
@@ -30,13 +27,11 @@ sqlx.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
-tokio-stream.workspace = true
 tokio-util.workspace = true
 toml.workspace = true
 tower.workspace = true
 tower-http.workspace = true
 tracing.workspace = true
-tracing-futures.workspace = true
 tracing-subscriber.workspace = true
 url.workspace = true
 uuid.workspace = true

crates/service/src/api.rs

@@ -8,7 +8,7 @@ use axum::{
     routing::{MethodFilter, MethodRouter},
     Json, Router,
 };
-use futures::{future::BoxFuture, FutureExt};
+use futures_util::{future::BoxFuture, FutureExt};
 
 use serde::Serialize;
 use service_core::auth;

crates/service/src/api/handler.rs

@@ -1,5 +1,5 @@
 //! Define a handler for an API [`Operation`]
-use futures::Future;
+use futures_util::Future;
 use service_core::api::Operation;
 
 use super::Request;

crates/service/src/middleware/log.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use axum::body::Body;
-use futures::{future::BoxFuture, FutureExt};
+use futures_util::{future::BoxFuture, FutureExt};
 use tracing::{debug, error, info_span, Instrument};
 
 use crate::error;

crates/service/src/request.rs

@@ -1,7 +1,7 @@
 //! Download local or remote files
 use std::{io, path::Path};
 
-use futures::StreamExt;
+use futures_util::StreamExt;
 use sha2::{Digest, Sha256};
 use thiserror::Error;
 use tokio::{fs::File, io::AsyncWriteExt};

crates/service/src/server.rs

@@ -49,7 +49,7 @@ impl<'a> Server<'a> {
     }
 }
 
-impl<'a> Server<'a> {
+impl Server<'_> {
     /// Override the default graceful shutdown duration (5s)
     pub fn with_graceful_shutdown(self, duration: Duration) -> Self {
         Self {

crates/service/src/signal.rs

@@ -1,7 +1,7 @@
 //! Capture unix signals
 use std::io;
 
-use futures::{future, FutureExt};
+use futures_util::{future, FutureExt};
 use tokio::signal::unix::signal;
 pub use tokio::signal::unix::SignalKind as Kind;
 

crates/summit/Cargo.toml

@@ -8,7 +8,5 @@ service = { path = "../service" }
 
 clap.workspace = true
 color-eyre.workspace = true
-futures.workspace = true
-serde.workspace = true
 tokio.workspace = true
 tracing.workspace = true

crates/vessel/Cargo.toml

@@ -8,12 +8,11 @@ service = { path = "../service" }
 
 clap.workspace = true
 color-eyre.workspace = true
-futures.workspace = true
+futures-util.workspace = true
 hex.workspace = true
 http.workspace = true
 moss.workspace = true
 sha2.workspace = true
-serde.workspace = true
 sqlx.workspace = true
 stone.workspace = true
 strum.workspace = true

crates/vessel/src/worker.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use color_eyre::eyre::{self, eyre, Context, Result};
-use futures::{stream, StreamExt, TryStreamExt};
+use futures_util::{stream, StreamExt, TryStreamExt};
 use moss::db::meta;
 use service::{api, database, request, Endpoint};
 use sha2::{Digest, Sha256};