diff --git a/Cargo.lock b/Cargo.lock index f44a4004fd..2f2ee5dcde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,7 +126,7 @@ dependencies = [ "log", "mime", "mime_guess", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite 0.2.9", ] @@ -163,7 +163,7 @@ dependencies = [ "lazy_static", "log", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project 1.0.7", "rand 0.7.3", "regex", @@ -203,7 +203,7 @@ dependencies = [ "language-tags 0.3.2", "local-channel", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite 0.2.9", "rand 0.8.5", "sha1 0.10.4", @@ -471,7 +471,7 @@ dependencies = [ "socket2 0.3.19", "time 0.2.26", "tinyvec", - "url 2.4.1", + "url", ] [[package]] @@ -511,7 +511,7 @@ dependencies = [ "smallvec 1.10.0", "socket2 0.4.7", "time 0.3.14", - "url 2.4.1", + "url", ] [[package]] @@ -822,7 +822,7 @@ dependencies = [ "native-tls", "serde", "serde_json", - "url 2.4.1", + "url", ] [[package]] @@ -859,7 +859,7 @@ dependencies = [ "futures-core", "log", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.7.3", "serde", "serde_json", @@ -880,7 +880,7 @@ dependencies = [ "serde", "thiserror", "time 0.3.14", - "url 2.4.1", + "url", ] [[package]] @@ -1354,7 +1354,7 @@ version = "0.0.1" dependencies = [ "anyhow", "easyenv", - "url 2.4.1", + "url", ] [[package]] @@ -1404,7 +1404,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time 0.2.26", "version_check", ] @@ -1415,7 +1415,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time 0.3.14", "version_check", ] @@ -1835,25 +1835,37 @@ dependencies = [ [[package]] name = "diesel" -version = "1.4.6" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" +checksum = "2268a214a6f118fce1838edba3d1561cf0e78d8de785475957a580a7f8c69d33" dependencies = [ + "bitflags 2.4.0", "byteorder", "diesel_derives", "mysqlclient-sys", - "url 1.7.2", + "percent-encoding", + "url", ] [[package]] name = "diesel_derives" -version = "1.4.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" +checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" dependencies = [ + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.26", +] + +[[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.26", ] [[package]] @@ -2260,7 +2272,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", ] [[package]] @@ -2718,7 +2730,7 @@ dependencies = [ "serde_json", "serde_qs 0.8.5", "serde_urlencoded", - "url 2.4.1", + "url", ] [[package]] @@ -2854,17 +2866,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -3613,9 +3614,9 @@ dependencies = [ [[package]] name = "mysqlclient-sys" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" +checksum = "f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b" dependencies = [ "pkg-config", "vcpkg", @@ -4042,12 +4043,6 @@ dependencies = [ "base64ct", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.0" @@ -4528,7 +4523,7 @@ dependencies = [ "dtoa", "futures 0.1.31", "itoa 0.4.7", - "percent-encoding 2.3.0", + "percent-encoding", "sha1 0.6.0", "tokio-codec", "tokio-executor", @@ -4536,7 +4531,7 @@ dependencies = [ "tokio-sync", "tokio-tcp", "tokio-uds", - "url 2.4.1", + "url", ] [[package]] @@ -4549,9 +4544,9 @@ dependencies = [ "combine 4.6.3", "dtoa", "itoa 0.4.7", - "percent-encoding 2.3.0", + "percent-encoding", "sha1 0.6.0", - "url 2.4.1", + "url", ] [[package]] @@ -4566,12 +4561,12 @@ dependencies = [ "dtoa", "futures-util", "itoa 0.4.7", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite 0.2.9", "sha1 0.6.0", "tokio 1.25.0", "tokio-util 0.6.9", - "url 2.4.1", + "url", ] [[package]] @@ -4682,7 +4677,7 @@ dependencies = [ "mime", "native-tls", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite 0.2.9", "serde", "serde_json", @@ -4691,7 +4686,7 @@ dependencies = [ "tokio-native-tls", "tokio-util 0.7.4", "tower-service", - "url 2.4.1", + "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", @@ -4824,7 +4819,7 @@ dependencies = [ "maybe-async", "md5", "minidom", - "percent-encoding 2.3.0", + "percent-encoding", "quick-xml 0.26.0", "reqwest", "serde", @@ -4834,7 +4829,7 @@ dependencies = [ "time 0.3.14", "tokio 1.25.0", "tokio-stream", - "url 2.4.1", + "url", ] [[package]] @@ -5087,7 +5082,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -5098,7 +5093,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af4cee6cd4b23b45e6709150d1e9af5c748131de7e3316a7c2b3008051ed725" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -5408,7 +5403,7 @@ dependencies = [ "num-bigint 0.4.3", "once_cell", "paste", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "rsa", "serde", @@ -5420,7 +5415,7 @@ dependencies = [ "stringprep", "thiserror", "tokio-stream", - "url 2.4.1", + "url", ] [[package]] @@ -5442,7 +5437,7 @@ dependencies = [ "sqlx-core", "sqlx-rt", "syn 1.0.107", - "url 2.4.1", + "url", ] [[package]] @@ -6497,7 +6492,7 @@ dependencies = [ "smallvec 1.10.0", "thiserror", "tokio 0.2.25", - "url 2.4.1", + "url", ] [[package]] @@ -6623,7 +6618,7 @@ dependencies = [ "rustls-native-certs", "sha-1", "thiserror", - "url 2.4.1", + "url", "utf-8", "webpki", ] @@ -6716,7 +6711,7 @@ dependencies = [ "thiserror", "twitch_oauth2", "typed-builder", - "url 2.4.1", + "url", "version_check", ] @@ -6751,7 +6746,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "url 2.4.1", + "url", ] [[package]] @@ -6850,17 +6845,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.4.1" @@ -6869,7 +6853,7 @@ checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", - "percent-encoding 2.3.0", + "percent-encoding", "serde", ] diff --git a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml index d7f7e5e086..b4624f80e3 100644 --- a/crates/service/other/twitch_pubsub_subscriber/Cargo.toml +++ b/crates/service/other/twitch_pubsub_subscriber/Cargo.toml @@ -115,4 +115,4 @@ rpassword = "5.0.1" [build-dependencies] # NB: Only using diesel for migrations support -diesel = { version = "1.4.6", features = ["mysql"] } +diesel = { version = "2.1.3", features = ["mysql"] } diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 34670a1d54..7e6edd01ae 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -166,7 +166,7 @@ async-trait = "0.1.58" [build-dependencies] # NB: Only using diesel for migrations support -diesel = { version = "1.4.6", features = ["mysql"] } +diesel = { version = "2.1.3", features = ["mysql"] } [dev-dependencies] speculoos = "0.9.0" # Fluent assertions diff --git a/crates/service/web/websocket_gateway/Cargo.toml b/crates/service/web/websocket_gateway/Cargo.toml index c7eb2cda7c..d3463c194a 100644 --- a/crates/service/web/websocket_gateway/Cargo.toml +++ b/crates/service/web/websocket_gateway/Cargo.toml @@ -116,4 +116,4 @@ rpassword = "5.0.1" [build-dependencies] # NB: Only using diesel for migrations support -diesel = { version = "1.4.6", features = ["mysql"] } +diesel = { version = "2.1.3", features = ["mysql"] }