From a0e181ce9437e8b49da3a4c7de8ac3de3bbc1ef3 Mon Sep 17 00:00:00 2001 From: aumetra Date: Fri, 23 Aug 2024 23:43:42 +0200 Subject: [PATCH 1/3] Dependency cleanup --- Cargo.lock | 26 +++++++++---------- Cargo.toml | 2 +- crates/kitsune-derive/impl/Cargo.toml | 2 +- lib/fast-cjson/Cargo.toml | 2 +- lib/fast-cjson/tests/test.rs | 10 +++---- lib/geomjeungja/Cargo.toml | 2 +- .../examples/simple_txt_verification.rs | 5 ++-- lib/just-retry/src/lib.rs | 8 ++---- lib/mrf-tool/Cargo.toml | 4 +-- lib/mrf-tool/src/lib.rs | 2 +- lib/mrf-tool/tests/manifest.rs | 6 ++--- lib/speedy-uuid/Cargo.toml | 2 +- lib/tower-stop-using-brave/Cargo.toml | 4 +-- lib/tower-stop-using-brave/src/lib.rs | 17 ++++++------ 14 files changed, 42 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14aac1817..6d831e5f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -995,9 +995,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.13" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "shlex", ] @@ -1695,9 +1695,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf97ee7261bb708fa3402fa9c17a54b70e90e3cb98afb3dc8999d5512cb03f94" +checksum = "65e13bab2796f412722112327f3e575601a3e9cdcbe426f0d30dbf43f3f5dc71" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -1724,9 +1724,9 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ff2be1e7312c858b2ef974f5c7089833ae57b5311b334b30923af58e5718d8" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", "dsl_auto_type", @@ -2425,8 +2425,8 @@ dependencies = [ "rand 0.8.5", "rand_xorshift", "serde", - "serde_json", "simdutf8", + "sonic-rs", "thiserror", "tokio", "tracing", @@ -4569,7 +4569,7 @@ dependencies = [ "color-eyre", "colored_json", "mrf-manifest", - "serde_json", + "sonic-rs", "wasmparser 0.216.0", "wat", ] @@ -5597,9 +5597,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -6377,9 +6377,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa 1.0.11", "memchr", @@ -7403,7 +7403,7 @@ name = "tower-stop-using-brave" version = "0.0.1-pre.6" dependencies = [ "either", - "futures", + "futures-test", "http", "regex", "tower 0.5.0", diff --git a/Cargo.toml b/Cargo.toml index 593f312fc..099902c5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,7 +82,7 @@ askama = { version = "0.12.1", default-features = false, features = [ "with-axum", ] } clap = { version = "4.5.16", features = ["derive", "wrap_help"] } -diesel = { version = "2.2.2", default-features = false, features = [ +diesel = { version = "2.2.3", default-features = false, features = [ "32-column-tables", "with-deprecated", ] } diff --git a/crates/kitsune-derive/impl/Cargo.toml b/crates/kitsune-derive/impl/Cargo.toml index 8f190f3a5..f489d9340 100644 --- a/crates/kitsune-derive/impl/Cargo.toml +++ b/crates/kitsune-derive/impl/Cargo.toml @@ -10,7 +10,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.86" -quote = "1.0.36" +quote = "1.0.37" syn = { version = "2.0.75", features = ["full"] } [lints] diff --git a/lib/fast-cjson/Cargo.toml b/lib/fast-cjson/Cargo.toml index 3213bc075..33fe838cd 100644 --- a/lib/fast-cjson/Cargo.toml +++ b/lib/fast-cjson/Cargo.toml @@ -22,7 +22,7 @@ olpc-cjson = "0.1.3" proptest = { version = "1.5.0", default-features = false, features = ["std"] } proptest-derive = "0.5.0" serde = { version = "1.0.208", features = ["derive"] } -serde_json = "1.0.125" +serde_json = "1.0.127" [lints] workspace = true diff --git a/lib/fast-cjson/tests/test.rs b/lib/fast-cjson/tests/test.rs index f69f5cff7..ff1f94ba5 100644 --- a/lib/fast-cjson/tests/test.rs +++ b/lib/fast-cjson/tests/test.rs @@ -1,12 +1,12 @@ use fast_cjson::CanonicalFormatter; use serde::Serialize; use sonic_rs::Serializer; -use std::io::Result; +use std::io; /// Small wrapper around the `sonic_rs` json! macro to encode the value as canonical JSON. macro_rules! encode { ($($tt:tt)+) => { - (|v: sonic_rs::Value| -> Result> { + (|v: sonic_rs::Value| -> io::Result> { let mut buf = Vec::new(); let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new()); v.serialize(&mut ser)?; @@ -20,7 +20,7 @@ macro_rules! encode { /// /// `` #[test] -fn securesystemslib_asserts() -> Result<()> { +fn securesystemslib_asserts() -> io::Result<()> { assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]"); assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]"); assert_eq!(encode!([])?, b"[]"); @@ -61,7 +61,7 @@ fn securesystemslib_asserts() -> Result<()> { /// True /// ``` #[test] -fn ascii_control_characters() -> Result<()> { +fn ascii_control_characters() -> io::Result<()> { assert_eq!(encode!("\x00")?, b"\"\x00\""); assert_eq!(encode!("\x01")?, b"\"\x01\""); assert_eq!(encode!("\x02")?, b"\"\x02\""); @@ -105,7 +105,7 @@ fn ascii_control_characters() -> Result<()> { /// A more involved test than any of the above for olpc-cjson's core competency: ordering /// things. #[test] -fn ordered_nested_object() -> Result<()> { +fn ordered_nested_object() -> io::Result<()> { assert_eq!( encode!({ "nested": { diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml index 628f1ec0f..8c0871d3f 100644 --- a/lib/geomjeungja/Cargo.toml +++ b/lib/geomjeungja/Cargo.toml @@ -20,7 +20,7 @@ unsize = "1.1.0" [dev-dependencies] insta = { version = "1.39.0", features = ["json"] } rand_xorshift = "0.3.0" -serde_json = "1.0.125" +sonic-rs = { workspace = true } tokio = { version = "1.39.3", features = ["macros", "rt"] } [lints] diff --git a/lib/geomjeungja/examples/simple_txt_verification.rs b/lib/geomjeungja/examples/simple_txt_verification.rs index 49ddb3649..af74a03e7 100644 --- a/lib/geomjeungja/examples/simple_txt_verification.rs +++ b/lib/geomjeungja/examples/simple_txt_verification.rs @@ -11,13 +11,12 @@ async fn main() { .build(); // Now we store that somewhere for later verification - let serialised_strategy = serde_json::to_string(verifier.strategy()).unwrap(); + let serialised_strategy = sonic_rs::to_string(verifier.strategy()).unwrap(); // --- SOME TIME LATER --- // Now we can deserialise it because the user told us "yeah I set that" - let deserialised_strategy: KeyValueStrategy = - serde_json::from_str(&serialised_strategy).unwrap(); + let deserialised_strategy: KeyValueStrategy = sonic_rs::from_str(&serialised_strategy).unwrap(); // Let's check if they didn't lie let verifier = Verifier::builder() diff --git a/lib/just-retry/src/lib.rs b/lib/just-retry/src/lib.rs index 8e09d691b..2a4f6e963 100644 --- a/lib/just-retry/src/lib.rs +++ b/lib/just-retry/src/lib.rs @@ -2,12 +2,8 @@ extern crate tracing; use retry_policies::{policies::ExponentialBackoff, Jitter, RetryDecision}; -use std::{ - fmt::Debug, - future::Future, - ops::ControlFlow, - time::{Duration, SystemTime}, -}; +use std::{fmt::Debug, future::Future, ops::ControlFlow, time::SystemTime}; +use tokio::time::Duration; pub use retry_policies; diff --git a/lib/mrf-tool/Cargo.toml b/lib/mrf-tool/Cargo.toml index f5cbeb6fa..634e8753d 100644 --- a/lib/mrf-tool/Cargo.toml +++ b/lib/mrf-tool/Cargo.toml @@ -15,12 +15,12 @@ mrf-manifest = { workspace = true, features = [ "encode", "serialise", ] } -serde_json = "1.0.125" +sonic-rs = { workspace = true } wasmparser = "0.216.0" [lints] workspace = true [dev-dependencies] -serde_json = "1.0.125" +sonic-rs = { workspace = true } wat = "1.216.0" diff --git a/lib/mrf-tool/src/lib.rs b/lib/mrf-tool/src/lib.rs index da5ad41fe..1ee4ce6e0 100644 --- a/lib/mrf-tool/src/lib.rs +++ b/lib/mrf-tool/src/lib.rs @@ -43,7 +43,7 @@ where F: Filesystem, { // Parse the manifest and re-encode it in canonical JSON - let parsed_manifest = serde_json::from_slice(manifest)?; + let parsed_manifest = sonic_rs::from_slice(manifest)?; let custom_section = mrf_manifest::encode(&parsed_manifest)?; let mut file = fs.open_append(module_path)?; diff --git a/lib/mrf-tool/tests/manifest.rs b/lib/mrf-tool/tests/manifest.rs index 871953075..2e701056f 100644 --- a/lib/mrf-tool/tests/manifest.rs +++ b/lib/mrf-tool/tests/manifest.rs @@ -17,9 +17,9 @@ fn module_with_manifest() -> Vec { } fn manifest_to_escaped_string() -> String { - let manifest: Manifest<'_> = serde_json::from_str(MANIFEST).unwrap(); + let manifest: Manifest<'_> = sonic_rs::from_str(MANIFEST).unwrap(); let encoded_manifest = mrf_manifest::serialise(&manifest).unwrap(); - serde_json::to_string(str::from_utf8(&encoded_manifest).unwrap()).unwrap() + sonic_rs::to_string(str::from_utf8(&encoded_manifest).unwrap()).unwrap() } #[test] @@ -62,7 +62,7 @@ fn add() { #[test] fn read() { - let manifest: Manifest<'_> = serde_json::from_str(MANIFEST).unwrap(); + let manifest: Manifest<'_> = sonic_rs::from_str(MANIFEST).unwrap(); let module_with_manifest = module_with_manifest(); let pretty_manifest = colored_json::to_colored_json_auto(&manifest) diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index c8503d3d0..575c85bfe 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" [dependencies] async-graphql = { version = "7.0.7", default-features = false, optional = true } -diesel = { version = "2.2.2", default-features = false, features = [ +diesel = { version = "2.2.3", default-features = false, features = [ "postgres_backend", "uuid", ], optional = true } diff --git a/lib/tower-stop-using-brave/Cargo.toml b/lib/tower-stop-using-brave/Cargo.toml index 8e9fe32ec..7a21c4484 100644 --- a/lib/tower-stop-using-brave/Cargo.toml +++ b/lib/tower-stop-using-brave/Cargo.toml @@ -7,15 +7,13 @@ license = "MIT OR Apache-2.0" [dependencies] either = "1.13.0" +futures-test = "0.3.30" http = "1.1.0" regex = "1.10.6" tower-layer = "0.3.3" tower-service = "0.3.3" [dev-dependencies] -futures = { version = "0.3.30", default-features = false, features = [ - "executor", -] } tower = { version = "0.5.0", default-features = false, features = ["util"] } [lints] diff --git a/lib/tower-stop-using-brave/src/lib.rs b/lib/tower-stop-using-brave/src/lib.rs index 88b5d2317..647cdef81 100644 --- a/lib/tower-stop-using-brave/src/lib.rs +++ b/lib/tower-stop-using-brave/src/lib.rs @@ -78,7 +78,6 @@ impl Layer for StopUsingBraveLayer { #[cfg(test)] mod test { use crate::{StopUsingBraveLayer, REDIRECT_URL}; - use futures::executor; use http::{ header::{LOCATION, USER_AGENT}, Request, Response, StatusCode, @@ -108,8 +107,8 @@ mod test { "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/121.0", ]; - #[test] - fn matches_brave_agents() { + #[futures_test::test] + async fn matches_brave_agents() { for user_agent in BRAVE_USER_AGENTS { let service = StopUsingBraveLayer::default().layer(service_fn(|_req: Request<()>| { // The "unreachable" expression provides type annotations for the compiler to figure out the response and error types @@ -120,14 +119,14 @@ mod test { } })); - let response = executor::block_on(async move { + let response = { let request = Request::builder() .header(USER_AGENT, *user_agent) .body(()) .unwrap(); service.oneshot(request).await.unwrap() - }); + }; assert_eq!(response.status(), StatusCode::FOUND); assert_eq!( @@ -137,8 +136,8 @@ mod test { } } - #[test] - fn doesnt_match_other_agents() { + #[futures_test::test] + async fn doesnt_match_other_agents() { for user_agent in OTHER_USER_AGENTS { let service = StopUsingBraveLayer::default().layer(service_fn(|_req: Request<()>| async move { @@ -147,14 +146,14 @@ mod test { ) })); - let response = executor::block_on(async move { + let response = { let request = Request::builder() .header(USER_AGENT, *user_agent) .body(()) .unwrap(); service.oneshot(request).await.unwrap() - }); + }; assert_eq!(response.status(), StatusCode::OK); } From 59f8a7d662013b5ddd943f5dead8552b103d8001 Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Sat, 24 Aug 2024 16:24:38 +0200 Subject: [PATCH 2/3] up --- Cargo.lock | 259 +++++++----------- Cargo.toml | 2 +- crates/kitsune-activitypub/Cargo.toml | 2 +- crates/kitsune-cache/Cargo.toml | 2 +- crates/kitsune-captcha/Cargo.toml | 2 +- crates/kitsune-config/Cargo.toml | 2 +- crates/kitsune-core/Cargo.toml | 2 +- crates/kitsune-db/Cargo.toml | 2 +- crates/kitsune-derive/impl/Cargo.toml | 2 +- crates/kitsune-derive/impl/src/lib.rs | 4 +- .../impl/src/{expand.rs => service.rs} | 0 crates/kitsune-http-client/Cargo.toml | 2 +- crates/kitsune-jobs/Cargo.toml | 2 +- crates/kitsune-mastodon/Cargo.toml | 2 +- crates/kitsune-oidc/Cargo.toml | 2 +- crates/kitsune-s3/Cargo.toml | 2 +- crates/kitsune-search/Cargo.toml | 2 +- crates/kitsune-service/Cargo.toml | 2 +- crates/kitsune-type/Cargo.toml | 2 +- crates/kitsune-wasm-mrf/Cargo.toml | 2 +- kitsune-cli/Cargo.toml | 2 +- kitsune/Cargo.toml | 2 +- lib/athena/Cargo.toml | 2 +- lib/fast-cjson/Cargo.toml | 4 +- lib/fast-cjson/src/lib.rs | 12 +- lib/geomjeungja/Cargo.toml | 2 +- lib/mrf-manifest/Cargo.toml | 2 +- lib/speedy-uuid/Cargo.toml | 4 +- 28 files changed, 132 insertions(+), 195 deletions(-) rename crates/kitsune-derive/impl/src/{expand.rs => service.rs} (100%) diff --git a/Cargo.lock b/Cargo.lock index 6d831e5f0..09aa64266 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,7 +92,7 @@ checksum = "d1eb7c4fcde1858a6796c18a729b661346d38e05a207e2d9028bce822fc20283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -223,7 +223,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -296,7 +296,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -395,7 +395,7 @@ dependencies = [ "proc-macro2", "quote", "strum", - "syn 2.0.75", + "syn 2.0.76", "thiserror", ] @@ -440,7 +440,7 @@ source = "git+https://github.com/tokio-rs/async-stream.git?rev=40a8deb7d41d3ac0e dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -451,7 +451,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -609,7 +609,7 @@ source = "git+https://github.com/tokio-rs/axum.git?rev=918170a12bfcc488000998f33 dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -995,9 +995,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "shlex", ] @@ -1065,7 +1065,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1200,9 +1200,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1505,7 +1505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1551,7 +1551,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1575,7 +1575,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1586,7 +1586,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1616,7 +1616,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1647,7 +1647,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1657,7 +1657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1670,7 +1670,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1690,7 +1690,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1732,7 +1732,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1761,7 +1761,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1790,7 +1790,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1815,7 +1815,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1835,7 +1835,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -1997,7 +1997,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2009,7 +2009,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2106,15 +2106,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "faststr" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7291411748f478e31aca447a88e9ea3f7d06be7e1cb94a38c3b6670811226c" +checksum = "de3345ffff4508dd4f95461b3a510464cb310565b5d561a7a458c0f3bf16d77a" dependencies = [ "bytes", "serde", @@ -2156,9 +2156,9 @@ checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -2190,9 +2190,9 @@ dependencies = [ [[package]] name = "fred" -version = "9.1.1" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee218b8980043b550540530d38d7435fd55bbc9ee07526a05d9a30595097e02" +checksum = "152397076bd317aa06bca9666e954ad15cde1a8f17b6ea4b007cf0bfc074d1d0" dependencies = [ "arc-swap", "async-trait", @@ -2309,7 +2309,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2392,7 +2392,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -2754,7 +2754,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -3072,7 +3072,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -3612,7 +3612,7 @@ version = "0.0.1-pre.6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4236,7 +4236,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4360,7 +4360,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4430,7 +4430,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -4674,7 +4674,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5080,7 +5080,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5224,7 +5224,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5271,7 +5271,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5392,12 +5392,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5411,11 +5411,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -5481,7 +5481,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5504,7 +5504,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -5737,9 +5737,9 @@ dependencies = [ [[package]] name = "redb" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6dd20d3cdeb9c7d2366a0b16b93b35b75aec15309fbeb7ce477138c9f68c8c0" +checksum = "58323dc32ea52a8ae105ff94bc0460c5d906307533ba3401aa63db3cbe491fe5" dependencies = [ "libc", "log", @@ -5978,7 +5978,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.75", + "syn 2.0.76", "unicode-ident", ] @@ -6013,7 +6013,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.75", + "syn 2.0.76", "walkdir", ] @@ -6196,7 +6196,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6323,9 +6323,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -6342,13 +6342,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6359,7 +6359,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6463,7 +6463,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6700,15 +6700,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "windows-sys 0.36.1", + "windows-sys 0.59.0", ] [[package]] @@ -6775,7 +6775,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6786,7 +6786,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6809,7 +6809,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -6862,9 +6862,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -6891,7 +6891,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7005,7 +7005,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7101,7 +7101,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7130,7 +7130,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7232,7 +7232,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -7244,17 +7244,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" @@ -7265,14 +7254,14 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] name = "tonic" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", @@ -7445,7 +7434,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7579,7 +7568,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7615,7 +7604,7 @@ checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -7902,7 +7891,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wasm-bindgen-shared", ] @@ -7936,7 +7925,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8088,7 +8077,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -8204,7 +8193,7 @@ checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -8417,19 +8406,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -8500,12 +8476,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -8518,12 +8488,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -8542,12 +8506,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -8560,12 +8518,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -8590,12 +8542,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -8608,15 +8554,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.18" @@ -8686,7 +8623,7 @@ dependencies = [ "heck 0.5.0", "indexmap 2.4.0", "prettyplease", - "syn 2.0.75", + "syn 2.0.76", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -8702,7 +8639,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -8838,7 +8775,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "synstructure", ] @@ -8860,7 +8797,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -8880,7 +8817,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", "synstructure", ] @@ -8901,7 +8838,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] @@ -8923,7 +8860,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.76", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 099902c5c..792af1d22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,7 +93,7 @@ diesel-async = { version = "0.5.0", features = [ "tokio", ] } diesel_full_text_search = { version = "2.2.0", default-features = false } -fred = { version = "9.1.1", features = [ +fred = { version = "9.1.2", features = [ "enable-rustls-ring", "full-tracing", "i-scripts", diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml index cd4dbc902..44179d1f9 100644 --- a/crates/kitsune-activitypub/Cargo.toml +++ b/crates/kitsune-activitypub/Cargo.toml @@ -31,7 +31,7 @@ kitsune-util = { workspace = true } kitsune-wasm-mrf = { workspace = true } mime = "0.3.17" mime_guess = { version = "2.0.5", default-features = false } -serde = "1.0.208" +serde = "1.0.209" sha2 = "0.10.8" sonic-rs = { workspace = true } speedy-uuid = { workspace = true } diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index 7b3acdf69..3e317fb50 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -10,7 +10,7 @@ enum_dispatch = "0.3.13" fred = { workspace = true } kitsune-error = { workspace = true } moka = { workspace = true } -serde = "1.0.208" +serde = "1.0.209" sonic-rs = { workspace = true } tracing = "0.1.40" triomphe = { workspace = true } diff --git a/crates/kitsune-captcha/Cargo.toml b/crates/kitsune-captcha/Cargo.toml index 7269c515a..97cc005d2 100644 --- a/crates/kitsune-captcha/Cargo.toml +++ b/crates/kitsune-captcha/Cargo.toml @@ -10,7 +10,7 @@ enum_dispatch = "0.3.13" http = "1.1.0" kitsune-error = { workspace = true } kitsune-http-client = { workspace = true } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_urlencoded = "0.7.1" sonic-rs = { workspace = true } strum = { version = "0.26.3", features = ["derive"] } diff --git a/crates/kitsune-config/Cargo.toml b/crates/kitsune-config/Cargo.toml index 6aa72779d..43c52b61b 100644 --- a/crates/kitsune-config/Cargo.toml +++ b/crates/kitsune-config/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true eyre = "0.6.12" human-size = { version = "0.4.3", features = ["serde"] } isolang = { version = "2.4.0", features = ["serde"] } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } smol_str = { version = "0.2.2", features = ["serde"] } tokio = { version = "1.39.3", features = ["fs"] } toml = { version = "0.8.19", default-features = false, features = ["parse"] } diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index 69772dc84..81b565030 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -12,7 +12,7 @@ const_format = "0.2.32" kitsune-db = { workspace = true } kitsune-error = { workspace = true } paste = "1.0.15" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } triomphe = { workspace = true } typed-builder = "0.20.0" unsize = "1.1.0" diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index 2e3ac1e7d..ad7146eb3 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -29,7 +29,7 @@ rustls = { version = "0.23.12", default-features = false, features = [ "tls12", ] } rustls-native-certs = "0.7.2" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } sonic-rs = { workspace = true } speedy-uuid = { workspace = true, features = ["diesel"] } tokio = { version = "1.39.3", features = ["rt"] } diff --git a/crates/kitsune-derive/impl/Cargo.toml b/crates/kitsune-derive/impl/Cargo.toml index f489d9340..577c65cd9 100644 --- a/crates/kitsune-derive/impl/Cargo.toml +++ b/crates/kitsune-derive/impl/Cargo.toml @@ -11,7 +11,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.86" quote = "1.0.37" -syn = { version = "2.0.75", features = ["full"] } +syn = { version = "2.0.76", features = ["full"] } [lints] workspace = true diff --git a/crates/kitsune-derive/impl/src/lib.rs b/crates/kitsune-derive/impl/src/lib.rs index 9f844ead4..56daa679d 100644 --- a/crates/kitsune-derive/impl/src/lib.rs +++ b/crates/kitsune-derive/impl/src/lib.rs @@ -1,11 +1,11 @@ -mod expand; +mod service; #[proc_macro_attribute] pub fn kitsune_service( attrs: proc_macro::TokenStream, input: proc_macro::TokenStream, ) -> proc_macro::TokenStream { - match self::expand::expand(attrs.into(), input.into()) { + match self::service::expand(attrs.into(), input.into()) { Ok(out) => out.into(), Err(error) => error.to_compile_error().into(), } diff --git a/crates/kitsune-derive/impl/src/expand.rs b/crates/kitsune-derive/impl/src/service.rs similarity index 100% rename from crates/kitsune-derive/impl/src/expand.rs rename to crates/kitsune-derive/impl/src/service.rs diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml index b97d00730..cd6535773 100644 --- a/crates/kitsune-http-client/Cargo.toml +++ b/crates/kitsune-http-client/Cargo.toml @@ -31,7 +31,7 @@ hyper-rustls = { version = "0.27.2", default-features = false, features = [ ] } kitsune-type = { workspace = true } pin-project = "1.1.5" -serde = "1.0.208" +serde = "1.0.209" simdutf8 = { workspace = true } sonic-rs = { workspace = true } tower = { version = "0.5.0", features = ["util"] } diff --git a/crates/kitsune-jobs/Cargo.toml b/crates/kitsune-jobs/Cargo.toml index 066ec5877..9026546c7 100644 --- a/crates/kitsune-jobs/Cargo.toml +++ b/crates/kitsune-jobs/Cargo.toml @@ -15,7 +15,7 @@ kitsune-core = { workspace = true } kitsune-db = { workspace = true } kitsune-email = { workspace = true } kitsune-error = { workspace = true } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } speedy-uuid = { workspace = true } tracing = "0.1.40" typed-builder = "0.20.0" diff --git a/crates/kitsune-mastodon/Cargo.toml b/crates/kitsune-mastodon/Cargo.toml index 52a5586be..42da581ad 100644 --- a/crates/kitsune-mastodon/Cargo.toml +++ b/crates/kitsune-mastodon/Cargo.toml @@ -19,7 +19,7 @@ kitsune-type = { workspace = true } kitsune-url = { workspace = true } kitsune-util = { workspace = true } mime = "0.3.17" -serde = "1.0.208" +serde = "1.0.209" smol_str = "0.2.2" sonic-rs = { workspace = true } speedy-uuid = { workspace = true } diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml index 6830148fa..9467bda67 100644 --- a/crates/kitsune-oidc/Cargo.toml +++ b/crates/kitsune-oidc/Cargo.toml @@ -21,7 +21,7 @@ openidconnect = { version = "4.0.0-alpha.2", default-features = false, features "accept-rfc3339-timestamps", "accept-string-booleans", ] } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } sonic-rs = { workspace = true } speedy-uuid = { workspace = true } url = "2.5.2" diff --git a/crates/kitsune-s3/Cargo.toml b/crates/kitsune-s3/Cargo.toml index de5a20541..7c4b0ff90 100644 --- a/crates/kitsune-s3/Cargo.toml +++ b/crates/kitsune-s3/Cargo.toml @@ -13,7 +13,7 @@ kitsune-error = { workspace = true } kitsune-http-client = { workspace = true } quick-xml = { version = "0.36.1", features = ["serialize"] } rusty-s3 = "0.5.0" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } typed-builder = "0.20.0" [dev-dependencies] diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml index 46c2e170a..3061b857e 100644 --- a/crates/kitsune-search/Cargo.toml +++ b/crates/kitsune-search/Cargo.toml @@ -23,7 +23,7 @@ kitsune-http-client = { workspace = true } kitsune-language = { workspace = true } meilisearch-sdk = { version = "0.27.1", default-features = false } pin-project-lite = "0.2.14" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_urlencoded = "0.7.1" speedy-uuid = { workspace = true } strum = { version = "0.26.3", features = ["derive"] } diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml index be73cb8d2..6c1cfb9e6 100644 --- a/crates/kitsune-service/Cargo.toml +++ b/crates/kitsune-service/Cargo.toml @@ -45,7 +45,7 @@ post-process = { workspace = true } rand = "0.8.5" rsa = "0.9.6" rusty-s3 = { version = "0.5.0", default-features = false } -serde = "1.0.208" +serde = "1.0.209" smol_str = "0.2.2" speedy-uuid = { workspace = true } tokio = { version = "1.39.3", features = ["macros", "sync"] } diff --git a/crates/kitsune-type/Cargo.toml b/crates/kitsune-type/Cargo.toml index 828ceb8ad..e4b4c6279 100644 --- a/crates/kitsune-type/Cargo.toml +++ b/crates/kitsune-type/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true [dependencies] iso8601-timestamp = "0.2.17" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_with = "3.9.0" smol_str = { version = "0.2.2", features = ["serde"] } sonic-rs = { workspace = true } diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml index d675831f2..06456121f 100644 --- a/crates/kitsune-wasm-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/Cargo.toml @@ -21,7 +21,7 @@ kitsune-derive = { workspace = true } kitsune-error = { workspace = true } kitsune-type = { workspace = true } mrf-manifest = { workspace = true, features = ["decode"] } -redb = { version = "2.1.1", features = ["logging"] } +redb = { version = "2.1.2", features = ["logging"] } slab = "0.4.9" smol_str = "0.2.2" sonic-rs = { workspace = true } diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml index fa8d1221b..68e00eeb5 100644 --- a/kitsune-cli/Cargo.toml +++ b/kitsune-cli/Cargo.toml @@ -22,7 +22,7 @@ kitsune-config = { workspace = true } kitsune-core = { workspace = true } kitsune-db = { workspace = true } kitsune-error = { workspace = true } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } speedy-uuid = { workspace = true } tokio = { version = "1.39.3", features = ["full"] } tracing-subscriber = "0.3.18" diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index e4401ce58..bfaf00e93 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -75,7 +75,7 @@ oxide-auth-async = "0.2.1" oxide-auth-axum = "0.5.0" rust-embed = { version = "8.5.0", features = ["include-exclude"] } scoped-futures = "0.1.3" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_urlencoded = "0.7.1" sonic-rs = { workspace = true } simdutf8 = { workspace = true } diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index 09521418e..9910c4735 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -18,7 +18,7 @@ iso8601-timestamp = "0.2.17" fred = { workspace = true, optional = true } just-retry = { workspace = true } rand = { version = "0.8.5", optional = true } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } smol_str = "0.2.2" sonic-rs = { workspace = true, optional = true } speedy-uuid = { workspace = true, features = ["redis"] } diff --git a/lib/fast-cjson/Cargo.toml b/lib/fast-cjson/Cargo.toml index 33fe838cd..748f28133 100644 --- a/lib/fast-cjson/Cargo.toml +++ b/lib/fast-cjson/Cargo.toml @@ -12,7 +12,7 @@ harness = false [dependencies] icu_normalizer = "1.5.0" memchr = "2.7.4" -serde = "1.0.208" +serde = "1.0.209" sonic-rs = { workspace = true } [dev-dependencies] @@ -21,7 +21,7 @@ mimalloc = "0.1.43" olpc-cjson = "0.1.3" proptest = { version = "1.5.0", default-features = false, features = ["std"] } proptest-derive = "0.5.0" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_json = "1.0.127" [lints] diff --git a/lib/fast-cjson/src/lib.rs b/lib/fast-cjson/src/lib.rs index be8976372..dbf97e658 100644 --- a/lib/fast-cjson/src/lib.rs +++ b/lib/fast-cjson/src/lib.rs @@ -15,12 +15,6 @@ use std::{ mod util; -#[derive(Debug, Default)] -struct Object { - obj: BTreeMap, Vec>, - state: Collecting, -} - #[derive(Debug)] enum Collecting { Key(Vec), @@ -33,6 +27,12 @@ impl Default for Collecting { } } +#[derive(Debug, Default)] +struct Object { + obj: BTreeMap, Vec>, + state: Collecting, +} + /// A [`Formatter`](sonic_rs::format::Formatter) that produces canonical JSON. #[derive(Debug, Default)] pub struct CanonicalFormatter { diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml index 8c0871d3f..46be0f2b5 100644 --- a/lib/geomjeungja/Cargo.toml +++ b/lib/geomjeungja/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" async-trait = "0.1.81" hickory-resolver = "0.24.1" rand = "0.8.5" -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } simdutf8 = { workspace = true } thiserror = "1.0.63" tracing = "0.1.40" diff --git a/lib/mrf-manifest/Cargo.toml b/lib/mrf-manifest/Cargo.toml index fceaeac91..626b55cd5 100644 --- a/lib/mrf-manifest/Cargo.toml +++ b/lib/mrf-manifest/Cargo.toml @@ -10,7 +10,7 @@ fast-cjson = { workspace = true, optional = true } leb128 = { version = "0.2.5", optional = true } schemars = { version = "0.8.21", features = ["impl_json_schema", "semver"] } semver = { version = "1.0.23", features = ["serde"] } -serde = { version = "1.0.208", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } sonic-rs = { workspace = true, optional = true } thiserror = { version = "1.0.63", optional = true } wasm-encoder = { version = "0.216.0", optional = true } diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index 575c85bfe..56307155f 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -11,8 +11,8 @@ diesel = { version = "2.2.3", default-features = false, features = [ "postgres_backend", "uuid", ], optional = true } -fred = { version = "9.1.1", default-features = false, optional = true } -serde = { version = "1.0.208", optional = true } +fred = { version = "9.1.2", default-features = false, optional = true } +serde = { version = "1.0.209", optional = true } thiserror = "1.0.63" uuid = { version = "1.10.0", features = ["fast-rng", "v7"] } uuid-simd = { version = "0.8.0", features = ["uuid"] } From 6d15f9b304feccc8d3bb6ec74c331f8ab5ce47e6 Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Tue, 27 Aug 2024 18:36:31 +0200 Subject: [PATCH 3/3] fix nightly warnings --- Cargo.lock | 12 ++++++------ crates/kitsune-cache/src/redis.rs | 5 +++-- crates/kitsune-oidc/src/state/store/redis.rs | 3 ++- lib/athena/src/redis/mod.rs | 13 +++++++------ lib/athena/src/redis/scheduled.rs | 2 +- lib/tower-stop-using-brave/Cargo.toml | 2 +- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09aa64266..022a67c86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6048,18 +6048,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -6116,9 +6116,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", diff --git a/crates/kitsune-cache/src/redis.rs b/crates/kitsune-cache/src/redis.rs index 303757775..c30353bf4 100644 --- a/crates/kitsune-cache/src/redis.rs +++ b/crates/kitsune-cache/src/redis.rs @@ -54,7 +54,7 @@ where let key = self.compute_key(key); debug!(%key, "Deleting cache entry"); - self.redis_conn.del(key).await?; + let () = self.redis_conn.del(key).await?; Ok(()) } @@ -78,7 +78,8 @@ where let serialised = sonic_rs::to_string(value)?; debug!(%key, ttl = ?self.ttl, "Setting cache entry"); - self.redis_conn + let () = self + .redis_conn .set( key, serialised, diff --git a/crates/kitsune-oidc/src/state/store/redis.rs b/crates/kitsune-oidc/src/state/store/redis.rs index a86d1e3ff..ceb53668d 100644 --- a/crates/kitsune-oidc/src/state/store/redis.rs +++ b/crates/kitsune-oidc/src/state/store/redis.rs @@ -29,7 +29,8 @@ impl Store for Redis { async fn set(&self, key: &str, value: LoginState) -> Result<()> { let raw_value = sonic_rs::to_string(&value)?; - self.pool + let () = self + .pool .set(Self::format_key(key), raw_value, None, None, false) .await?; diff --git a/lib/athena/src/redis/mod.rs b/lib/athena/src/redis/mod.rs index 6f3b3bcc7..8bda24e6d 100644 --- a/lib/athena/src/redis/mod.rs +++ b/lib/athena/src/redis/mod.rs @@ -105,7 +105,7 @@ where .duration_since(Timestamp::UNIX_EPOCH) .as_seconds_f64(); - client + let () = client .zadd( self.scheduled_queue_name.as_str(), None, @@ -116,7 +116,7 @@ where ) .await?; } else { - client + let () = client .xadd( self.queue_name.as_str(), false, @@ -241,14 +241,14 @@ where let client = self.redis_pool.next(); let pipeline = client.pipeline(); - pipeline + let () = pipeline .xack( self.queue_name.as_str(), self.consumer_group.as_str(), stream_id.as_str(), ) .await?; - pipeline + let () = pipeline .xdel(self.queue_name.as_str(), &[stream_id]) .await?; @@ -279,7 +279,7 @@ where Outcome::Success => true, // Execution succeeded, we don't need the context anymore }; - pipeline.last().await?; + let () = pipeline.last().await?; if remove_context { self.context_repository @@ -297,7 +297,8 @@ where .get::() .expect("[Bug] Not a string in the context"); - self.redis_pool + let () = self + .redis_pool .xclaim( self.queue_name.as_str(), self.consumer_group.as_str(), diff --git a/lib/athena/src/redis/scheduled.rs b/lib/athena/src/redis/scheduled.rs index 156385b80..4a13799c4 100644 --- a/lib/athena/src/redis/scheduled.rs +++ b/lib/athena/src/redis/scheduled.rs @@ -22,7 +22,7 @@ pub struct ScheduledJobActor { impl ScheduledJobActor { async fn run(&mut self) -> Result<()> { let client = self.redis_pool.next(); - SCHEDULE_SCRIPT + let () = SCHEDULE_SCRIPT .evalsha_with_reload( client, (self.queue_name.as_str(), self.scheduled_queue_name.as_str()), diff --git a/lib/tower-stop-using-brave/Cargo.toml b/lib/tower-stop-using-brave/Cargo.toml index 7a21c4484..015bc8894 100644 --- a/lib/tower-stop-using-brave/Cargo.toml +++ b/lib/tower-stop-using-brave/Cargo.toml @@ -7,13 +7,13 @@ license = "MIT OR Apache-2.0" [dependencies] either = "1.13.0" -futures-test = "0.3.30" http = "1.1.0" regex = "1.10.6" tower-layer = "0.3.3" tower-service = "0.3.3" [dev-dependencies] +futures-test = "0.3.30" tower = { version = "0.5.0", default-features = false, features = ["util"] } [lints]