diff --git a/Cargo.lock b/Cargo.lock index 36fb6f41e1..ae9c11c6c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,7 +157,7 @@ dependencies = [ "h2 0.2.7", "http", "httparse", - "indexmap 1.9.2", + "indexmap", "itoa 0.4.7", "language-tags 0.2.2", "lazy_static", @@ -185,7 +185,7 @@ dependencies = [ "actix-rt 2.9.0", "actix-service 2.0.1", "actix-utils 3.0.0", - "ahash 0.7.6", + "ahash", "base64 0.21.0", "bitflags 1.3.2", "brotli", @@ -489,7 +489,7 @@ dependencies = [ "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web-codegen 4.2.0", - "ahash 0.7.6", + "ahash", "bytes 1.3.0", "bytestring", "cfg-if 1.0.0", @@ -625,18 +625,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.8", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "0.7.18" @@ -810,15 +798,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atom_syndication" version = "0.12.0" @@ -2081,7 +2060,7 @@ dependencies = [ "serde_derive", "serde_json", "sqlx", - "sqlx-core 0.7.2", + "sqlx-core", "strum", "toml", ] @@ -2122,12 +2101,6 @@ dependencies = [ "log", ] -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - [[package]] name = "errno" version = "0.3.1" @@ -2363,17 +2336,6 @@ dependencies = [ "parking_lot 0.11.1", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api 0.4.6", - "parking_lot 0.12.1", -] - [[package]] name = "futures-io" version = "0.3.26" @@ -2527,7 +2489,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.2", + "indexmap", "slab", "tokio 0.2.25", "tokio-util 0.3.1", @@ -2547,7 +2509,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.2", + "indexmap", "slab", "tokio 1.25.0", "tokio-util 0.7.4", @@ -2569,15 +2531,9 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash", ] -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" - [[package]] name = "hashing" version = "0.0.1" @@ -2593,7 +2549,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -2939,17 +2895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.1", + "hashbrown", ] [[package]] @@ -3929,7 +3875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -5340,18 +5286,18 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" dependencies = [ - "sqlx-core 0.6.3", + "sqlx-core", "sqlx-macros", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" dependencies = [ - "ahash 0.7.6", - "atoi 1.0.0", + "ahash", + "atoi", "bitflags 1.3.2", "byteorder", "bytes 1.3.0", @@ -5366,12 +5312,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-executor", - "futures-intrusive 0.4.0", + "futures-intrusive", "futures-util", "generic-array", "hashlink", "hex", - "indexmap 1.9.2", + "indexmap", "itoa 1.0.3", "libc", "libsqlite3-sys", @@ -5395,40 +5341,6 @@ dependencies = [ "url 2.4.1", ] -[[package]] -name = "sqlx-core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" -dependencies = [ - "ahash 0.8.3", - "atoi 2.0.0", - "byteorder", - "bytes 1.3.0", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive 0.5.0", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.0.2", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding 2.2.0", - "smallvec 1.10.0", - "sqlformat", - "thiserror", - "tracing", - "url 2.3.1", -] - [[package]] name = "sqlx-macros" version = "0.6.2" @@ -5445,7 +5357,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.5", - "sqlx-core 0.6.3", + "sqlx-core", "sqlx-rt", "syn 1.0.107", "url 2.4.1", @@ -5453,9 +5365,9 @@ dependencies = [ [[package]] name = "sqlx-rt" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ "native-tls", "once_cell", @@ -6187,7 +6099,7 @@ dependencies = [ "serde_derive", "serde_json", "sqlx", - "sqlx-core 0.7.2", + "sqlx-core", "strum", "toml", ] @@ -6452,21 +6364,9 @@ dependencies = [ "cfg-if 1.0.0", "log", "pin-project-lite 0.2.9", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - [[package]] name = "tracing-core" version = "0.1.30" diff --git a/crates/_types/enums/Cargo.toml b/crates/_types/enums/Cargo.toml index 6d1d5afa9e..9efd7c3148 100644 --- a/crates/_types/enums/Cargo.toml +++ b/crates/_types/enums/Cargo.toml @@ -24,7 +24,7 @@ toml = "0.5.8" # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "sqlite", "runtime-actix-native-tls", "offline", "chrono" ] } -sqlx-core = { version = "0.7.2" } +sqlx-core = { version = "0.6.2" } [dev-dependencies] diff --git a/crates/_types/tokens/Cargo.toml b/crates/_types/tokens/Cargo.toml index 254ecbdaaa..1ba311bcb4 100644 --- a/crates/_types/tokens/Cargo.toml +++ b/crates/_types/tokens/Cargo.toml @@ -27,7 +27,7 @@ rand = "0.8.3" # "rustls" doesn't appear to work with IP addresses, per: # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 sqlx = { version = "0.6.2", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } -sqlx-core = { version = "0.7.2" } +sqlx-core = { version = "0.6.2" } [dev-dependencies]