darkkirb/chir.rs
1
0
Fork 0
Code Issues 1 Pull requests 8 Projects Releases Packages Wiki Activity

fix warnings

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2024-12-08 19:46:15 +01:00
parent ab7b5524cf
commit 5026fce52c
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
5 changed files with 38 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cargo.lock generated
View file

@ -1036,7 +1036,6 @@ dependencies = [
"mime", "mime",
"rusty_paseto", "rusty_paseto",
"sentry-tower", "sentry-tower",
"serde",
"tokio", "tokio",
"tokio-util", "tokio-util",
"tower-http 0.6.2", "tower-http 0.6.2",
@ -1058,7 +1057,7 @@ dependencies = [
"http 1.2.0", "http 1.2.0",
"mime", "mime",
"serde", "serde",
"thiserror 2.0.5", "thiserror 2.0.6",
"tracing", "tracing",
] ]
@ -1564,9 +1563,9 @@ dependencies = [
[[package]] [[package]]
name = "fastrand" name = "fastrand"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]] [[package]]
name = "ff" name = "ff"
@ -2891,7 +2890,7 @@ dependencies = [
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustls 0.23.19", "rustls 0.23.19",
"socket2", "socket2",
"thiserror 2.0.5", "thiserror 2.0.6",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -2910,7 +2909,7 @@ dependencies = [
"rustls 0.23.19", "rustls 0.23.19",
"rustls-pki-types", "rustls-pki-types",
"slab", "slab",
"thiserror 2.0.5", "thiserror 2.0.6",
"tinyvec", "tinyvec",
"tracing", "tracing",
"web-time", "web-time",
@ -4033,11 +4032,11 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "2.0.5" version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "643caef17e3128658ff44d85923ef2d28af81bb71e0d67bbfe1d76f19a73e053" checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
dependencies = [ dependencies = [
"thiserror-impl 2.0.5", "thiserror-impl 2.0.6",
] ]
[[package]] [[package]]
@ -4053,9 +4052,9 @@ dependencies = [
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "2.0.5" version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "995d0bbc9995d1f19d28b7215a9352b0fc3cd3a2d2ec95c2cadc485cdedbcdde" checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

42
Cargo.nix
View file

@ -32,7 +32,7 @@ args@{
ignoreLockHash, ignoreLockHash,
}: }:
let let
nixifiedLockHash = "0c0b31dc0753cf3ae143f348e9410457d8096f15bd25e65b9bda8c1ea66f6387"; nixifiedLockHash = "c822b568dc00dfdbaa7d828aef24eee42199dad01d1a92077495c8e3c9c99b4a";
workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc;
currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock);
lockHashIgnored = lockHashIgnored =
@ -722,7 +722,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
fastrand = 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; inherit profileName;
}).out; }).out;
hex = hex =
@ -956,7 +956,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
fastrand = 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; inherit profileName;
}).out; }).out;
http_02x = http_02x =
@ -1065,7 +1065,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
fastrand = 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; inherit profileName;
}).out; }).out;
hex = hex =
@ -1724,7 +1724,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
fastrand = 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; inherit profileName;
}).out; }).out;
h2 = h2 =
@ -3216,10 +3216,6 @@ else
(rustPackages."registry+https://github.com/rust-lang/crates.io-index".sentry-tower."0.34.0" { (rustPackages."registry+https://github.com/rust-lang/crates.io-index".sentry-tower."0.34.0" {
inherit profileName; inherit profileName;
}).out; }).out;
serde =
(rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.215" {
inherit profileName;
}).out;
tokio = tokio =
(rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.42.0" { (rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.42.0" {
inherit profileName; inherit profileName;
@ -3297,7 +3293,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
thiserror = 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; inherit profileName;
}).out; }).out;
tracing = 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 overridableMkRustCrate
(profileName: rec { (profileName: rec {
name = "fastrand"; name = "fastrand";
version = "2.2.0"; version = "2.3.0";
registry = "registry+https://github.com/rust-lang/crates.io-index"; registry = "registry+https://github.com/rust-lang/crates.io-index";
src = fetchCratesIo { src = fetchCratesIo {
inherit name version; inherit name version;
sha256 = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"; sha256 = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be";
}; };
features = builtins.concatLists [ features = builtins.concatLists [
[ "alloc" ] [ "alloc" ]
@ -8381,7 +8377,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
thiserror = 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; inherit profileName;
}).out; }).out;
tokio = tokio =
@ -8443,7 +8439,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
thiserror = 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; inherit profileName;
}).out; }).out;
tinyvec = tinyvec =
@ -11953,7 +11949,7 @@ else
inherit profileName; inherit profileName;
}).out; }).out;
fastrand = 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; inherit profileName;
}).out; }).out;
once_cell = 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 overridableMkRustCrate
(profileName: rec { (profileName: rec {
name = "thiserror"; name = "thiserror";
version = "2.0.5"; version = "2.0.6";
registry = "registry+https://github.com/rust-lang/crates.io-index"; registry = "registry+https://github.com/rust-lang/crates.io-index";
src = fetchCratesIo { src = fetchCratesIo {
inherit name version; inherit name version;
sha256 = "643caef17e3128658ff44d85923ef2d28af81bb71e0d67bbfe1d76f19a73e053"; sha256 = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47";
}; };
features = builtins.concatLists [ features = builtins.concatLists [
[ "default" ] [ "default" ]
@ -12005,7 +12001,7 @@ else
]; ];
dependencies = { dependencies = {
thiserror_impl = 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"; profileName = "__noProfile";
}).out; }).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 overridableMkRustCrate
(profileName: rec { (profileName: rec {
name = "thiserror-impl"; name = "thiserror-impl";
version = "2.0.5"; version = "2.0.6";
registry = "registry+https://github.com/rust-lang/crates.io-index"; registry = "registry+https://github.com/rust-lang/crates.io-index";
src = fetchCratesIo { src = fetchCratesIo {
inherit name version; inherit name version;
sha256 = "995d0bbc9995d1f19d28b7215a9352b0fc3cd3a2d2ec95c2cadc485cdedbcdde"; sha256 = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312";
}; };
dependencies = { dependencies = {
proc_macro2 = proc_macro2 =

13
chir-rs-client/src/main.rs
View file

@ -1,10 +1,5 @@
use std::{ use std::{
collections::HashSet, collections::HashSet, future::Future, path::PathBuf, pin::Pin, sync::Arc, time::Duration,
future::Future,
path::{Path, PathBuf},
pin::Pin,
sync::Arc,
time::Duration,
}; };
use chir_rs_http_api::{ use chir_rs_http_api::{
@ -12,10 +7,10 @@ use chir_rs_http_api::{
errors::APIError, errors::APIError,
}; };
use clap::{arg, Parser, Subcommand}; use clap::{arg, Parser, Subcommand};
use eyre::{eyre, Context as _, OptionExt as _, Result}; use eyre::{eyre, Context as _, Result};
use mime_guess::{Mime, MimeGuess}; use mime_guess::MimeGuess;
use reqwest::Body; use reqwest::Body;
use tokio::{join, sync::Mutex, task::JoinSet}; use tokio::{sync::Mutex, task::JoinSet};
use tracing::{info, instrument}; use tracing::{info, instrument};
#[derive(Parser, Debug)] #[derive(Parser, Debug)]

6
chir-rs-http/Cargo.toml
View file

@ -22,9 +22,11 @@ chrono = "0.4.38"
eyre = "0.6.12" eyre = "0.6.12"
futures = "0.3.31" futures = "0.3.31"
mime = "0.3.17" 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"] } 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 = { version = "1.41.1", features = ["fs", "net"] }
tokio-util = { version = "0.7.13", features = ["compat"] } tokio-util = { version = "0.7.13", features = ["compat"] }
tower-http = { version = "0.6.2", features = ["trace"] } tower-http = { version = "0.6.2", features = ["trace"] }

3
chir-rs-http/src/ca_server/mod.rs
View file

@ -2,7 +2,7 @@
use axum::{ use axum::{
body::Body, body::Body,
extract::{Query, State}, extract::State,
http::{ http::{
header::{ACCEPT, CACHE_CONTROL, CONTENT_LENGTH, CONTENT_TYPE, ETAG, IF_NONE_MATCH}, header::{ACCEPT, CACHE_CONTROL, CONTENT_LENGTH, CONTENT_TYPE, ETAG, IF_NONE_MATCH},
HeaderMap, Request, StatusCode, Uri, HeaderMap, Request, StatusCode, Uri,
@ -15,7 +15,6 @@ use chir_rs_misc::lexicographic_base64;
use eyre::Context as _; use eyre::Context as _;
use futures::TryStreamExt; use futures::TryStreamExt;
use mime::MimeIter; use mime::MimeIter;
use serde::Deserialize;
use tokio_util::compat::FuturesAsyncReadCompatExt as _; use tokio_util::compat::FuturesAsyncReadCompatExt as _;
use tracing::{debug, error, info}; use tracing::{debug, error, info};