From 3f3f73532aaec3f1514ef21534920c67ee076c31 Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Sat, 1 Jun 2024 20:28:23 +0200 Subject: [PATCH] Update dependencies and sonic-rs commit (#544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies and sonic-rs commit * flake.lock: Update Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/7e468a455506f2e65550e08dfd45092f0857a009' (2024-03-25) → 'github:ipetkov/crane/480dff0be03dac0e51a8dfc26e882b0d123a450e' (2024-05-29) • Updated input 'devenv': 'github:cachix/devenv/19098329b4e79f60705d7fb241a3617266658f98' (2024-03-29) → 'github:cachix/devenv/c3f9f053c077c6f88a3de5276d9178c62baa3fc3' (2024-06-01) • Updated input 'devenv/cachix': 'github:cachix/cachix/661bbb7f8b55722a0406456b15267b5426a3bda6' (2024-03-15) → 'github:cachix/cachix/02e38da89851ec7fec3356a5c04bc8349cae0e30' (2024-04-02) • Updated input 'devenv/cachix/devenv/nix': 'github:domenkozar/nix/ecd0af0c1f56de32cbad14daa1d82a132bf298f8' (2024-02-22) → 'github:domenkozar/nix/b24a9318ea3f3600c1e24b4a00691ee912d4de12' (2024-04-12) • Updated input 'devenv/cachix/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) → follows 'devenv/flake-compat' • Updated input 'devenv/cachix/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15) → follows 'devenv/pre-commit-hooks' • Removed input 'devenv/cachix/pre-commit-hooks/flake-compat' • Removed input 'devenv/cachix/pre-commit-hooks/flake-utils' • Removed input 'devenv/cachix/pre-commit-hooks/flake-utils/systems' • Removed input 'devenv/cachix/pre-commit-hooks/gitignore' • Removed input 'devenv/cachix/pre-commit-hooks/gitignore/nixpkgs' • Removed input 'devenv/cachix/pre-commit-hooks/nixpkgs' • Removed input 'devenv/cachix/pre-commit-hooks/nixpkgs-stable' • Updated input 'devenv/nix': 'github:domenkozar/nix/c5bbf14ecbd692eeabf4184cc8d50f79c2446549' (2024-03-15) → 'github:domenkozar/nix/b24a9318ea3f3600c1e24b4a00691ee912d4de12' (2024-04-12) • Updated input 'devenv/nix/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → follows 'devenv/flake-compat' • Updated input 'devenv/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15) → 'github:cachix/pre-commit-hooks.nix/2ac4dcbf55ed43f3be0bae15e181f08a57af24a4' (2024-04-22) • Updated input 'devenv/pre-commit-hooks/flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'devenv/pre-commit-hooks/gitignore': 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29) → 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394' (2024-02-28) • Updated input 'devenv/pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10) → 'github:NixOS/nixpkgs/614b4613980a522ba49f0d194531beddbb7220d3' (2024-03-17) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2726f127c15a4cc9810843b96cad73c7eb39e443' (2024-03-27) → 'github:nixos/nixpkgs/ad57eef4ef0659193044870c731987a6df5cf56b' (2024-05-29) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/42a168449605950935f15ea546f6f770e5f7f629' (2024-03-29) → 'github:oxalica/rust-overlay/ab69b67fac9a96709fbef0b899db308ca714a120' (2024-06-01) * fix compile error * use new define_sql_function macro --- Cargo.lock | 188 +++++++------- Cargo.toml | 12 +- crates/kitsune-activitypub/Cargo.toml | 2 +- crates/kitsune-cache/Cargo.toml | 2 +- crates/kitsune-config/Cargo.toml | 2 +- crates/kitsune-db/Cargo.toml | 6 +- crates/kitsune-db/src/function.rs | 8 +- crates/kitsune-http-client/Cargo.toml | 6 +- crates/kitsune-language/src/regconfig.rs | 7 +- crates/kitsune-observability/Cargo.toml | 2 +- crates/kitsune-s3/Cargo.toml | 2 +- crates/kitsune-service/Cargo.toml | 2 +- crates/kitsune-storage/Cargo.toml | 4 +- crates/kitsune-test/Cargo.toml | 2 +- crates/kitsune-util/Cargo.toml | 2 +- crates/kitsune-wasm-mrf/Cargo.toml | 6 +- .../kitsune-wasm-mrf/example-mrf/Cargo.toml | 2 +- crates/kitsune-webfinger/Cargo.toml | 2 +- flake.lock | 239 ++++-------------- kitsune-cli/Cargo.toml | 2 +- kitsune-job-runner/Cargo.toml | 2 +- kitsune/Cargo.toml | 2 +- lib/athena/Cargo.toml | 2 +- lib/blowocking/Cargo.toml | 2 +- lib/geomjeungja/Cargo.toml | 2 +- lib/http-signatures/Cargo.toml | 2 +- lib/just-retry/Cargo.toml | 2 +- lib/mrf-manifest/Cargo.toml | 6 +- lib/mrf-tool/Cargo.toml | 4 +- lib/speedy-uuid/Cargo.toml | 2 +- 30 files changed, 188 insertions(+), 336 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 036a5f28c..4fda6ab79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -301,9 +301,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "brotli", "flate2", @@ -806,9 +806,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1672,9 +1672,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" +checksum = "35b696af9ff4c0d2a507db2c5faafa8aa0205e297e5f11e203a24226d5355e7a" dependencies = [ "bitflags 2.5.0", "byteorder", @@ -1687,7 +1687,7 @@ dependencies = [ [[package]] name = "diesel-async" version = "0.4.1" -source = "git+https://github.com/weiznich/diesel_async.git?rev=d02798c67065d763154d7272dd0c09b39757d0f2#d02798c67065d763154d7272dd0c09b39757d0f2" +source = "git+https://github.com/weiznich/diesel_async.git?rev=3bc6789daf73563d59ed4f174241a23e9cb86686#3bc6789daf73563d59ed4f174241a23e9cb86686" dependencies = [ "async-trait", "bb8", @@ -1700,11 +1700,12 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" +checksum = "0d6fdd83d5947068817016e939596d246e5367279453f2a3433287894f2f2996" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", "syn 2.0.66", @@ -1712,18 +1713,18 @@ dependencies = [ [[package]] name = "diesel_full_text_search" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b44a057e441a6a5d802feea2646a6730cc6df99c75b7e02857a41ea90f2b30b" +checksum = "e28f8f872592a5283c3876a85c230dab8ddcc093c83660b96830c272257d03c9" dependencies = [ "diesel", ] [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -1732,9 +1733,9 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ "syn 2.0.66", ] @@ -1788,6 +1789,20 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "dsl_auto_type" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab32c18ea6760d951659768a3e35ea72fc1ba0916d665a88dfe048b2a41e543f" +dependencies = [ + "darling", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "dtoa" version = "1.0.9" @@ -2778,9 +2793,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", @@ -2810,9 +2825,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -3310,7 +3325,7 @@ dependencies = [ "serde", "smol_str", "tokio", - "toml 0.8.13", + "toml", ] [[package]] @@ -4225,19 +4240,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -4336,8 +4351,8 @@ dependencies = [ "serde", "serde_json", "thiserror", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", "wat", ] @@ -4349,7 +4364,7 @@ dependencies = [ "color-eyre", "mrf-manifest", "serde_json", - "wasmparser 0.208.1", + "wasmparser 0.209.1", "wat", ] @@ -6368,7 +6383,7 @@ dependencies = [ [[package]] name = "sonic-rs" version = "0.3.6" -source = "git+https://github.com/aumetra/sonic-rs.git?rev=d1f172d75e7c9386fde169673d2666e0cfd5d32c#d1f172d75e7c9386fde169673d2666e0cfd5d32c" +source = "git+https://github.com/aumetra/sonic-rs.git?rev=a5ac253f8389a34257dae2da79db3f535311ed65#a5ac253f8389a34257dae2da79db3f535311ed65" dependencies = [ "arrayref", "bumpalo", @@ -6387,9 +6402,9 @@ dependencies = [ [[package]] name = "spdx" -version = "0.10.4" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ef1a0fa1e39ac22972c8db23ff89aea700ab96aa87114e1fb55937a631a0c9" +checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" dependencies = [ "smallvec", ] @@ -6829,9 +6844,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -6848,9 +6863,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -6947,18 +6962,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - [[package]] name = "toml" version = "0.8.13" @@ -6980,19 +6983,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -7014,7 +7004,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.9", ] [[package]] @@ -7228,8 +7218,8 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" -source = "git+https://github.com/aumetra/tracing-opentelemetry.git?rev=e6e16057f6e3b2a11f6f8e7c86a1c17e4f7a07f1#e6e16057f6e3b2a11f6f8e7c86a1c17e4f7a07f1" +version = "0.24.0" +source = "git+https://github.com/aumetra/tracing-opentelemetry.git?rev=b7fe8d5d056e43f913a85eac1e6a661226b49c43#b7fe8d5d056e43f913a85eac1e6a661226b49c43" dependencies = [ "js-sys", "once_cell", @@ -7274,9 +7264,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" dependencies = [ "unsize", ] @@ -7641,18 +7631,18 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6425e84e42f7f558478e40ecc2287912cb319f2ca68e5c0bb93c61d4fc63fa17" +checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a2c4280ad374a6db3d76d4bb61e2ec4b3b9ce5469cc4f2bbc5708047a2bbff" +checksum = "4d32029ce424f6d3c2b39b4419fb45a0e2d84fb0751e0c0a32b7ce8bd5d97f46" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -7660,8 +7650,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.208.1", - "wasmparser 0.208.1", + "wasm-encoder 0.209.1", + "wasmparser 0.209.1", ] [[package]] @@ -7679,9 +7669,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" dependencies = [ "ahash 0.8.11", "bitflags 2.5.0", @@ -7945,22 +7935,22 @@ dependencies = [ [[package]] name = "wast" -version = "208.0.1" +version = "209.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00b3f023b4e2ccd2e054e240294263db52ae962892e6523e550783c83a67f1" +checksum = "8fffef2ff6147e4d12e972765fd75332c6a11c722571d4ab7a780d81ffc8f0a4" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.208.1", + "wasm-encoder 0.209.1", ] [[package]] name = "wat" -version = "1.208.1" +version = "1.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ed38e59176550214c025ea2bd0eeefd8e86b92d0af6698d5ba95020ec2e07b" +checksum = "42203ec0271d113f8eb1f77ebc624886530cecb35915a7f63a497131f16e4d24" dependencies = [ "wast", ] @@ -8244,9 +8234,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" dependencies = [ "memchr", ] @@ -8273,9 +8263,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f497a5ce965e6cb9929079bb4af633bd88dfb19d0dfc5341580e354947f00b2" +checksum = "a84376ff4f74ed07674a1157c0bd19e6627ab01fc90952a27ccefb52a24530f0" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -8283,29 +8273,29 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7076a12e69af6e1f6093bd16657d7ae61c30cfd3c5f62321046eb863b17ab1e2" +checksum = "36d4706efb67fadfbbde77955b299b111dd096e6776d8c6561d92f6147941880" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.208.1", + "wit-parser 0.209.1", ] [[package]] name = "wit-bindgen-rt" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef83e2f948056d4195b4c2a236a10378b70c8fd7501039c5a106c1a756fa7da6" +checksum = "29c7526379ace8709ee9ab9f2bb50f112d95581063a59ef3097d9c10153886c9" dependencies = [ "bitflags 2.5.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8ca0dd2aa75452450da1906391aba9d3a43d95fa920e872361ea00acc452a5" +checksum = "514295193d1a2f42e6a948cd7d9fd81e2b8fadc319667dcf19fd7aceaf2113a2" dependencies = [ "anyhow", "heck 0.5.0", @@ -8317,9 +8307,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d734e18bdf439ed86afe9d85fc5bfa38db4b676fc0e0a0dae95bd8f14de039" +checksum = "f0409a3356ca02599aff78f717968fd7f12df4bf879f325e2a97b45c84c90fff" dependencies = [ "anyhow", "proc-macro2", @@ -8331,9 +8321,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef7dd0e47f5135dd8739ccc5b188ab8b7e27e1d64df668aa36680f0b8646db8" +checksum = "25a2bb5b039f9cb03425e1d5a6e54b441ca4ca1b1d4fa6a0924db67a55168f99" dependencies = [ "anyhow", "bitflags 2.5.0", @@ -8342,10 +8332,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.208.1", + "wasm-encoder 0.209.1", "wasm-metadata", - "wasmparser 0.208.1", - "wit-parser 0.208.1", + "wasmparser 0.209.1", + "wit-parser 0.209.1", ] [[package]] @@ -8368,9 +8358,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516417a730725fe3e6c9e2efc8d86697480f80496d32b24e62736950704c047c" +checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" dependencies = [ "anyhow", "id-arena", @@ -8381,7 +8371,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.208.1", + "wasmparser 0.209.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2caf33e66..46a8db6e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,7 @@ askama = { version = "0.12.1", default-features = false, features = [ "with-axum", ] } clap = { version = "4.5.4", features = ["derive", "wrap_help"] } -diesel = { version = "2.1.6", default-features = false, features = [ +diesel = { version = "2.2.0", default-features = false, features = [ "32-column-tables", "with-deprecated", ] } @@ -89,7 +89,7 @@ diesel-async = { version = "0.4.1", features = [ "postgres", "tokio", ] } -diesel_full_text_search = { version = "2.1.1", default-features = false } +diesel_full_text_search = { version = "2.2.0", default-features = false } fred = { version = "9.0.3", features = [ "enable-rustls-ring", "full-tracing", @@ -107,7 +107,7 @@ itertools = { version = "0.13.0", default-features = false } moka = { version = "0.12.7", features = ["sync"] } simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] } sonic-rs = "0.3.6" -triomphe = { version = "0.1.11", default-features = false, features = [ +triomphe = { version = "0.1.12", default-features = false, features = [ "unsize", ] } @@ -208,12 +208,12 @@ pr-run-mode = "plan" install-updater = true [patch.crates-io] -diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d02798c67065d763154d7272dd0c09b39757d0f2" } +diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "3bc6789daf73563d59ed4f174241a23e9cb86686" } scraper = { git = "https://github.com/causal-agent/scraper.git", rev = "d67111f5cc0b7da6e6ff10e4549d87cf09ba3e5b" } tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", rev = "b16c1bc0f5d4f91324174fd1bd839d743a70f86a" } # SIMD runtime detection -sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "d1f172d75e7c9386fde169673d2666e0cfd5d32c" } +sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "a5ac253f8389a34257dae2da79db3f535311ed65" } # TCP nodelay for `axum::serve` axum = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" } @@ -225,4 +225,4 @@ opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-ru opentelemetry-otlp = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" } opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" } tonic = { git = "https://github.com/hyperium/tonic.git", rev = "a90adf27ef389a9c9d891c3f5696e6245589c479" } -tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "e6e16057f6e3b2a11f6f8e7c86a1c17e4f7a07f1" } +tracing-opentelemetry = { git = "https://github.com/aumetra/tracing-opentelemetry.git", rev = "b7fe8d5d056e43f913a85eac1e6a661226b49c43" } diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml index 899281b20..594a86574 100644 --- a/crates/kitsune-activitypub/Cargo.toml +++ b/crates/kitsune-activitypub/Cargo.toml @@ -50,7 +50,7 @@ kitsune-config = { workspace = true } kitsune-test = { workspace = true } kitsune-webfinger = { workspace = true } pretty_assertions = "1.4.0" -tokio = { version = "1.37.0", features = ["macros"] } +tokio = { version = "1.38.0", features = ["macros"] } tower = { version = "0.4.13", default-features = false, features = ["util"] } [lints] diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index 06fef5d71..1f9d526e6 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -17,7 +17,7 @@ triomphe = { workspace = true } typed-builder = "0.18.2" [dev-dependencies] -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [lints] workspace = true diff --git a/crates/kitsune-config/Cargo.toml b/crates/kitsune-config/Cargo.toml index 65c1a6537..c77c1b956 100644 --- a/crates/kitsune-config/Cargo.toml +++ b/crates/kitsune-config/Cargo.toml @@ -11,7 +11,7 @@ human-size = { version = "0.4.3", features = ["serde"] } isolang = { version = "2.4.0", features = ["serde"] } serde = { version = "1.0.203", features = ["derive"] } smol_str = { version = "0.2.2", features = ["serde"] } -tokio = { version = "1.37.0", features = ["fs"] } +tokio = { version = "1.38.0", features = ["fs"] } toml = { version = "0.8.13", default-features = false, features = ["parse"] } [lints] diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index 61c7e23f6..5b3db3da4 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -11,7 +11,7 @@ blowocking = { workspace = true, features = ["io"] } diesel = { workspace = true } diesel-async = { workspace = true } diesel_full_text_search = { workspace = true } -diesel_migrations = "2.1.0" +diesel_migrations = "2.2.0" futures-util = { version = "0.3.30", default-features = false, features = [ "alloc", ] } @@ -32,7 +32,7 @@ rustls-native-certs = "0.7.0" serde = { version = "1.0.203", features = ["derive"] } sonic-rs = { workspace = true } speedy-uuid = { workspace = true, features = ["diesel"] } -tokio = { version = "1.37.0", features = ["rt"] } +tokio = { version = "1.38.0", features = ["rt"] } tokio-postgres = "0.7.10" tokio-postgres-rustls = "0.12.0" tracing = "0.1.40" @@ -42,7 +42,7 @@ typed-builder = "0.18.2" [dev-dependencies] kitsune-test = { workspace = true } -tokio = { version = "1.37.0", features = ["macros"] } +tokio = { version = "1.38.0", features = ["macros"] } [lints] workspace = true diff --git a/crates/kitsune-db/src/function.rs b/crates/kitsune-db/src/function.rs index 6ea317d7f..2512e5ec2 100644 --- a/crates/kitsune-db/src/function.rs +++ b/crates/kitsune-db/src/function.rs @@ -1,22 +1,22 @@ use crate::schema::sql_types::LanguageIsoCode; use diesel::{ - sql_function, + define_sql_function, sql_types::{Nullable, Text}, }; use diesel_full_text_search::RegConfig; -sql_function! { +define_sql_function! { /// Coalesce between two nullable text fields, where one of those should have a value #[sql_name = "COALESCE"] fn coalesce_nullable(x: Nullable, y: Nullable) -> Text; } -sql_function! { +define_sql_function! { /// Get the optimal regconfig for the ISO code with the current database configuration fn iso_code_to_language(iso_code: LanguageIsoCode) -> RegConfig; } -sql_function! { +define_sql_function! { /// Return the current date with the timezone fn now() -> Timestamptz; } diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml index 26c5d166c..c66d6f72c 100644 --- a/crates/kitsune-http-client/Cargo.toml +++ b/crates/kitsune-http-client/Cargo.toml @@ -15,13 +15,13 @@ http-body = "1.0.0" http-body-util = "0.1.1" http-signatures = { workspace = true } hyper = "1.3.1" -hyper-util = { version = "0.1.4", features = [ +hyper-util = { version = "0.1.5", features = [ "client-legacy", "http1", "http2", "tokio", ] } -hyper-rustls = { version = "0.27.1", default-features = false, features = [ +hyper-rustls = { version = "0.27.2", default-features = false, features = [ "http1", "http2", "logging", @@ -48,7 +48,7 @@ tower-http = { version = "0.5.2", features = [ ] } [dev-dependencies] -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [lints] workspace = true diff --git a/crates/kitsune-language/src/regconfig.rs b/crates/kitsune-language/src/regconfig.rs index 0b74fddde..8e24f762e 100644 --- a/crates/kitsune-language/src/regconfig.rs +++ b/crates/kitsune-language/src/regconfig.rs @@ -1,8 +1,7 @@ use crate::supported_languages; -use diesel::{deserialize, pg::Pg, row::NamedRow, QueryableByName}; +use diesel::{deserialize, pg::Pg, row::NamedRow, sql_types, QueryableByName}; use diesel_async::{AsyncConnection, RunQueryDsl}; -use std::collections::HashSet; -use std::fmt::Write; +use std::{collections::HashSet, fmt::Write}; #[derive(Debug)] struct PgCatalogResult { @@ -12,7 +11,7 @@ struct PgCatalogResult { impl QueryableByName for PgCatalogResult { fn build<'a>(row: &impl NamedRow<'a, Pg>) -> deserialize::Result { Ok(Self { - cfgname: NamedRow::get(row, "cfgname")?, + cfgname: NamedRow::get::(row, "cfgname")?, }) } } diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml index 88c843c10..fd7461559 100644 --- a/crates/kitsune-observability/Cargo.toml +++ b/crates/kitsune-observability/Cargo.toml @@ -29,7 +29,7 @@ opentelemetry_sdk = { version = "0.23.0", default-features = false, features = [ ] } tracing = "0.1.40" tracing-error = "0.2.0" -tracing-opentelemetry = { version = "0.23.0", default-features = false } +tracing-opentelemetry = { version = "0.24.0", default-features = false } tracing-subscriber = "0.3.18" [lints] diff --git a/crates/kitsune-s3/Cargo.toml b/crates/kitsune-s3/Cargo.toml index 534f55b53..5e0b64b5d 100644 --- a/crates/kitsune-s3/Cargo.toml +++ b/crates/kitsune-s3/Cargo.toml @@ -18,7 +18,7 @@ typed-builder = "0.18.2" [dev-dependencies] kitsune-test = { workspace = true } -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [lints] workspace = true diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml index bdbf1def1..535798644 100644 --- a/crates/kitsune-service/Cargo.toml +++ b/crates/kitsune-service/Cargo.toml @@ -48,7 +48,7 @@ rusty-s3 = { version = "0.5.0", default-features = false } serde = "1.0.203" smol_str = "0.2.2" speedy-uuid = { workspace = true } -tokio = { version = "1.37.0", features = ["macros", "sync"] } +tokio = { version = "1.38.0", features = ["macros", "sync"] } tracing = "0.1.40" triomphe = { workspace = true } typed-builder = "0.18.2" diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml index 4089346f4..64907eb83 100644 --- a/crates/kitsune-storage/Cargo.toml +++ b/crates/kitsune-storage/Cargo.toml @@ -12,13 +12,13 @@ futures-util = "0.3.30" kitsune-error = { workspace = true } kitsune-s3 = { workspace = true } rusty-s3 = { version = "0.5.0", default-features = false } -tokio = { version = "1.37.0", features = ["fs", "io-util"] } +tokio = { version = "1.38.0", features = ["fs", "io-util"] } tokio-util = { version = "0.7.11", features = ["io"] } triomphe = { workspace = true } [dev-dependencies] tempfile = "3.10.1" -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [lints] workspace = true diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml index bd7e4a5b0..2a8defd40 100644 --- a/crates/kitsune-test/Cargo.toml +++ b/crates/kitsune-test/Cargo.toml @@ -19,7 +19,7 @@ kitsune-s3 = { workspace = true } pin-project-lite = "0.2.14" rand = "0.8.5" rusty-s3 = { version = "0.5.0", default-features = false } -tokio = { version = "1.37.0", features = ["time"] } +tokio = { version = "1.38.0", features = ["time"] } triomphe = { workspace = true } url = "2.5.0" uuid = { version = "1.8.0", features = ["fast-rng", "v4"] } diff --git a/crates/kitsune-util/Cargo.toml b/crates/kitsune-util/Cargo.toml index 1160c9b87..3e8d2ebf6 100644 --- a/crates/kitsune-util/Cargo.toml +++ b/crates/kitsune-util/Cargo.toml @@ -16,7 +16,7 @@ pulldown-cmark = { version = "0.11.0", default-features = false, features = [ ] } rand = "0.8.5" speedy-uuid = { workspace = true } -tokio = { version = "1.37.0", features = ["macros"] } +tokio = { version = "1.38.0", features = ["macros"] } [lints] workspace = true diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml index eb5e6af81..77d0fd739 100644 --- a/crates/kitsune-wasm-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/Cargo.toml @@ -25,7 +25,7 @@ redb = { version = "2.1.0", features = ["logging"] } slab = "0.4.9" smol_str = "0.2.2" sonic-rs = { workspace = true } -tokio = { version = "1.37.0", features = ["fs"] } +tokio = { version = "1.38.0", features = ["fs"] } tracing = "0.1.40" triomphe = { workspace = true } walkdir = "2.5.0" @@ -42,9 +42,9 @@ wasmtime-wasi = { version = "21.0.1", default-features = false } [dev-dependencies] tempfile = "3.10.1" -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } tracing-subscriber = "0.3.18" -wat = "1.208.1" +wat = "1.209.1" [lints] workspace = true diff --git a/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml index e3c3a6e37..f154f1f8b 100644 --- a/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] rand = "0.8.5" -wit-bindgen = "0.25.0" +wit-bindgen = "0.26.0" [lints] workspace = true diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml index e544b0f5c..8f07c4cc9 100644 --- a/crates/kitsune-webfinger/Cargo.toml +++ b/crates/kitsune-webfinger/Cargo.toml @@ -25,7 +25,7 @@ http-body-util = "0.1.1" hyper = "1.3.1" pretty_assertions = "1.4.0" sonic-rs = { workspace = true } -tokio = { version = "1.37.0", features = ["macros"] } +tokio = { version = "1.38.0", features = ["macros"] } tower = { version = "0.4.13", default-features = false, features = ["util"] } [lints] diff --git a/flake.lock b/flake.lock index 635450cac..47c3f8d73 100644 --- a/flake.lock +++ b/flake.lock @@ -3,19 +3,25 @@ "cachix": { "inputs": { "devenv": "devenv_2", - "flake-compat": "flake-compat_2", + "flake-compat": [ + "devenv", + "flake-compat" + ], "nixpkgs": [ "devenv", "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": [ + "devenv", + "pre-commit-hooks" + ] }, "locked": { - "lastModified": 1710475558, - "narHash": "sha256-egKrPCKjy/cE+NqCj4hg2fNX/NwLCf0bRDInraYXDgs=", + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", "owner": "cachix", "repo": "cachix", - "rev": "661bbb7f8b55722a0406456b15267b5426a3bda6", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", "type": "github" }, "original": { @@ -31,11 +37,11 @@ ] }, "locked": { - "lastModified": 1711407199, - "narHash": "sha256-A/nB4j3JHL51ztlMQdfKw6y8tUJJzai3bLsZUEEaBxY=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7e468a455506f2e65550e08dfd45092f0857a009", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -63,19 +69,19 @@ "devenv": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_2", "nix": "nix_2", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711676035, - "narHash": "sha256-m8AHpQR0WVVEoWWOpXVNvqfB5cXiMRnHfcYYm2zg7tk=", + "lastModified": 1717245169, + "narHash": "sha256-+mW3rTBjGU8p1THJN0lX/Dd/8FbnF+3dB+mJuSaxewE=", "owner": "cachix", "repo": "devenv", - "rev": "19098329b4e79f60705d7fb241a3617266658f98", + "rev": "c3f9f053c077c6f88a3de5276d9178c62baa3fc3", "type": "github" }, "original": { @@ -147,54 +153,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -218,11 +176,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -235,24 +193,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -268,29 +208,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv", - "cachix", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "devenv", @@ -299,11 +216,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -324,11 +241,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -364,7 +281,10 @@ }, "nix_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": [ + "devenv", + "flake-compat" + ], "nixpkgs": [ "devenv", "nixpkgs" @@ -372,11 +292,11 @@ "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1710500156, - "narHash": "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "c5bbf14ecbd692eeabf4184cc8d50f79c2446549", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -436,27 +356,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -468,11 +372,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -508,51 +412,25 @@ } }, "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { "inputs": { "flake-compat": [ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_3", - "gitignore": "gitignore_2", + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", "nixpkgs": [ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { @@ -566,7 +444,7 @@ "crane": "crane", "debugBuild": "debugBuild", "devenv": "devenv", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" } @@ -581,11 +459,11 @@ ] }, "locked": { - "lastModified": 1711678273, - "narHash": "sha256-7lIB0hMRnfzx/9oSIwTnwXmVnbvVGRoadOCW+1HI5zY=", + "lastModified": 1717208326, + "narHash": "sha256-4gVhbC+NjSQ4c6cJvJGNCI1oTcD+8jRRNAnOF9faGCE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "42a168449605950935f15ea546f6f770e5f7f629", + "rev": "ab69b67fac9a96709fbef0b899db308ca714a120", "type": "github" }, "original": { @@ -638,21 +516,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml index c67bfe70b..4534912a6 100644 --- a/kitsune-cli/Cargo.toml +++ b/kitsune-cli/Cargo.toml @@ -24,7 +24,7 @@ kitsune-db = { workspace = true } kitsune-error = { workspace = true } serde = { version = "1.0.203", features = ["derive"] } speedy-uuid = { workspace = true } -tokio = { version = "1.37.0", features = ["full"] } +tokio = { version = "1.38.0", features = ["full"] } tracing-subscriber = "0.3.18" [build-dependencies] diff --git a/kitsune-job-runner/Cargo.toml b/kitsune-job-runner/Cargo.toml index 9a17502bc..1de5266e3 100644 --- a/kitsune-job-runner/Cargo.toml +++ b/kitsune-job-runner/Cargo.toml @@ -30,7 +30,7 @@ kitsune-service = { workspace = true } kitsune-url = { workspace = true } kitsune-wasm-mrf = { workspace = true } mimalloc = "0.1.42" -tokio = { version = "1.37.0", features = ["full"] } +tokio = { version = "1.38.0", features = ["full"] } tracing = "0.1.40" triomphe = { workspace = true } typed-builder = "0.18.2" diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index 1072a3896..6b59aef89 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -83,7 +83,7 @@ speedy-uuid = { workspace = true } strum = { version = "0.26.2", features = ["derive", "phf"] } tempfile = "3.10.1" time = "0.3.36" -tokio = { version = "1.37.0", features = ["full"] } +tokio = { version = "1.38.0", features = ["full"] } tokio-util = { version = "0.7.11", features = ["io"] } tower = { version = "0.4.13", features = ["util"] } tower-stop-using-brave = { workspace = true } diff --git a/lib/athena/Cargo.toml b/lib/athena/Cargo.toml index b68e8613c..4f260da96 100644 --- a/lib/athena/Cargo.toml +++ b/lib/athena/Cargo.toml @@ -24,7 +24,7 @@ smol_str = "0.2.2" sonic-rs = { workspace = true, optional = true } speedy-uuid = { workspace = true, features = ["redis"] } thiserror = "1.0.61" -tokio = { version = "1.37.0", features = ["macros", "rt", "sync"] } +tokio = { version = "1.38.0", features = ["macros", "rt", "sync"] } tokio-util = { version = "0.7.11", features = ["rt"] } tracing = "0.1.40" triomphe = { workspace = true } diff --git a/lib/blowocking/Cargo.toml b/lib/blowocking/Cargo.toml index 29191cb39..576d6d848 100644 --- a/lib/blowocking/Cargo.toml +++ b/lib/blowocking/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" once_cell = "1.19.0" rayon = "1.10.0" thiserror = "1.0.61" -tokio = { version = "1.37.0", features = ["sync"] } +tokio = { version = "1.38.0", features = ["sync"] } tracing = "0.1.40" [features] diff --git a/lib/geomjeungja/Cargo.toml b/lib/geomjeungja/Cargo.toml index 5b2af4a70..9704d9107 100644 --- a/lib/geomjeungja/Cargo.toml +++ b/lib/geomjeungja/Cargo.toml @@ -21,7 +21,7 @@ unsize = "1.1.0" insta = { version = "1.39.0", features = ["json"] } rand_xorshift = "0.3.0" serde_json = "1.0.117" -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [lints] workspace = true diff --git a/lib/http-signatures/Cargo.toml b/lib/http-signatures/Cargo.toml index aba1be262..2d13f5a72 100644 --- a/lib/http-signatures/Cargo.toml +++ b/lib/http-signatures/Cargo.toml @@ -37,7 +37,7 @@ tracing = { version = "0.1.40", default-features = false, optional = true } [dev-dependencies] divan = "0.1.14" -tokio = { version = "1.37.0", features = ["macros", "rt"] } +tokio = { version = "1.38.0", features = ["macros", "rt"] } [features] default = ["easy"] diff --git a/lib/just-retry/Cargo.toml b/lib/just-retry/Cargo.toml index a83c122c7..266267581 100644 --- a/lib/just-retry/Cargo.toml +++ b/lib/just-retry/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" [dependencies] retry-policies = "0.4.0" -tokio = { version = "1.37.0", features = ["time"] } +tokio = { version = "1.38.0", features = ["time"] } tracing = "0.1.40" [lints] diff --git a/lib/mrf-manifest/Cargo.toml b/lib/mrf-manifest/Cargo.toml index 11ae1e76d..fa6e854a7 100644 --- a/lib/mrf-manifest/Cargo.toml +++ b/lib/mrf-manifest/Cargo.toml @@ -13,13 +13,13 @@ semver = { version = "1.0.23", features = ["serde"] } serde = { version = "1.0.203", features = ["derive"] } serde_json = { version = "1.0.117", optional = true } thiserror = { version = "1.0.61", optional = true } -wasm-encoder = { version = "0.208.1", optional = true } -wasmparser = { version = "0.208.1", optional = true } +wasm-encoder = { version = "0.209.1", optional = true } +wasmparser = { version = "0.209.1", optional = true } [dev-dependencies] serde_json = "1.0.117" insta = { version = "1.39.0", default-features = false, features = ["json"] } -wat = "1.208.1" +wat = "1.209.1" [features] decode = ["dep:leb128", "dep:serde_json", "dep:thiserror", "dep:wasmparser"] diff --git a/lib/mrf-tool/Cargo.toml b/lib/mrf-tool/Cargo.toml index 947e84adb..963e5c222 100644 --- a/lib/mrf-tool/Cargo.toml +++ b/lib/mrf-tool/Cargo.toml @@ -15,11 +15,11 @@ mrf-manifest = { workspace = true, features = [ "serialise", ] } serde_json = "1.0.117" -wasmparser = "0.208.1" +wasmparser = "0.209.1" [lints] workspace = true [dev-dependencies] serde_json = "1.0.117" -wat = "1.208.1" +wat = "1.209.1" diff --git a/lib/speedy-uuid/Cargo.toml b/lib/speedy-uuid/Cargo.toml index 2abd9fd5c..c5c946e19 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.5", default-features = false, optional = true } -diesel = { version = "2.1.6", default-features = false, features = [ +diesel = { version = "2.2.0", default-features = false, features = [ "postgres_backend", "uuid", ], optional = true }