Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
aumetra committed Sep 23, 2024
1 parent dedd014 commit 99742c0
Show file tree
Hide file tree
Showing 29 changed files with 213 additions and 259 deletions.
388 changes: 173 additions & 215 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ askama = { version = "0.12.1", default-features = false, features = [
"with-axum",
] }
async-fn-stream = "0.2.2"
clap = { version = "4.5.17", features = ["derive", "wrap_help"] }
clap = { version = "4.5.18", features = ["derive", "wrap_help"] }
diesel = { version = "2.2.4", default-features = false, features = [
"32-column-tables",
"with-deprecated",
Expand Down Expand Up @@ -111,7 +111,7 @@ garde = { version = "0.20.0", features = [
iso8601-timestamp = "0.3.0-rc.1"
itertools = { version = "0.13.0", default-features = false }
moka = { version = "=0.12.7", features = ["sync"] }
simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
sonic-rs = "0.3.13"
tokio = "=1.38.1"
triomphe = { version = "0.1.13", default-features = false, features = [
Expand Down Expand Up @@ -218,10 +218,6 @@ install-updater = true
install-path = "CARGO_HOME"

[patch.crates-io]
# TCP nodelay for `axum::serve` and cloning improvements
axum = { git = "https://github.com/tokio-rs/axum.git", rev = "918170a12bfcc488000998f33684c29f5599d0d6" }
axum-core = { git = "https://github.com/tokio-rs/axum.git", rev = "918170a12bfcc488000998f33684c29f5599d0d6" }

# Fix proptests by fixing a olpc-cjson bug
olpc-cjson = { git = "https://github.com/aumetra/aws-tough.git", rev = "3b46feaeaf8048d46f85d023295e65563b84d7d6" }

Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ serde = { version = "1.0.210", features = ["derive"] }
sonic-rs = { workspace = true }
speedy-uuid = { workspace = true, features = ["diesel"] }
tokio = { workspace = true, features = ["rt"] }
tokio-postgres = "0.7.11"
tokio-postgres = "0.7.12"
tokio-postgres-rustls = "0.12.0"
tracing = "0.1.40"
tracing-log = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
axum-core = "0.4.3"
axum-core = "0.4.4"
eyre = "0.6.12"
garde = { workspace = true }
http = "1.1.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license.workspace = true

[dependencies]
async-fn-stream = { workspace = true }
bytes = "1.7.1"
bytes = "1.7.2"
futures-util = { version = "0.3.30", default-features = false, features = [
"alloc",
] }
Expand Down Expand Up @@ -35,7 +35,7 @@ serde = "1.0.210"
simdutf8 = { workspace = true }
sonic-rs = { workspace = true }
tower = { version = "0.5.1", features = ["util"] }
tower-http = { version = "0.5.2", features = [
tower-http = { version = "0.6.0", features = [
# Explicitly exclude `zstd`
# It's not widely adopted and takes a long time to build
"decompression-br",
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-oidc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ kitsune-derive = { workspace = true }
kitsune-error = { workspace = true }
kitsune-http-client = { workspace = true }
moka = { workspace = true }
oauth2 = { version = "5.0.0-alpha.4", default-features = false }
openidconnect = { version = "4.0.0-alpha.2", default-features = false, features = [
oauth2 = { version = "5.0.0-rc.1", default-features = false }
openidconnect = { version = "4.0.0-rc.1", default-features = false, features = [
# Accept these two, per specification invalid, cases to increase compatibility
"accept-rfc3339-timestamps",
"accept-string-booleans",
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-s3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ version.workspace = true
license.workspace = true

[dependencies]
bytes = "1.7.1"
bytes = "1.7.2"
futures-util = { version = "0.3.30", default-features = false }
http = "1.1.0"
kitsune-error = { workspace = true }
kitsune-http-client = { workspace = true }
quick-xml = { version = "0.36.1", features = ["serialize"] }
quick-xml = { version = "0.36.2", features = ["serialize"] }
rusty-s3 = "0.5.0"
serde = { version = "1.0.210", features = ["derive"] }
typed-builder = "0.20.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-search/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license.workspace = true

[dependencies]
async-trait = "0.1.82"
bytes = "1.7.1"
bytes = "1.7.2"
diesel = { workspace = true }
diesel-async = { workspace = true }
diesel_full_text_search = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ argon2 = "0.5.3"
async-fn-stream = { workspace = true }
athena = { workspace = true }
blowocking = { workspace = true }
bytes = "1.7.1"
bytes = "1.7.2"
derive_builder = "0.20.1"
diesel = { workspace = true }
diesel-async = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true

[dependencies]
bytes = "1.7.1"
bytes = "1.7.2"
derive_more = { version = "1.0.0", features = ["from"] }
futures-util = "0.3.30"
kitsune-error = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
bytes = "1.7.1"
bytes = "1.7.2"
diesel-async = { workspace = true }
fred = { workspace = true }
futures-util = "0.3.30"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-wasm-mrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ tokio = { workspace = true, features = ["fs"] }
tracing = "0.1.40"
triomphe = { workspace = true }
walkdir = "2.5.0"
wasmtime = { version = "24.0.0", default-features = false, features = [
wasmtime = { version = "25.0.0", default-features = false, features = [
"addr2line",
"async",
"component-model",
Expand All @@ -38,7 +38,7 @@ wasmtime = { version = "24.0.0", default-features = false, features = [
"pooling-allocator",
"runtime",
] }
wasmtime-wasi = { version = "24.0.0", default-features = false }
wasmtime-wasi = { version = "25.0.0", default-features = false }

[dev-dependencies]
tempfile = "3.12.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-wasm-mrf/src/kv_storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ impl keyvalue::HostBucket for crate::ctx::Context {
}
}

fn drop(&mut self, rep: Resource<keyvalue::Bucket>) -> wasmtime::Result<()> {
async fn drop(&mut self, rep: Resource<keyvalue::Bucket>) -> wasmtime::Result<()> {
self.kv_ctx.buckets.remove(rep.rep() as usize);
Ok(())
}
}

#[async_trait]
impl keyvalue::HostError for crate::ctx::Context {
fn drop(&mut self, _rep: Resource<keyvalue::Error>) -> wasmtime::Result<()> {
async fn drop(&mut self, _rep: Resource<keyvalue::Error>) -> wasmtime::Result<()> {
Ok(())
}
}
Expand Down
8 changes: 4 additions & 4 deletions kitsune/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ argon2 = { version = "0.5.3", features = ["std"] }
askama = { workspace = true }
askama_axum = "0.4.0"
async-trait = "0.1.82"
axum = { version = "0.7.5", features = ["macros", "multipart"] }
axum-extra = { version = "0.9.3", features = [
axum = { version = "0.7.6", features = ["macros", "multipart"] }
axum-extra = { version = "0.9.4", features = [
"cookie",
"cookie-signed",
"query",
"typed-header",
] }
axum-flash = "0.8.0"
blowocking = { workspace = true }
bytes = "1.7.1"
bytes = "1.7.2"
chrono = { version = "0.4.38", default-features = false }
clap = { workspace = true }
color-eyre = "0.6.3"
Expand Down Expand Up @@ -88,7 +88,7 @@ tokio-util = { version = "0.7.12", features = ["io"] }
tower = { version = "0.5.1", features = ["util"] }
tower-stop-using-brave = { workspace = true }
tower-x-clacks-overhead = { workspace = true }
tower-http = { version = "0.5.2", features = [
tower-http = { version = "0.6.0", features = [
"catch-panic",
"cors",
"fs",
Expand Down
2 changes: 1 addition & 1 deletion lib/athena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { version = "1.0.210", features = ["derive"] }
smol_str = "0.3.1"
sonic-rs = { workspace = true, optional = true }
speedy-uuid = { workspace = true, features = ["redis"] }
thiserror = "1.0.63"
thiserror = "1.0.64"
tokio = { workspace = true, features = ["macros", "rt", "sync"] }
tokio-util = { version = "0.7.12", features = ["rt"] }
tracing = "0.1.40"
Expand Down
2 changes: 1 addition & 1 deletion lib/blowocking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
rayon = "1.10.0"
thiserror = "1.0.63"
thiserror = "1.0.64"
tokio = { workspace = true, features = ["sync"] }
tracing = "0.1.40"

Expand Down
2 changes: 1 addition & 1 deletion lib/cursiv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ zeroize = { version = "1.8.1", features = ["derive"] }

# `axum` feature
async-trait = { version = "0.1.82", optional = true }
axum-core = { version = "0.4.3", optional = true }
axum-core = { version = "0.4.4", optional = true }

[dev-dependencies]
futures-test = "0.3.30"
Expand Down
2 changes: 1 addition & 1 deletion lib/geomjeungja/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ hickory-resolver = "0.24.1"
rand = "0.8.5"
serde = { version = "1.0.210", features = ["derive"] }
simdutf8 = { workspace = true }
thiserror = "1.0.63"
thiserror = "1.0.64"
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.20.0"
Expand Down
4 changes: 2 additions & 2 deletions lib/http-signatures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ derive_builder = "0.20.1"
http = "1.1.0"
httpdate = "1.0.3"
itertools = { workspace = true }
logos = "0.14.1"
logos = "0.14.2"
miette = "7.2.0"
pkcs8 = { version = "0.10.2", features = ["pem", "std"] }
ring = { version = "0.17.8", features = ["std"] }
scoped-futures = { version = "0.1.3", default-features = false }
thiserror = "1.0.63"
thiserror = "1.0.64"
tick-tock-mock = { workspace = true }
tracing = { version = "0.1.40", default-features = false, optional = true }

Expand Down
2 changes: 1 addition & 1 deletion lib/mrf-manifest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ schemars = { version = "0.8.21", features = ["impl_json_schema", "semver"] }
semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0.210", features = ["derive"] }
sonic-rs = { workspace = true, optional = true }
thiserror = { version = "1.0.63", optional = true }
thiserror = { version = "1.0.64", optional = true }
wasm-encoder = { version = "0.217.0", optional = true }
wasmparser = { version = "0.217.0", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion lib/post-process/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "simple"
harness = false

[dependencies]
logos = "0.14.1"
logos = "0.14.2"

[dev-dependencies]
divan = "0.1.14"
Expand Down
2 changes: 1 addition & 1 deletion lib/speedy-uuid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ diesel = { version = "2.2.4", default-features = false, features = [
], optional = true }
fred = { version = "9.2.1", default-features = false, optional = true }
serde = { version = "1.0.210", optional = true }
thiserror = "1.0.63"
thiserror = "1.0.64"
uuid = { version = "1.10.0", features = ["fast-rng", "v7"] }
uuid-simd = { version = "0.8.0", features = ["uuid"] }

Expand Down
4 changes: 2 additions & 2 deletions lib/tower-http-digest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
base64-simd = "0.8.0"
bytes = "1.7.1"
bytes = "1.7.2"
either = { version = "1.13.0", default-features = false }
http = "1.1.0"
http-body = "1.0.1"
Expand All @@ -20,7 +20,7 @@ tower-service = "0.3.3"
tracing = { version = "0.1.40", default-features = false }

[dev-dependencies]
bytes = "1.7.1"
bytes = "1.7.2"
futures-test = "0.3.30"
http-body-util = "0.1.2"
tower = { version = "0.5.1", default-features = false, features = ["util"] }
Expand Down
2 changes: 1 addition & 1 deletion xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ license.workspace = true
publish = false

[dependencies]
anyhow = "1.0.89"
argh = "0.1.12"
eyre = "0.6.12"
sonic-rs = { workspace = true }
tracing = { version = "0.1.40", default-features = false }
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/clean.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::util::cargo;

pub fn clean() -> anyhow::Result<()> {
pub fn clean() -> eyre::Result<()> {
cargo(["clean"])?;
cargo(["clean", "--target-dir", "target-analyzer"])?;

Expand Down
2 changes: 1 addition & 1 deletion xtask/src/download_ap_fixture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fn compute_filename(url: &str) -> String {
filename
}

pub fn download(url: &str) -> anyhow::Result<()> {
pub fn download(url: &str) -> eyre::Result<()> {
let response = ureq::get(url)
.set("Accept", "application/activity+json")
.call()?;
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct Command {
subcommand: Subcommand,
}

fn main() -> anyhow::Result<()> {
fn main() -> eyre::Result<()> {
tracing_subscriber::fmt::init();

let command: Command = argh::from_env();
Expand Down
4 changes: 2 additions & 2 deletions xtask/src/util.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::ensure;
use eyre::ensure;
use std::{env, ffi::OsStr, io, process::Command};

pub fn cargo<I>(params: I) -> anyhow::Result<()>
pub fn cargo<I>(params: I) -> eyre::Result<()>
where
I: IntoIterator,
I::Item: AsRef<OsStr>,
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/watch.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub fn watch(config: &str, bin: &str) -> anyhow::Result<()> {
pub fn watch(config: &str, bin: &str) -> eyre::Result<()> {
let run_cmd = format!("cargo run -p {bin} -- -c {config}");

crate::util::cargo(["watch", "-x", "check", "-s", &run_cmd])
Expand Down

0 comments on commit 99742c0

Please sign in to comment.