diff --git a/Cargo.lock b/Cargo.lock index 3c791a911..5bd061617 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -332,9 +332,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "7.0.9" +version = "7.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d37c3e9ba322eb00e9e5e997d58f08e8b6de037325b9367ac59bca8e3cd46af" +checksum = "a19415d9541f1758f39bdf0c732848beb7e2e39df9b32f90c6635882c3f9173a" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "async-graphql-axum" -version = "7.0.9" +version = "7.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329afc4fc7359f112b7593bc930b788544cedbc97c4fbdf1db21e58704b4b5d0" +checksum = "34fbb437078dc4c7303eda9022557e644e9037cb1c0a8a032573a278beb417d5" dependencies = [ "async-graphql", "async-trait", @@ -387,9 +387,9 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "7.0.9" +version = "7.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1141703c11c6ad4fa9b3b0e1e476dea01dbd18a44db00f949b804afaab2f344" +checksum = "73a85254454f63ae1e5a475afff931465f11bf76d19fb5bb1b1d0d6a2f2b8db0" dependencies = [ "Inflector", "async-graphql-parser", @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "7.0.9" +version = "7.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f66edcce4c38c18f7eb181fdf561c3d3aa2d644ce7358fc7a928c00a4ffef17" +checksum = "2e94b202e404d18429c8482d61f64cb0a8639fd1e7c2caf2b258f035e0b7caff" dependencies = [ "async-graphql-value", "pest", @@ -416,9 +416,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "7.0.9" +version = "7.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0206011cad065420c27988f17dd7fe201a0e056b20c262209b7bffcd6fa176" +checksum = "a43a7bbb0ddea47c6f51913eba6e17a093b34e000588a93bb80a978ad129f3e9" dependencies = [ "bytes", "indexmap 2.5.0", @@ -450,9 +450,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -892,9 +892,9 @@ checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" [[package]] name = "cap-fs-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb23061fc1c4ead4e45ca713080fe768e6234e959f5a5c399c39eb41aa34e56e" +checksum = "712695628f77a28acd7c9135b9f05f9c1563f8eb91b317f63876bac550032403" dependencies = [ "cap-primitives", "cap-std", @@ -904,9 +904,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" +checksum = "7d609980992759cef960324ccece956ee87929cc05a75d6546168192063dd8b1" dependencies = [ "cap-primitives", "cap-std", @@ -916,9 +916,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d00bd8d26c4270d950eaaa837387964a2089a1c3c349a690a1fa03221d29531" +checksum = "ff5bcbaf57897c8f14098cc9ad48a78052930a9948119eea01b80ca224070fa6" dependencies = [ "ambient-authority", "fs-set-times", @@ -933,9 +933,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbcb16a619d8b8211ed61f42bd290d2a1ac71277a69cf8417ec0996fa92f5211" +checksum = "e7c780812948b31f362c3bab82d23b902529c26705d0e094888bc7fdb9656908" dependencies = [ "ambient-authority", "rand 0.8.5", @@ -943,9 +943,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19eb8e3d71996828751c1ed3908a439639752ac6bdc874e41469ef7fc15fbd7f" +checksum = "e6cf1a22e6eab501e025a9953532b1e95efb8a18d6364bf8a4a7547b30c49186" dependencies = [ "cap-primitives", "io-extras", @@ -955,9 +955,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61142dc51e25b7acc970ca578ce2c3695eac22bbba46c1073f5f583e78957725" +checksum = "1e1547a95cd071db92382c649260bcc6721879ef5d1f0f442af33bff75003dd7" dependencies = [ "ambient-authority", "cap-primitives", @@ -1294,18 +1294,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5264b5d315c515e0845dcd2cc1697ea0018d739d58b47477f8455842583568" +checksum = "a6e376bd92bddd03dcfc443b14382611cae5d10012aa0b1628bbf18bb73f12f7" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2797648025a7b2e32ec49fb2f71655fed74453cd41e209c6e39fd3107654f8" +checksum = "45ecbe07f25a8100e5077933516200e97808f1d7196b5a073edb85fa08fde32e" dependencies = [ "serde", "serde_derive", @@ -1313,9 +1313,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548a3af0d36a36bab5c6a3bb8684816d501fd012c3328beb0f57dbbcb364c479" +checksum = "bc60913f32c1de18538c28bef74b8c87cf16de7841a1b0956fcf01b23237853a" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1336,33 +1336,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9001ad2a4893d3505be514d3b55acc6d7efecba4bcc9ab6a7c4d422765c84202" +checksum = "bae009e7822f47aa55e7dcef846ccf3aa4eb102ca6b4bcb8a44b36f3f49aa85c" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df4b34c22fdfd5d95287ae0cc766e962a976754f0cf7daa4bfa5c6af55c5fb6b" +checksum = "0c78f01a852536c68e34444450f845ed6e0782a1f047f85397fe460b8fbce8f1" [[package]] name = "cranelift-control" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d78c20a5ba56200e691e0a62d15ffd18ffc781064443acbadce1f7dc847917" +checksum = "7a061b22e00a9e36b31f2660dfb05a9617b7775bd54b79754d3bb75a990dac06" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e9d6c799b0775d43211d983b5f9230ea604063003cb6d492daf8dcac51da9b" +checksum = "95e2b261a3e74ae42f4e606906d5ffa44ee2684e8b1ae23bdf75d21908dc9233" dependencies = [ "cranelift-bitset", "serde", @@ -1371,9 +1371,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1bd2fdbe0c0c10fcee7826c00ea0e7b2a0c4e95e6a879d88e11c006587560f" +checksum = "fe14abba0e6bab42aca0f9ce757f96880f9187e88bc6cb975ed6acd8a42f7770" dependencies = [ "cranelift-codegen", "log", @@ -1383,15 +1383,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12b357f51e34f8e271977a5f422940aa985943d14ee8d49f66c6459ef458511" +checksum = "311d91ae72b37d4262b51217baf8c9e01f1afd5148931468da1fdb7e9d011347" [[package]] name = "cranelift-native" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da80e271413343c8ca2ca3375360a8d486355063bf96547db9714f2ac4580629" +checksum = "2a3f84c75e578189ff7a716c24ad83740b553bf583f2510b323bfe4c1a74bb93" dependencies = [ "cranelift-codegen", "libc", @@ -1400,9 +1400,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.112.0" +version = "0.112.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9276bbb4bbf05ba98dba1d07a506acc9ac1e15a500530399ff8aee70860118" +checksum = "f56b7b2476c47b2091eee5a20bc54a80fbb29ca5313ae2bd0dea52621abcfca1" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2964,9 +2964,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2977,7 +2977,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower 0.4.13", "tower-service", "tracing", ] @@ -3462,7 +3461,6 @@ dependencies = [ "oxide-auth", "oxide-auth-async", "oxide-auth-axum", - "pretty_assertions", "rust-embed", "scoped-futures", "serde", @@ -3879,7 +3877,6 @@ version = "0.0.1-pre.6" dependencies = [ "enum_dispatch", "fred", - "http", "http-body-util", "kitsune-config", "kitsune-derive", @@ -4210,9 +4207,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -5760,9 +5757,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags 2.6.0", ] @@ -6372,9 +6369,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -7233,9 +7230,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.5.0", "serde", @@ -7315,9 +7312,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41515cc9e193536d93fd0dbbea0c73819c08eca76e0b30909a325c3ec90985bb" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ "async-compression", "bitflags 2.6.0", @@ -7940,9 +7937,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e025f6280f91611a59f38057e0a4e72fbc08a2a4e6ed753a0d1970ac634a997" +checksum = "03601559991d459a228236a49135364eac85ac00dc07b65fb95ae61a957793af" dependencies = [ "addr2line 0.22.0", "anyhow", @@ -7989,18 +7986,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2977f9d1d1228154598e8d1cc5d55c4aa744297e9a3523b258e20d6ba0cbc3c9" +checksum = "e453b3bde07312874c0c6703e2de9281daab46646172c1b71fa59a97226f858e" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-component-macro" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b4bc589d7839d8dbfc4f4a0ea3380b11062ae26ff77c3a133c202fc4b21a31" +checksum = "4a6faeabbdbfd27e24e8d5204207ba9c247a13cf84181ea721b5f209f281fe01" dependencies = [ "anyhow", "proc-macro2", @@ -8013,15 +8010,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8553d3720625ad4e65a9c71e215566361fcefc4e4001f17e7c669c503c33e6f6" +checksum = "6b1b24db4aa3dc7c0d3181d1833b4fe9ec0cd3f08780b746415c84c0a9ec9011" [[package]] name = "wasmtime-cranelift" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b81791925aa182f0816562b8b41b9546077ba3a789ca18454a3ffe083963a" +checksum = "c737bef9ea94aab874e29ac6a8688b89ceb43c7b51f047079c43387972c07ee3" dependencies = [ "anyhow", "cfg-if", @@ -8044,9 +8041,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe742ef5ee9ce201e513ee8da472eaf198e760499a730853622fc85a61cfb1eb" +checksum = "817bfa9ea878ec37aa24f85fd6912844e8d87d321662824cf920d561b698cdfd" dependencies = [ "anyhow", "cranelift-bitset", @@ -8069,9 +8066,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be377649da32af7b3eadd3ab5c89d645bdf0f5af9fe4fc59da457fbe4a87cdd" +checksum = "5070971b479b4e4879dbae8a8e1efee738a36d047c5738acfedb38d6740b79d1" dependencies = [ "anyhow", "cc", @@ -8084,9 +8081,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67e6379ff6f5eb316e4fe2baaf360c7871082006fc31addf3cf58011edb855c" +checksum = "48011232c0da424f89c3752a378d0b7f512fae321ea414a43e1e7a302a6a1f7e" dependencies = [ "anyhow", "cfg-if", @@ -8096,15 +8093,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1daff42dc6660aa4aead9586a1c41e498a1c15674784589aeb5c5090d09930" +checksum = "d9858a22e656ae8574631221b474b8bebf63f1367fcac3f179873833eabc2ced" [[package]] name = "wasmtime-types" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24adc06abbf23bf9abbdc4b4a3bb743436a60a2a76dfabb2e49bf5237d0dadcc" +checksum = "4d14b8a9206fe94485a03edb1654cd530dbd2a859a85a43502cb4e99653a568c" dependencies = [ "anyhow", "cranelift-entity", @@ -8116,9 +8113,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467bf568f44048477d865a7bb42a1876acd1e2d3de77b42307f5d8e0126fc241" +checksum = "e9bb1f01efb8b542eadfda511e8ea1cc54309451aba97b69969e5b1a59cb7ded" dependencies = [ "proc-macro2", "quote", @@ -8127,9 +8124,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7155aadce49095eeced1a18634a443c8d8fdd2a23bb61f933774393a2c4acf" +checksum = "2cc26a3923937186f5a4a4fa44d9dd1a7a389bbb06f8bac03cde2d52aad3ace8" dependencies = [ "anyhow", "async-trait", @@ -8157,9 +8154,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8fdcd0682324b16fac3f3dd12eb4325d175e849b771aeda6edcb3065c85a4a" +checksum = "b238eeaf55652df0e63a6829d1ca9ef726d63517f56194faa0f6b9941f8d9151" dependencies = [ "anyhow", "cranelift-codegen", @@ -8174,9 +8171,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb8a4c5f38371e9dc1718421b03bc8737696587af5e1b233ea515ba5a111d106" +checksum = "eb1596caa67b31ac675fd3da61685c4260f8b10832021db42c85d227b7ba8133" dependencies = [ "anyhow", "heck 0.4.1", @@ -8301,9 +8298,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b160fca5249410873830548ba7b1d956d8bf2afe72ced5e78266622d07de1303" +checksum = "4ac790aaeff15764481c731239a45346df3f0af966839ac1575f49989fdbb542" dependencies = [ "anyhow", "cranelift-codegen", @@ -8485,9 +8482,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml index 68c8e8b2f..74a14c95e 100644 --- a/crates/kitsune-activitypub/Cargo.toml +++ b/crates/kitsune-activitypub/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license.workspace = true [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" base64-simd = "0.8.0" diesel = { workspace = true } diesel-async = { workspace = true } diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index a84690a6b..b4f1d7696 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license.workspace = true [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" const_format = "0.2.33" git-version = "0.3.9" kitsune-db = { workspace = true } diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml index a7e942672..690570c57 100644 --- a/crates/kitsune-http-client/Cargo.toml +++ b/crates/kitsune-http-client/Cargo.toml @@ -15,7 +15,7 @@ http-body = "1.0.1" http-body-util = "0.1.2" http-signatures = { workspace = true } hyper = "1.4.1" -hyper-util = { version = "0.1.8", features = [ +hyper-util = { version = "0.1.9", features = [ "client-legacy", "http1", "http2", @@ -35,7 +35,7 @@ serde = "1.0.210" simdutf8 = { workspace = true } sonic-rs = { workspace = true } tower = { version = "0.5.1", features = ["util"] } -tower-http = { version = "0.6.0", features = [ +tower-http = { version = "0.6.1", features = [ # Explicitly exclude `zstd` # It's not widely adopted and takes a long time to build "decompression-br", diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml index c5cdf2e02..a98ebeed6 100644 --- a/crates/kitsune-observability/Cargo.toml +++ b/crates/kitsune-observability/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license.workspace = true [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" eyre = "0.6.12" http-body-util = "0.1.2" hyper = { version = "1.4.1", default-features = false } diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml index d73b49671..e7e685835 100644 --- a/crates/kitsune-oidc/Cargo.toml +++ b/crates/kitsune-oidc/Cargo.toml @@ -8,7 +8,6 @@ license.workspace = true [dependencies] enum_dispatch = "0.3.13" fred = { workspace = true } -http = "1.1.0" http-body-util = "0.1.2" kitsune-config = { workspace = true } kitsune-derive = { workspace = true } diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml index 614b2c527..e7b84564d 100644 --- a/crates/kitsune-search/Cargo.toml +++ b/crates/kitsune-search/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license.workspace = true [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" bytes = "1.7.2" diesel = { workspace = true } diesel-async = { workspace = true } diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml index bd40243b3..b8d70b344 100644 --- a/crates/kitsune-wasm-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true build = "build.rs" [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" blake3 = "1.5.4" color-eyre = "0.6.3" derive_more = { version = "1.0.0", features = ["from"] } @@ -29,7 +29,7 @@ tokio = { workspace = true, features = ["fs"] } tracing = "0.1.40" triomphe = { workspace = true } walkdir = "2.5.0" -wasmtime = { version = "25.0.0", default-features = false, features = [ +wasmtime = { version = "25.0.1", default-features = false, features = [ "addr2line", "async", "component-model", @@ -38,7 +38,7 @@ wasmtime = { version = "25.0.0", default-features = false, features = [ "pooling-allocator", "runtime", ] } -wasmtime-wasi = { version = "25.0.0", default-features = false } +wasmtime-wasi = { version = "25.0.1", default-features = false } [dev-dependencies] tempfile = "3.12.0" diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml index a21e97d00..1841d1a86 100644 --- a/crates/kitsune-webfinger/Cargo.toml +++ b/crates/kitsune-webfinger/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license.workspace = true [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" fred = { workspace = true } futures-util = "0.3.30" http = "1.1.0" diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index 893ca30fc..f1f9302cc 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -19,7 +19,7 @@ athena = { workspace = true } argon2 = { version = "0.5.3", features = ["std"] } askama = { workspace = true } askama_axum = "0.4.0" -async-trait = "0.1.82" +async-trait = "0.1.83" axum = { version = "0.7.6", features = ["macros", "multipart"] } axum-extra = { version = "0.9.4", features = [ "cookie", @@ -88,7 +88,7 @@ tokio-util = { version = "0.7.12", features = ["io"] } tower = { version = "0.5.1", features = ["util"] } tower-stop-using-brave = { workspace = true } tower-x-clacks-overhead = { workspace = true } -tower-http = { version = "0.6.0", features = [ +tower-http = { version = "0.6.1", features = [ "catch-panic", "cors", "fs", @@ -106,14 +106,14 @@ url = "2.5.2" # --- Optional dependencies --- # "graphql" feature -async-graphql = { version = "7.0.9", default-features = false, features = [ +async-graphql = { version = "7.0.10", default-features = false, features = [ "graphiql", "tempfile", "time", "tracing", "uuid", ], optional = true } -async-graphql-axum = { version = "7.0.9", optional = true } +async-graphql-axum = { version = "7.0.10", optional = true } # "mastodon-api" feature kitsune-mastodon = { workspace = true, optional = true } @@ -129,7 +129,6 @@ kitsune-scss-compiler = { workspace = true } [dev-dependencies] kitsune-http-client = { workspace = true } kitsune-test = { workspace = true } -pretty_assertions = "1.4.1" fred = { workspace = true } [features] diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index 28d5b9165..4c40cf909 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -11,7 +11,7 @@ required-features = ["redis"] [dependencies] ahash = "0.8.11" -async-trait = "0.1.82" +async-trait = "0.1.83" either = { version = "1.13.0", default-features = false, optional = true } futures-util = { version = "0.3.30", default-features = false } iso8601-timestamp = { workspace = true } diff --git a/lib/cursiv/Cargo.toml b/lib/cursiv/Cargo.toml index 0a663cbe2..152fdf8f9 100644 --- a/lib/cursiv/Cargo.toml +++ b/lib/cursiv/Cargo.toml @@ -18,7 +18,7 @@ triomphe = { workspace = true } zeroize = { version = "1.8.1", features = ["derive"] } # `axum` feature -async-trait = { version = "0.1.82", optional = true } +async-trait = { version = "0.1.83", optional = true } axum-core = { version = "0.4.4", optional = true } [dev-dependencies] diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml index 19c210ce4..943a083f2 100644 --- a/lib/geomjeungja/Cargo.toml +++ b/lib/geomjeungja/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license = "MIT OR Apache-2.0" [dependencies] -async-trait = "0.1.82" +async-trait = "0.1.83" hickory-resolver = "0.24.1" rand = "0.8.5" serde = { version = "1.0.210", features = ["derive"] } diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index c4cfac5f6..d9a141e51 100644 --- a/lib/speedy-uuid/Cargo.toml +++ b/lib/speedy-uuid/Cargo.toml @@ -6,7 +6,7 @@ version.workspace = true license = "MIT OR Apache-2.0" [dependencies] -async-graphql = { version = "7.0.9", default-features = false, optional = true } +async-graphql = { version = "7.0.10", default-features = false, optional = true } diesel = { version = "2.2.4", default-features = false, features = [ "postgres_backend", "uuid", diff --git a/lib/tick-tock-mock/src/lib.rs b/lib/tick-tock-mock/src/lib.rs index f446f53d0..66be862a2 100644 --- a/lib/tick-tock-mock/src/lib.rs +++ b/lib/tick-tock-mock/src/lib.rs @@ -35,6 +35,7 @@ pub struct MockHandle { impl MockHandle { /// Adjust the delta by the duration in the direction specified + #[inline] pub fn adjust(&self, direction: DeltaDirection, delta: Duration) { let Some(delta_handle) = self.delta.upgrade() else { return; @@ -48,10 +49,11 @@ impl MockHandle { delta_handle.fetch_add(delta, Ordering::AcqRel); } - /// Set the delta to the absolute value - pub fn set_delta(&self, delta: i64) { + /// Reset the offset to 0 + #[inline] + pub fn reset(&self) { if let Some(delta_handle) = self.delta.upgrade() { - delta_handle.store(delta, Ordering::Release); + delta_handle.store(0, Ordering::Release); } } } @@ -75,6 +77,7 @@ pub struct Clock { impl Clock { /// Construct a new clock without an internal delta + #[inline] #[must_use] pub fn new() -> Self { Self::default() @@ -83,6 +86,7 @@ impl Clock { /// Construct a mockable clock /// /// This clock returns a handle which you can use to adjust the delta + #[inline] #[must_use] pub fn mockable() -> (Self, MockHandle) { let delta = Arc::new(AtomicI64::default()); @@ -98,6 +102,7 @@ impl Clock { /// Enter a context where this clock is installed into the thread-local context /// /// As long as the guard is kept live, the [`now`] function will read the time of this clock + #[inline] #[must_use] pub fn enter(&self) -> ClockGuard { let old_clock = THREAD_CLOCK.with(|clock| clock.replace(self.clone())); @@ -108,6 +113,7 @@ impl Clock { } /// Read the current time from the system clock and apply the delta + #[inline] #[must_use] pub fn now(&self) -> SystemTime { let mut now = SystemTime::now(); @@ -126,6 +132,7 @@ impl Clock { } /// Read the current time from the thread-local clock +#[inline] #[must_use] pub fn now() -> SystemTime { THREAD_CLOCK.with(|clock| clock.borrow().now()) @@ -161,4 +168,25 @@ mod test { let delta = now.duration_since(after).unwrap(); assert_eq!(delta.as_secs_f32().round() as u8, 1); } + + #[test] + fn can_reset() { + let (clock, mock) = Clock::mockable(); + let _clock_guard = clock.enter(); + + let now = crate::now(); + mock.adjust(DeltaDirection::Add, Duration::from_secs(10)); + let adjusted = crate::now(); + mock.reset(); + let reset = crate::now(); + + // "adjusted" should be ahead of "now" and "reset" + assert!(now < adjusted && reset < adjusted); + + // "now" and "reset" should be pretty much equal + // + // Technically this very much depends on the system clock and execution speed, + // but it should pretty much always hold true + assert_eq!(reset.duration_since(now).unwrap().as_secs(), 0); + } }