From ac46b262fc3adba815cd128763f31c685fc7ba5f Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Wed, 12 Jun 2024 12:31:21 +0200 Subject: [PATCH] up --- Cargo.lock | 80 +++++++++++---------- Cargo.toml | 6 +- crates/kitsune-activitypub/Cargo.toml | 2 +- crates/kitsune-db/src/schema.rs | 9 --- crates/kitsune-federation-filter/Cargo.toml | 2 +- crates/kitsune-language/Cargo.toml | 2 +- crates/kitsune-oidc/Cargo.toml | 2 +- crates/kitsune-service/Cargo.toml | 2 +- crates/kitsune-test/Cargo.toml | 2 +- crates/kitsune-wasm-mrf/Cargo.toml | 2 +- kitsune/Cargo.toml | 2 +- lib/mrf-manifest/Cargo.toml | 6 +- lib/mrf-tool/Cargo.toml | 4 +- 13 files changed, 59 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27bf57ea5..df985ea04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -617,7 +617,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.7.3", + "miniz_oxide 0.7.4", "object 0.32.2", "rustc-demangle", ] @@ -1280,7 +1280,7 @@ dependencies = [ "hashbrown 0.14.5", "log", "regalloc2", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "target-lexicon", ] @@ -2114,7 +2114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.7.3", + "miniz_oxide 0.7.4", ] [[package]] @@ -2323,13 +2323,13 @@ dependencies = [ [[package]] name = "garde" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafefff9569ce4dc9baaba416f5907205ae35baa65e9ecb56c00bec88a7e4672" +checksum = "29a44029f2f9359712d0c34cb78dc36266e9949ffbfcc13f5f737f6e6f1a7226" dependencies = [ "compact_str", "garde_derive", - "idna 1.0.0", + "idna 1.0.1", "once_cell", "regex", "serde", @@ -2338,9 +2338,9 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff01e6b31ac759513232cc729d97cc1459cbcc98d2919904704e3a8fd5075b66" +checksum = "f5e2e952fbf2bcd9dae6854d7ebcbfb05f261656d1131f4f1f4fac9da450adec" dependencies = [ "proc-macro2", "quote", @@ -2752,9 +2752,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3028,9 +3028,9 @@ dependencies = [ [[package]] name = "idna" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "44a986806a1cc899952ba462bc1f28afbfd5850ab6cb030ccb20dd02cc527a24" dependencies = [ "icu_normalizer", "icu_properties", @@ -3684,7 +3684,7 @@ dependencies = [ "diesel-async", "isolang", "kitsune-config", - "rustc-hash", + "rustc-hash 2.0.0", "whatlang", "whichlang", ] @@ -4437,9 +4437,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -4487,8 +4487,8 @@ dependencies = [ "serde", "serde_json", "thiserror", - "wasm-encoder 0.210.0", - "wasmparser 0.210.0", + "wasm-encoder 0.211.1", + "wasmparser 0.211.1", "wat", ] @@ -4500,7 +4500,7 @@ dependencies = [ "color-eyre", "mrf-manifest", "serde_json", - "wasmparser 0.210.0", + "wasmparser 0.211.1", "wat", ] @@ -4513,7 +4513,7 @@ dependencies = [ "enum-as-inner", "indexmap 2.2.6", "itertools 0.13.0", - "rustc-hash", + "rustc-hash 1.1.0", "thiserror", "xmlparser", ] @@ -5672,7 +5672,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -5831,7 +5831,7 @@ dependencies = [ "countme", "hashbrown 0.14.5", "memoffset", - "rustc-hash", + "rustc-hash 1.1.0", "text-size", ] @@ -5913,6 +5913,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -7393,9 +7399,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ "unsize", ] @@ -7564,12 +7570,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 1.0.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -7781,9 +7787,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.210.0" +version = "0.211.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e3764d9d6edabd8c9e16195e177be0d20f6ab942ad18af52860f12f82bc59a" +checksum = "5e7d931a1120ef357f32b74547646b6fa68ea25e377772b72874b131a9ed70d4" dependencies = [ "leb128", ] @@ -7832,9 +7838,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.210.0" +version = "0.211.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bbcd21e7581619d9f6ca00f8c4f08f1cacfe58bf63f83af57cd0476f1026f5" +checksum = "3189cc8a91f547390e2f043ca3b3e3fe0892f7d581767fd4e4b7f3dc3fe8e561" dependencies = [ "ahash 0.8.11", "bitflags 2.5.0", @@ -8098,22 +8104,22 @@ dependencies = [ [[package]] name = "wast" -version = "210.0.0" +version = "211.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa835c59bd615e00f16be65705d85517d40b44b3c831d724e450244685176c3c" +checksum = "b25506dd82d00da6b14a87436b3d52b1d264083fa79cdb72a0d1b04a8595ccaa" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.210.0", + "wasm-encoder 0.211.1", ] [[package]] name = "wat" -version = "1.210.0" +version = "1.211.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67faece8487996430c6812be7f8776dc563ca0efcd3db77f8839070480c0d1a6" +checksum = "eb716ca6c86eecac2d82541ffc39860118fc0af9309c4f2670637bea2e1bdd7d" dependencies = [ "wast", ] @@ -8140,9 +8146,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index 39d8c020c..b1a527a24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ fred = { version = "9.0.3", features = [ "i-scripts", "sha-1", ] } -garde = { version = "0.19.1", features = [ +garde = { version = "0.19.2", features = [ "derive", "email", "email-idna", @@ -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.7" -triomphe = { version = "0.1.12", default-features = false, features = [ +triomphe = { version = "0.1.13", default-features = false, features = [ "unsize", ] } @@ -212,7 +212,7 @@ diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "3b 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 +# SIMD runtime detection and generic I/O wrapper sonic-rs = { git = "https://github.com/aumetra/sonic-rs.git", rev = "317ff37a8ab88e653ee01bbc00a974d41f3b151a" } # TCP nodelay for `axum::serve` diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml index bcde2f4b4..531323e84 100644 --- a/crates/kitsune-activitypub/Cargo.toml +++ b/crates/kitsune-activitypub/Cargo.toml @@ -38,7 +38,7 @@ speedy-uuid = { workspace = true } tracing = "0.1.40" triomphe = { workspace = true } typed-builder = "0.18.2" -url = "2.5.1" +url = "2.5.2" [target.'cfg(not(target_env = "msvc"))'.dependencies] sha2 = { version = "0.10.8", features = ["asm"] } diff --git a/crates/kitsune-db/src/schema.rs b/crates/kitsune-db/src/schema.rs index 2917f773d..b3e0d30bf 100644 --- a/crates/kitsune-db/src/schema.rs +++ b/crates/kitsune-db/src/schema.rs @@ -10,19 +10,11 @@ pub mod sql_types { #[derive(diesel::sql_types::SqlType)] #[diesel(postgres_type(name = "language_iso_code", schema = "kitsune"))] pub struct LanguageIsoCode; - - /// The `pg_catalog.tsvector` SQL type - /// - /// (Automatically generated by Diesel.) - #[derive(diesel::sql_types::SqlType)] - #[diesel(postgres_type(name = "tsvector", schema = "pg_catalog"))] - pub struct Tsvector; } diesel::table! { use diesel::sql_types::*; use diesel_full_text_search::Tsvector; - use super::sql_types::Tsvector; /// Representation of the `accounts` table. /// @@ -830,7 +822,6 @@ diesel::table! { use diesel::sql_types::*; use diesel_full_text_search::Tsvector; use super::sql_types::LanguageIsoCode; - use super::sql_types::Tsvector; /// Representation of the `posts` table. /// diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml index ec43d33cd..e4e83d0b4 100644 --- a/crates/kitsune-federation-filter/Cargo.toml +++ b/crates/kitsune-federation-filter/Cargo.toml @@ -11,7 +11,7 @@ kitsune-config = { workspace = true } kitsune-derive = { workspace = true } kitsune-error = { workspace = true } kitsune-type = { workspace = true } -url = "2.5.1" +url = "2.5.2" [lints] workspace = true diff --git a/crates/kitsune-language/Cargo.toml b/crates/kitsune-language/Cargo.toml index 8b9a821f6..4cf8c6a8c 100644 --- a/crates/kitsune-language/Cargo.toml +++ b/crates/kitsune-language/Cargo.toml @@ -14,7 +14,7 @@ isolang = { version = "2.4.0", features = [ "list_languages", "serde", ] } -rustc-hash = "1.1.0" +rustc-hash = "2.0.0" whatlang = "0.16.4" whichlang = "0.1.0" diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml index 8b55ee06c..8c8aed0f9 100644 --- a/crates/kitsune-oidc/Cargo.toml +++ b/crates/kitsune-oidc/Cargo.toml @@ -25,7 +25,7 @@ openidconnect = { version = "4.0.0-alpha.2", default-features = false, features serde = { version = "1.0.203", features = ["derive"] } sonic-rs = { workspace = true } speedy-uuid = { workspace = true } -url = "2.5.1" +url = "2.5.2" [lints] workspace = true diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml index ca493d3c1..899481f05 100644 --- a/crates/kitsune-service/Cargo.toml +++ b/crates/kitsune-service/Cargo.toml @@ -52,7 +52,7 @@ tokio = { version = "1.38.0", features = ["macros", "sync"] } tracing = "0.1.40" triomphe = { workspace = true } typed-builder = "0.18.2" -url = "2.5.1" +url = "2.5.2" zxcvbn = { version = "3.0.1", default-features = false } [dev-dependencies] diff --git a/crates/kitsune-test/Cargo.toml b/crates/kitsune-test/Cargo.toml index 422bc5a27..a585c4285 100644 --- a/crates/kitsune-test/Cargo.toml +++ b/crates/kitsune-test/Cargo.toml @@ -21,7 +21,7 @@ rand = "0.8.5" rusty-s3 = { version = "0.5.0", default-features = false } tokio = { version = "1.38.0", features = ["time"] } triomphe = { workspace = true } -url = "2.5.1" +url = "2.5.2" uuid = { version = "1.8.0", features = ["fast-rng", "v4"] } [lints] diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml index b4bf8733b..3f3499ebc 100644 --- a/crates/kitsune-wasm-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/Cargo.toml @@ -44,7 +44,7 @@ wasmtime-wasi = { version = "21.0.1", default-features = false } tempfile = "3.10.1" tokio = { version = "1.38.0", features = ["macros", "rt"] } tracing-subscriber = "0.3.18" -wat = "1.210.0" +wat = "1.211.1" [lints] workspace = true diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml index 469487f76..6fdf32c1b 100644 --- a/kitsune/Cargo.toml +++ b/kitsune/Cargo.toml @@ -101,7 +101,7 @@ tracing = "0.1.40" trials = { workspace = true } triomphe = { workspace = true } typed-builder = "0.18.2" -url = "2.5.1" +url = "2.5.2" # --- Optional dependencies --- diff --git a/lib/mrf-manifest/Cargo.toml b/lib/mrf-manifest/Cargo.toml index eeaa1e730..ea39c4665 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.210.0", optional = true } -wasmparser = { version = "0.210.0", optional = true } +wasm-encoder = { version = "0.211.1", optional = true } +wasmparser = { version = "0.211.1", optional = true } [dev-dependencies] serde_json = "1.0.117" insta = { version = "1.39.0", default-features = false, features = ["json"] } -wat = "1.210.0" +wat = "1.211.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 a7093af62..5ffd6742c 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.210.0" +wasmparser = "0.211.1" [lints] workspace = true [dev-dependencies] serde_json = "1.0.117" -wat = "1.210.0" +wat = "1.211.1"