diff --git a/.github/workflows/cargo-machete.yml b/.github/workflows/cargo-machete.yml new file mode 100644 index 000000000..ad0e6a054 --- /dev/null +++ b/.github/workflows/cargo-machete.yml @@ -0,0 +1,17 @@ +name: Rust unused dependencies + +on: + pull_request: + push: + paths: + - "**/Cargo.toml" + - "**/Cargo.lock" + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Machete + uses: bnjbvr/cargo-machete@main diff --git a/Cargo.lock b/Cargo.lock index f3c66dcdd..ac35e9927 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -201,7 +201,7 @@ dependencies = [ "askama_derive", "askama_escape", "humansize", - "num-traits 0.2.16", + "num-traits 0.2.17", "percent-encoding", ] @@ -229,7 +229,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -294,7 +294,7 @@ dependencies = [ "indexmap 2.0.2", "mime", "multer", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "pin-project-lite", "regex", @@ -341,7 +341,7 @@ dependencies = [ "proc-macro2", "quote", "strum", - "syn 2.0.37", + "syn 2.0.38", "thiserror", ] @@ -386,7 +386,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -408,7 +408,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -425,7 +425,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -556,9 +556,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.31.2" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c681fef332c3462634cd97fced8d1ac3cfdf790829bd7bfb4006cfba76712053" +checksum = "73018483d9cb78e1a0d4dcbc94327b01d532e7cb28f26c5bceff97f8f0e4c6eb" dependencies = [ "aws-credential-types", "aws-http", @@ -926,7 +926,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1084,9 +1084,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", @@ -1121,9 +1121,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -1143,9 +1143,9 @@ checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -1177,9 +1177,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -1249,7 +1249,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.16", + "num-traits 0.2.17", "serde", "wasm-bindgen", "windows-targets 0.48.5", @@ -1313,7 +1313,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1420,18 +1420,18 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -1526,7 +1526,7 @@ dependencies = [ "futures", "is-terminal", "itertools", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "oorandom", "rayon", @@ -1633,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1653,9 +1653,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -1667,6 +1667,34 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "darling" version = "0.14.4" @@ -1712,7 +1740,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1734,7 +1762,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1813,10 +1841,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1864,9 +1893,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c8a2cb22327206568569e5a45bb5a2c946455efdd76e24d15b7e82171af95e" +checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" dependencies = [ "bitflags 2.4.0", "byteorder", @@ -1900,7 +1929,7 @@ dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1929,7 +1958,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2011,6 +2040,29 @@ dependencies = [ "spki", ] +[[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "zeroize", +] + [[package]] name = "ego-tree" version = "0.6.2" @@ -2107,7 +2159,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2146,25 +2198,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-chain" version = "0.12.4" @@ -2231,6 +2272,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" + [[package]] name = "finl_unicode" version = "1.2.0" @@ -2239,9 +2286,9 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -2253,7 +2300,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -2352,7 +2399,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2440,7 +2487,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2861,9 +2908,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "globset", @@ -2985,9 +3032,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3024,9 +3071,6 @@ dependencies = [ "async-graphql-axum", "async-trait", "athena", - "autometrics", - "aws-credential-types", - "aws-sdk-s3", "axum", "axum-extra 0.8.0", "axum-flash", @@ -3036,7 +3080,6 @@ dependencies = [ "clap", "color-eyre", "const-oid", - "deadpool-redis", "der", "diesel", "diesel-async", @@ -3051,13 +3094,11 @@ dependencies = [ "kitsune-captcha", "kitsune-core", "kitsune-db", - "kitsune-email", "kitsune-embed", "kitsune-http-client", "kitsune-http-signatures", "kitsune-job-runner", "kitsune-language", - "kitsune-messaging", "kitsune-search", "kitsune-storage", "kitsune-test", @@ -3075,7 +3116,6 @@ dependencies = [ "oxide-auth-axum", "pkcs8", "pretty_assertions", - "redis", "scoped-futures", "serde", "serde_urlencoded", @@ -3128,7 +3168,6 @@ dependencies = [ "serde_urlencoded", "simd-json", "strum", - "strum_macros", "thiserror", "typed-builder", ] @@ -3146,7 +3185,6 @@ dependencies = [ "kitsune-db", "serde", "speedy-uuid", - "time", "tokio", "tracing-subscriber", "vergen", @@ -3212,7 +3250,6 @@ dependencies = [ "simd-json", "smol_str", "speedy-uuid", - "strum", "tempfile", "thiserror", "time", @@ -3238,7 +3275,7 @@ dependencies = [ "kitsune-language", "kitsune-type", "num-derive", - "num-traits 0.2.16", + "num-traits 0.2.17", "serde", "simd-json", "speedy-uuid", @@ -3283,7 +3320,6 @@ name = "kitsune-http-client" version = "0.0.1-pre.3" dependencies = [ "bytes", - "derive_builder", "futures-core", "headers", "http-body", @@ -3309,7 +3345,7 @@ dependencies = [ "pem", "pkcs8", "rayon", - "ring 0.17.0", + "ring 0.17.3", "thiserror", "time", "tokio", @@ -3540,15 +3576,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -3590,29 +3626,29 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f948366ad5bb46b5514ba7a7a80643726eef08b06632592699676748c8bc33b" +checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc28438cad73dcc90ff3466fc329a9252b1b8ba668eb0d5668ba97088cf4eef0" +checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3656,7 +3692,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3816,7 +3852,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3848,7 +3884,7 @@ dependencies = [ "indexmap 1.9.3", "metrics", "num_cpus", - "ordered-float 3.9.1", + "ordered-float 3.9.2", "quanta", "radix_trie", "sketches-ddsketch", @@ -3937,9 +3973,9 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc65d4615c08c8a13d91fd404b5a2a4485ba35b4091e3315cf8798d280c2f29" +checksum = "d8017ec3548ffe7d4cef7ac0e12b044c01164a74c0f3119420faeaf13490ad8b" dependencies = [ "crossbeam-channel", "crossbeam-epoch", @@ -4055,7 +4091,7 @@ dependencies = [ "libm", "num-integer", "num-iter", - "num-traits 0.2.16", + "num-traits 0.2.17", "rand", "smallvec", "zeroize", @@ -4063,13 +4099,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4079,7 +4115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -4090,7 +4126,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -4099,14 +4135,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -4173,13 +4209,14 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "openidconnect" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9bcb11cef8c32242e1ab8ff0b11bc7f763dea4d83c103dc75beb743a528932" +checksum = "62d6050f6a84b81f23c569f5607ad883293e57491036e318fafe6fc4895fadb1" dependencies = [ "base64 0.13.1", "chrono", "dyn-clone", + "ed25519-dalek", "hmac", "http", "itertools", @@ -4222,20 +4259,20 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -4492,7 +4529,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4530,7 +4567,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4583,6 +4620,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "platforms" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" + [[package]] name = "polling" version = "2.8.0" @@ -4645,6 +4688,12 @@ dependencies = [ "postgres-protocol", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4718,9 +4767,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4900,25 +4949,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4929,9 +4978,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "retain_mut" @@ -4941,9 +4990,9 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "retry-policies" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" dependencies = [ "anyhow", "chrono", @@ -4977,9 +5026,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.0" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb9d44f9bf6b635117787f72416783eb7e4227aaf255e5ce739563d817176a7e" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" dependencies = [ "cc", "getrandom", @@ -4996,7 +5045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" dependencies = [ "byteorder", - "num-traits 0.2.16", + "num-traits 0.2.17", "paste", ] @@ -5023,7 +5072,7 @@ dependencies = [ "num-bigint-dig", "num-integer", "num-iter", - "num-traits 0.2.16", + "num-traits 0.2.17", "pkcs1", "pkcs8", "rand_core", @@ -5047,9 +5096,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5058,23 +5107,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.37", + "syn 2.0.38", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" dependencies = [ "sha2", "walkdir", @@ -5103,9 +5152,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.15" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -5297,18 +5346,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -5319,19 +5368,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float 2.10.0", + "ordered-float 2.10.1", "serde", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5435,7 +5484,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5460,7 +5509,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5498,13 +5547,23 @@ dependencies = [ "cfg-if", "cpufeatures", "digest", + "sha2-asm", +] + +[[package]] +name = "sha2-asm" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27ba7066011e3fb30d808b51affff34f0a66d3a03a58edd787c6e420e40e44e" +dependencies = [ + "cc", ] [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -5539,9 +5598,9 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474b451aaac1828ed12f6454a80fe58b940ae2998d10389d41533940a6f641bf" +checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec" dependencies = [ "getrandom", "halfbrown", @@ -5560,9 +5619,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "siphasher" @@ -5667,7 +5726,7 @@ checksum = "c87e960f4dca2788eeb86bbdde8dd246be8948790b7618d656e68f9b720a86e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5776,7 +5835,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5798,9 +5857,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5869,7 +5928,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -5884,14 +5943,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -5939,9 +5999,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -5964,7 +6024,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -6170,11 +6230,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6183,20 +6242,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6297,7 +6356,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -6392,9 +6451,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" +checksum = "6b208a50ff438dcdc887ea3f2db59530bd2f4bc3d2c70630e4d7ee7a281a1d1b" dependencies = [ "indexmap 2.0.2", "serde", @@ -6404,23 +6463,23 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d96dcd6fc96f3df9b3280ef480770af1b7c5d14bc55192baa9b067976d920c" +checksum = "0bd516d8879043e081537690bc96c8f17b5a4602c336aecb8f1de89d9d9c7e72" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.37", + "syn 2.0.38", "uuid", ] [[package]] name = "utoipa-swagger-ui" -version = "3.1.5" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653" +checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" dependencies = [ "axum", "mime_guess", @@ -6554,7 +6613,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -6588,7 +6647,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6818,9 +6877,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -6876,31 +6935,29 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index a03bafe93..186277f34 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -8,12 +8,12 @@ async-trait = "0.1.73" deadpool-redis = "0.13.0" derive_builder = "0.12.0" enum_dispatch = "0.3.12" -moka = { version = "0.12.0", features = ["sync"] } +moka = { version = "0.12.1", features = ["sync"] } redis = "0.23.3" -serde = "1.0.188" -simd-json = "0.11.1" +serde = "1.0.189" +simd-json = "0.12.0" thiserror = "1.0.49" -tracing = "0.1.37" +tracing = "0.1.39" [dev-dependencies] -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-captcha/Cargo.toml b/crates/kitsune-captcha/Cargo.toml index 9e4b60b5f..d99209d63 100644 --- a/crates/kitsune-captcha/Cargo.toml +++ b/crates/kitsune-captcha/Cargo.toml @@ -8,10 +8,9 @@ async-trait = "0.1.73" enum_dispatch = "0.3.12" http = "0.2.9" kitsune-http-client = { path = "../kitsune-http-client" } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } serde_urlencoded = "0.7.1" -simd-json = "0.11.1" +simd-json = "0.12.0" strum = { version = "0.25.0", features = ["derive"] } -strum_macros = "0.25.2" thiserror = "1.0.49" typed-builder = "0.16.2" diff --git a/crates/kitsune-captcha/src/error.rs b/crates/kitsune-captcha/src/error.rs index 566839c1a..2518b8f96 100644 --- a/crates/kitsune-captcha/src/error.rs +++ b/crates/kitsune-captcha/src/error.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use strum_macros::{Display, EnumString}; +use strum::{Display, EnumString}; use thiserror::Error; #[derive(Debug, PartialEq, Display, Serialize, Deserialize, EnumString, Error)] diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index 5855cde48..eff454512 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -14,13 +14,13 @@ autometrics = { version = "0.6.0", default-features = false } aws-credential-types = { version = "0.56.1", features = [ "hardcoded-credentials", ] } -aws-sdk-s3 = "0.31.2" +aws-sdk-s3 = "0.33.0" base64-simd = "0.8.0" bytes = "1.5.0" -const_format = "0.2.31" +const_format = "0.2.32" deadpool-redis = { version = "0.13.0", default-features = false } derive_builder = "0.12.0" -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = { version = "0.4.1", features = ["postgres"] } eyre = "0.6.8" futures-util = "0.3.28" @@ -60,17 +60,16 @@ rand = "0.8.5" rayon = "1.8.0" rsa = "0.9.2" scoped-futures = "0.1.3" -serde = { version = "1.0.188", features = ["derive"] } -sha2 = "0.10.8" -simd-json = "0.11.1" +serde = { version = "1.0.189", features = ["derive"] } +sha2 = { version = "0.10.8", features = ["asm"] } +simd-json = "0.12.0" smol_str = "0.2.0" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } -strum = { version = "0.25.0", features = ["derive", "phf"] } thiserror = "1.0.49" -time = "0.3.29" -tokio = { version = "1.32.0", features = ["macros", "rt"] } +time = "0.3.30" +tokio = { version = "1.33.0", features = ["macros", "rt"] } toml = { version = "0.8.2", default-features = false, features = ["parse"] } -tracing = "0.1.37" +tracing = "0.1.39" typed-builder = "0.16.2" url = "2.4.1" zxcvbn = { version = "2.2.2", default-features = false } @@ -79,6 +78,7 @@ zxcvbn = { version = "2.2.2", default-features = false } default = [] mastodon-api = [] meilisearch = ["kitsune-search/meilisearch"] +metrics = ["autometrics/metrics"] [build-dependencies] vergen = { version = "8.2.5", features = ["build", "git", "gitcl"] } diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index b82c61330..bdb223515 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true build = "build.rs" [dependencies] -diesel = { version = "2.1.2", features = ["uuid"] } +diesel = { version = "2.1.3", features = ["uuid"] } diesel-async = { version = "0.4.1", features = [ "async-connection-wrapper", "deadpool", @@ -17,12 +17,12 @@ diesel_migrations = "2.1.0" iso8601-timestamp = { version = "0.2.12", features = ["diesel-pg"] } kitsune-language = { path = "../kitsune-language" } kitsune-type = { path = "../kitsune-type" } -num-derive = "0.4.0" -num-traits = "0.2.16" -serde = { version = "1.0.188", features = ["derive"] } -simd-json = "0.11.1" +num-derive = "0.4.1" +num-traits = "0.2.17" +serde = { version = "1.0.189", features = ["derive"] } +simd-json = "0.12.0" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["rt"] } +tokio = { version = "1.33.0", features = ["rt"] } tracing-log = "0.1.3" typed-builder = "0.16.2" diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml index 3104094a9..54d4a5951 100644 --- a/crates/kitsune-email/Cargo.toml +++ b/crates/kitsune-email/Cargo.toml @@ -3,6 +3,9 @@ name = "kitsune-email" edition.workspace = true version.workspace = true +[package.metadata.cargo-machete] +ignored = ["askama_axum"] # See reason below. + [dependencies] askama = "0.12.1" askama_axum = "0.3.0" # Damn it, cargo. Because "kitsune" uses "askama" with the axum feature, we have to have the crate available here as well.. diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml index e849a0145..0c8de133c 100644 --- a/crates/kitsune-embed/Cargo.toml +++ b/crates/kitsune-embed/Cargo.toml @@ -4,7 +4,7 @@ edition.workspace = true version.workspace = true [dependencies] -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = "0.4.1" embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "6f664877dc173153ca36810cc4f510df35c6b67d" } http = "0.2.9" diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml index 333100f19..66a8b6e6a 100644 --- a/crates/kitsune-http-client/Cargo.toml +++ b/crates/kitsune-http-client/Cargo.toml @@ -5,7 +5,6 @@ edition.workspace = true [dependencies] bytes = "1.5.0" -derive_builder = "0.12.0" futures-core = "0.3.28" headers = "0.3.9" http-body = "0.4.5" @@ -20,8 +19,8 @@ hyper-rustls = { version = "0.24.1", features = ["http2"] } kitsune-http-signatures = { path = "../kitsune-http-signatures" } kitsune-type = { path = "../kitsune-type" } pin-project-lite = "0.2.13" -serde = "1.0.188" -simd-json = "0.11.1" +serde = "1.0.189" +simd-json = "0.12.0" tower = { version = "0.4.13", features = ["util"] } tower-http = { version = "0.4.4", features = [ "decompression-full", @@ -31,4 +30,4 @@ tower-http = { version = "0.4.4", features = [ ] } [dev-dependencies] -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml index beffc93e6..194e5c66a 100644 --- a/crates/kitsune-http-signatures/Cargo.toml +++ b/crates/kitsune-http-signatures/Cargo.toml @@ -8,12 +8,12 @@ base64-simd = "0.8.0" derive_builder = "0.12.0" http = "0.2.9" rayon = "1.8.0" -ring = { version = "0.17.0", features = ["std"] } -time = { version = "0.3.29", features = ["formatting", "parsing"] } +ring = { version = "0.17.3", features = ["std"] } +time = { version = "0.3.30", features = ["formatting", "parsing"] } thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["sync"] } +tokio = { version = "1.33.0", features = ["sync"] } [dev-dependencies] pem = "3.0.2" pkcs8 = { version = "0.10.2", features = ["alloc"] } -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-language/Cargo.toml b/crates/kitsune-language/Cargo.toml index 5c9a1e0da..44cc2e1ed 100644 --- a/crates/kitsune-language/Cargo.toml +++ b/crates/kitsune-language/Cargo.toml @@ -4,7 +4,7 @@ edition.workspace = true version.workspace = true [dependencies] -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = { version = "0.4.1", features = ["postgres"] } isolang = { version = "2.3.0", features = [ "english_names", diff --git a/crates/kitsune-messaging/Cargo.toml b/crates/kitsune-messaging/Cargo.toml index 05b1a797e..c41fc8726 100644 --- a/crates/kitsune-messaging/Cargo.toml +++ b/crates/kitsune-messaging/Cargo.toml @@ -14,8 +14,8 @@ redis = { version = "0.23.3", features = [ "connection-manager", "tokio-rustls-comp", ] } -serde = "1.0.188" -simd-json = "0.11.1" -tokio = { version = "1.32.0", features = ["macros", "rt", "sync"] } +serde = "1.0.189" +simd-json = "0.12.0" +tokio = { version = "1.33.0", features = ["macros", "rt", "sync"] } tokio-stream = { version = "0.1.14", features = ["sync"] } -tracing = "0.1.37" +tracing = "0.1.39" diff --git a/crates/kitsune-retry-policies/Cargo.toml b/crates/kitsune-retry-policies/Cargo.toml index ebd31ba7d..58f46306c 100644 --- a/crates/kitsune-retry-policies/Cargo.toml +++ b/crates/kitsune-retry-policies/Cargo.toml @@ -9,4 +9,4 @@ futures-retry-policies = { version = "0.3.1", features = [ "tokio", "tracing", ] } -retry-policies = "0.2.0" +retry-policies = "0.2.1" diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml index d58690246..d0808fb73 100644 --- a/crates/kitsune-search/Cargo.toml +++ b/crates/kitsune-search/Cargo.toml @@ -5,18 +5,18 @@ version.workspace = true [dependencies] async-trait = "0.1.73" -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = "0.4.1" diesel_full_text_search = { version = "2.1.0", default-features = false } enum_dispatch = "0.3.12" futures-util = "0.3.28" kitsune-db = { path = "../kitsune-db" } kitsune-language = { path = "../kitsune-language" } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } speedy-uuid = { path = "../../lib/speedy-uuid" } strum = { version = "0.25.0", features = ["derive"] } thiserror = "1.0.49" -tracing = "0.1.37" +tracing = "0.1.39" # "meilisearch" feature meilisearch-sdk = { version = "0.24.2", optional = true } diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml index dac31a01b..2418c4db3 100644 --- a/crates/kitsune-storage/Cargo.toml +++ b/crates/kitsune-storage/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true [dependencies] async-trait = "0.1.73" -aws-sdk-s3 = "0.31.2" +aws-sdk-s3 = "0.33.0" aws-smithy-http = "0.56.1" bytes = "1.5.0" enum_dispatch = "0.3.12" @@ -14,7 +14,7 @@ http = "0.2.9" http-body = "0.4.5" pin-project-lite = "0.2.13" sync_wrapper = "0.1.2" -tokio = { version = "1.32.0", features = ["fs", "io-util"] } +tokio = { version = "1.33.0", features = ["fs", "io-util"] } tokio-util = { version = "0.7.9", features = ["io"] } [dev-dependencies] @@ -22,4 +22,4 @@ aws-credential-types = { version = "0.56.1", features = [ "hardcoded-credentials", ] } tempfile = "3.8.0" -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml index 3f664478b..1a32e5d36 100644 --- a/crates/kitsune-test/Cargo.toml +++ b/crates/kitsune-test/Cargo.toml @@ -5,7 +5,7 @@ version.workspace = true [dependencies] deadpool-redis = "0.13.0" -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = "0.4.1" futures-util = "0.3.28" kitsune-db = { path = "../kitsune-db" } diff --git a/crates/kitsune-type/Cargo.toml b/crates/kitsune-type/Cargo.toml index caec998df..cdb4034e4 100644 --- a/crates/kitsune-type/Cargo.toml +++ b/crates/kitsune-type/Cargo.toml @@ -5,11 +5,11 @@ edition.workspace = true [dependencies] iso8601-timestamp = "0.2.12" -serde = { version = "1.0.188", features = ["derive"] } -simd-json = "0.11.1" +serde = { version = "1.0.189", features = ["derive"] } +simd-json = "0.12.0" smol_str = { version = "0.2.0", features = ["serde"] } speedy-uuid = { path = "../../lib/speedy-uuid", features = ["serde"] } -utoipa = { version = "3.5.0", features = ["chrono", "uuid"] } +utoipa = { version = "4.0.0", features = ["chrono", "uuid"] } [dev-dependencies] pretty_assertions = "1.4.0" diff --git a/flake.lock b/flake.lock index defd6ae49..ab7d3adbb 100644 --- a/flake.lock +++ b/flake.lock @@ -140,11 +140,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1696299134, - "narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=", + "lastModified": 1697249410, + "narHash": "sha256-OmsnxNsjBB1DJlUuJyzDJJ7psbm4/VzokNT+o0ajzFQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d", + "rev": "dce60ca7fca201014868c08a612edb73a998310f", "type": "github" }, "original": { diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml index 1f40a2850..2dbbb57d2 100644 --- a/kitsune-cli/Cargo.toml +++ b/kitsune-cli/Cargo.toml @@ -7,15 +7,14 @@ build = "build.rs" [dependencies] clap = { version = "4.4.6", features = ["derive"] } color-eyre = "0.6.2" -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = "0.4.1" dotenvy = "0.15.7" envy = "0.4.2" kitsune-db = { path = "../crates/kitsune-db" } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } speedy-uuid = { path = "../lib/speedy-uuid" } -time = "0.3.29" -tokio = { version = "1.32.0", features = ["full"] } +tokio = { version = "1.33.0", features = ["full"] } tracing-subscriber = "0.3.17" [build-dependencies] diff --git a/kitsune-job-runner/Cargo.toml b/kitsune-job-runner/Cargo.toml index 7e5616b2f..e6be3b506 100644 --- a/kitsune-job-runner/Cargo.toml +++ b/kitsune-job-runner/Cargo.toml @@ -12,8 +12,8 @@ kitsune-core = { path = "../crates/kitsune-core" } kitsune-db = { path = "../crates/kitsune-db" } kitsune-retry-policies = { path = "../crates/kitsune-retry-policies" } mimalloc = "0.1.39" -tokio = { version = "1.32.0", features = ["full"] } +tokio = { version = "1.33.0", features = ["full"] } toml = "0.8.2" -tracing = "0.1.37" +tracing = "0.1.39" [features] diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index d46772cc8..627f38226 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -7,18 +7,13 @@ homepage = "https://joinkitsune.org" build = "build.rs" [dependencies] -athena = { version = "0.0.1-pre.3", path = "../lib/athena" } +athena = { path = "../lib/athena" } argon2 = { version = "0.5.2", features = ["std"] } -autometrics = { version = "0.6.0", default-features = false } askama = { version = "0.12.1", features = [ "with-axum", ], default-features = false } askama_axum = "0.3.0" async-trait = "0.1.73" -aws-credential-types = { version = "0.56.1", features = [ - "hardcoded-credentials", -] } -aws-sdk-s3 = "0.31.2" axum = { version = "0.6.20", features = ["headers", "macros", "multipart"] } axum-extra = { version = "0.8.0", features = [ "cookie", @@ -31,9 +26,8 @@ chrono = { version = "0.4.31", default-features = false } clap = { version = "4.4.6", features = ["derive"] } color-eyre = "0.6.2" const-oid = { version = "0.9.5", features = ["db"] } -deadpool-redis = "0.13.0" der = { version = "0.7.8", features = ["std"] } -diesel = "2.1.2" +diesel = "2.1.3" diesel-async = "0.4.1" eyre = "0.6.8" futures-util = "0.3.28" @@ -50,30 +44,27 @@ kitsune-cache = { path = "../crates/kitsune-cache" } kitsune-captcha = { path = "../crates/kitsune-captcha" } kitsune-core = { path = "../crates/kitsune-core" } kitsune-db = { path = "../crates/kitsune-db" } -kitsune-email = { path = "../crates/kitsune-email" } kitsune-embed = { path = "../crates/kitsune-embed" } kitsune-http-client = { path = "../crates/kitsune-http-client" } kitsune-http-signatures = { path = "../crates/kitsune-http-signatures" } kitsune-job-runner = { path = "../kitsune-job-runner" } -kitsune-language = { path = "../crates/kitsune-language", default-features = false } -kitsune-messaging = { path = "../crates/kitsune-messaging" } +kitsune-language = { path = "../crates/kitsune-language" } kitsune-search = { path = "../crates/kitsune-search" } kitsune-storage = { path = "../crates/kitsune-storage" } kitsune-type = { path = "../crates/kitsune-type" } oxide-auth = "0.5.4" oxide-auth-async = "0.1.1" oxide-auth-axum = "0.3.0" -redis = "0.23.3" scoped-futures = "0.1.3" -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } serde_urlencoded = "0.7.1" -simd-json = "0.11.1" +simd-json = "0.12.0" speedy-uuid = { path = "../lib/speedy-uuid" } strum = { version = "0.25.0", features = ["derive", "phf"] } tempfile = "3.8.0" thiserror = "1.0.49" -time = "0.3.29" -tokio = { version = "1.32.0", features = ["full"] } +time = "0.3.30" +tokio = { version = "1.33.0", features = ["full"] } tokio-util = { version = "0.7.9", features = ["compat"] } tower-http = { version = "0.4.4", features = [ "catch-panic", @@ -82,13 +73,13 @@ tower-http = { version = "0.4.4", features = [ "timeout", "trace", ] } -tracing = "0.1.37" +tracing = "0.1.39" tracing-error = "0.2.0" tracing-subscriber = "0.3.17" typed-builder = "0.16.2" url = "2.4.1" -utoipa = { version = "3.5.0", features = ["axum_extras", "time", "uuid"] } -utoipa-swagger-ui = { version = "3.1.5", features = ["axum"] } +utoipa = { version = "4.0.0", features = ["axum_extras", "uuid"] } +utoipa-swagger-ui = { version = "4.0.0", features = ["axum"] } # --- Optional dependencies --- @@ -111,7 +102,7 @@ metrics-tracing-context = { version = "0.14.0", optional = true } metrics-util = { version = "0.15.1", optional = true } # "oidc" feature -openidconnect = { version = "3.3.1", default-features = false, optional = true } +openidconnect = { version = "3.4.0", default-features = false, optional = true } [dev-dependencies] kitsune-test = { path = "../crates/kitsune-test" } @@ -129,7 +120,7 @@ graphql-api = [ mastodon-api = ["kitsune-core/mastodon-api"] meilisearch = ["kitsune-core/meilisearch"] metrics = [ - "autometrics/metrics", + "kitsune-core/metrics", "dep:axum-prometheus", "dep:metrics", "dep:metrics-exporter-prometheus", diff --git a/kitsune/src/http/middleware.rs b/kitsune/src/http/middleware.rs index cf672f166..e12615976 100644 --- a/kitsune/src/http/middleware.rs +++ b/kitsune/src/http/middleware.rs @@ -22,7 +22,7 @@ pub async fn json_to_urlencoded(req: Request, next: Next) -> Respons }; let (parts, body) = req.into_parts(); - let json_value = match hyper::body::to_bytes(body) + let json_value = match hyper::body::aggregate(body) .await .map(|bytes| simd_json::from_reader::<_, OwnedValue>(bytes.reader())) { diff --git a/kitsune/src/http/openapi.rs b/kitsune/src/http/openapi.rs index 124df2c9c..4dd4d1ddc 100644 --- a/kitsune/src/http/openapi.rs +++ b/kitsune/src/http/openapi.rs @@ -115,7 +115,9 @@ struct CommonApiDocs; mastodon::api::v1::statuses::put, mastodon::api::v1::statuses::context::get, mastodon::api::v1::statuses::favourite::post, + mastodon::api::v1::statuses::favourited_by::get, mastodon::api::v1::statuses::reblog::post, + mastodon::api::v1::statuses::reblogged_by::get, mastodon::api::v1::statuses::source::get, mastodon::api::v1::statuses::unfavourite::post, mastodon::api::v1::statuses::unreblog::post, diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index 3c0174f72..141a2bafe 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -21,14 +21,14 @@ redis = { version = "0.23.3", default-features = false, features = [ "streams", "tokio-rustls-comp", ] } -retry-policies = "0.2.0" -serde = { version = "1.0.188", features = ["derive"] } -simd-json = "0.11.1" +retry-policies = "0.2.1" +serde = { version = "1.0.189", features = ["derive"] } +simd-json = "0.12.0" smol_str = "0.2.0" speedy-uuid = { path = "../speedy-uuid", features = ["redis", "serde"] } thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["macros", "rt", "sync"] } -tracing = "0.1.37" +tokio = { version = "1.33.0", features = ["macros", "rt", "sync"] } +tracing = "0.1.39" typed-builder = "0.16.2" [dev-dependencies] diff --git a/lib/post-process/Cargo.toml b/lib/post-process/Cargo.toml index 611b460c3..8e7b49427 100644 --- a/lib/post-process/Cargo.toml +++ b/lib/post-process/Cargo.toml @@ -13,7 +13,7 @@ criterion = { version = "0.5.1", default-features = false, features = [ "rayon", ] } futures = "0.3.28" -insta = { version = "1.33.0", features = ["glob"] } +insta = { version = "1.34.0", features = ["glob"] } pretty_assertions = "1.4.0" [[bench]] diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index 248b1de04..ceec43cd5 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -5,12 +5,12 @@ version.workspace = true [dependencies] async-graphql = { version = "6.0.7", default-features = false, optional = true } -diesel = { version = "2.1.2", features = [ +diesel = { version = "2.1.3", features = [ "postgres_backend", "uuid", ], optional = true } redis = { version = "0.23.3", default-features = false, optional = true } -serde = { version = "1.0.188", optional = true } +serde = { version = "1.0.189", optional = true } thiserror = "1.0.49" uuid = { version = "1.4.1", features = ["fast-rng", "v7"] } uuid-simd = { version = "0.8.0", features = ["uuid"] }