diff --git a/Cargo.lock b/Cargo.lock index 0fd1fa5..a95257b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1036,7 +1036,6 @@ dependencies = [ "mime", "rusty_paseto", "sentry-tower", - "serde", "tokio", "tokio-util", "tower-http 0.6.2", @@ -1058,7 +1057,7 @@ dependencies = [ "http 1.2.0", "mime", "serde", - "thiserror 2.0.5", + "thiserror 2.0.6", "tracing", ] @@ -1564,9 +1563,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "ff" @@ -2891,7 +2890,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls 0.23.19", "socket2", - "thiserror 2.0.5", + "thiserror 2.0.6", "tokio", "tracing", ] @@ -2910,7 +2909,7 @@ dependencies = [ "rustls 0.23.19", "rustls-pki-types", "slab", - "thiserror 2.0.5", + "thiserror 2.0.6", "tinyvec", "tracing", "web-time", @@ -4033,11 +4032,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643caef17e3128658ff44d85923ef2d28af81bb71e0d67bbfe1d76f19a73e053" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.5", + "thiserror-impl 2.0.6", ] [[package]] @@ -4053,9 +4052,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995d0bbc9995d1f19d28b7215a9352b0fc3cd3a2d2ec95c2cadc485cdedbcdde" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.nix b/Cargo.nix index 3445f98..94cd1c5 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -32,7 +32,7 @@ args@{ ignoreLockHash, }: let - nixifiedLockHash = "0c0b31dc0753cf3ae143f348e9410457d8096f15bd25e65b9bda8c1ea66f6387"; + nixifiedLockHash = "c822b568dc00dfdbaa7d828aef24eee42199dad01d1a92077495c8e3c9c99b4a"; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); lockHashIgnored = @@ -722,7 +722,7 @@ else inherit profileName; }).out; fastrand = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" { inherit profileName; }).out; hex = @@ -956,7 +956,7 @@ else inherit profileName; }).out; fastrand = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" { inherit profileName; }).out; http_02x = @@ -1065,7 +1065,7 @@ else inherit profileName; }).out; fastrand = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" { inherit profileName; }).out; hex = @@ -1724,7 +1724,7 @@ else inherit profileName; }).out; fastrand = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" { inherit profileName; }).out; h2 = @@ -3216,10 +3216,6 @@ else (rustPackages."registry+https://github.com/rust-lang/crates.io-index".sentry-tower."0.34.0" { inherit profileName; }).out; - serde = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.215" { - inherit profileName; - }).out; tokio = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.42.0" { inherit profileName; @@ -3297,7 +3293,7 @@ else inherit profileName; }).out; thiserror = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.5" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.6" { inherit profileName; }).out; tracing = @@ -4698,15 +4694,15 @@ else }; }); - "registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" = + "registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" = overridableMkRustCrate (profileName: rec { name = "fastrand"; - version = "2.2.0"; + version = "2.3.0"; registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; - sha256 = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"; + sha256 = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"; }; features = builtins.concatLists [ [ "alloc" ] @@ -8381,7 +8377,7 @@ else inherit profileName; }).out; thiserror = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.5" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.6" { inherit profileName; }).out; tokio = @@ -8443,7 +8439,7 @@ else inherit profileName; }).out; thiserror = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.5" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.6" { inherit profileName; }).out; tinyvec = @@ -11953,7 +11949,7 @@ else inherit profileName; }).out; fastrand = - (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.2.0" { + (rustPackages."registry+https://github.com/rust-lang/crates.io-index".fastrand."2.3.0" { inherit profileName; }).out; once_cell = @@ -11989,15 +11985,15 @@ else }; }); - "registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.5" = + "registry+https://github.com/rust-lang/crates.io-index".thiserror."2.0.6" = overridableMkRustCrate (profileName: rec { name = "thiserror"; - version = "2.0.5"; + version = "2.0.6"; registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; - sha256 = "643caef17e3128658ff44d85923ef2d28af81bb71e0d67bbfe1d76f19a73e053"; + sha256 = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"; }; features = builtins.concatLists [ [ "default" ] @@ -12005,7 +12001,7 @@ else ]; dependencies = { thiserror_impl = - (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror-impl."2.0.5" { + (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".thiserror-impl."2.0.6" { profileName = "__noProfile"; }).out; }; @@ -12037,15 +12033,15 @@ else }; }); - "registry+https://github.com/rust-lang/crates.io-index".thiserror-impl."2.0.5" = + "registry+https://github.com/rust-lang/crates.io-index".thiserror-impl."2.0.6" = overridableMkRustCrate (profileName: rec { name = "thiserror-impl"; - version = "2.0.5"; + version = "2.0.6"; registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; - sha256 = "995d0bbc9995d1f19d28b7215a9352b0fc3cd3a2d2ec95c2cadc485cdedbcdde"; + sha256 = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"; }; dependencies = { proc_macro2 = diff --git a/chir-rs-client/src/main.rs b/chir-rs-client/src/main.rs index 4423c30..a2ee53b 100644 --- a/chir-rs-client/src/main.rs +++ b/chir-rs-client/src/main.rs @@ -1,10 +1,5 @@ use std::{ - collections::HashSet, - future::Future, - path::{Path, PathBuf}, - pin::Pin, - sync::Arc, - time::Duration, + collections::HashSet, future::Future, path::PathBuf, pin::Pin, sync::Arc, time::Duration, }; use chir_rs_http_api::{ @@ -12,10 +7,10 @@ use chir_rs_http_api::{ errors::APIError, }; use clap::{arg, Parser, Subcommand}; -use eyre::{eyre, Context as _, OptionExt as _, Result}; -use mime_guess::{Mime, MimeGuess}; +use eyre::{eyre, Context as _, Result}; +use mime_guess::MimeGuess; use reqwest::Body; -use tokio::{join, sync::Mutex, task::JoinSet}; +use tokio::{sync::Mutex, task::JoinSet}; use tracing::{info, instrument}; #[derive(Parser, Debug)] diff --git a/chir-rs-http/Cargo.toml b/chir-rs-http/Cargo.toml index b224011..4a9b05a 100644 --- a/chir-rs-http/Cargo.toml +++ b/chir-rs-http/Cargo.toml @@ -22,9 +22,11 @@ chrono = "0.4.38" eyre = "0.6.12" futures = "0.3.31" mime = "0.3.17" -rusty_paseto = { version = "0.7.1", default-features = false, features = ["batteries_included", "v4_local"] } +rusty_paseto = { version = "0.7.1", default-features = false, features = [ + "batteries_included", + "v4_local", +] } sentry-tower = { version = "0.34.0", features = ["axum", "axum-matched-path"] } -serde = { version = "1.0.215", features = ["derive"] } tokio = { version = "1.41.1", features = ["fs", "net"] } tokio-util = { version = "0.7.13", features = ["compat"] } tower-http = { version = "0.6.2", features = ["trace"] } diff --git a/chir-rs-http/src/ca_server/mod.rs b/chir-rs-http/src/ca_server/mod.rs index 1ac9855..d484661 100644 --- a/chir-rs-http/src/ca_server/mod.rs +++ b/chir-rs-http/src/ca_server/mod.rs @@ -2,7 +2,7 @@ use axum::{ body::Body, - extract::{Query, State}, + extract::State, http::{ header::{ACCEPT, CACHE_CONTROL, CONTENT_LENGTH, CONTENT_TYPE, ETAG, IF_NONE_MATCH}, HeaderMap, Request, StatusCode, Uri, @@ -15,7 +15,6 @@ use chir_rs_misc::lexicographic_base64; use eyre::Context as _; use futures::TryStreamExt; use mime::MimeIter; -use serde::Deserialize; use tokio_util::compat::FuturesAsyncReadCompatExt as _; use tracing::{debug, error, info};