diff --git a/Cargo.lock b/Cargo.lock index c412d5d9..898255fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -960,12 +960,23 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b" dependencies = [ - "deadpool-runtime", + "deadpool-runtime 0.1.4", "lazy_static", "num_cpus", "tokio", ] +[[package]] +name = "deadpool" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883466cb8db62725aee5f4a6011e8a5d42912b42632df32aad57fc91127c6e04" +dependencies = [ + "deadpool-runtime 0.3.1", + "num_cpus", + "tokio", +] + [[package]] name = "deadpool-runtime" version = "0.1.4" @@ -975,6 +986,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "deadpool-runtime" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2657f61fb1dd8bf37a8d51093cc7cee4e77125b22f7753f49b289f831bec2bae" + [[package]] name = "debugid" version = "0.8.0" @@ -1056,11 +1073,11 @@ dependencies = [ [[package]] name = "diesel-async" -version = "0.7.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13096fb8dae53f2d411c4b523bec85f45552ed3044a2ab4d85fb2092d9cb4f34" +checksum = "9c20ddcc6737cecdaef3dfecb2796bdfe3002456521189d30be8e4c5a1bc821d" dependencies = [ - "deadpool", + "deadpool 0.13.0", "diesel", "diesel_migrations", "futures-channel", @@ -1068,7 +1085,7 @@ dependencies = [ "futures-util", "mysql_async", "mysql_common", - "scoped-futures", + "pin-project-lite", "tokio", "tokio-postgres", ] @@ -3681,15 +3698,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "scoped-futures" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b24aae2d0636530f359e9d5ef0c04669d11c5e756699b27a6a6d845d8329091" -dependencies = [ - "pin-project-lite", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -4226,7 +4234,7 @@ dependencies = [ "base64", "cadence", "chrono", - "deadpool", + "deadpool 0.12.3", "docopt", "futures 0.3.32", "glean", @@ -4295,7 +4303,7 @@ name = "syncserver-db-common" version = "0.22.3" dependencies = [ "backtrace", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", @@ -4326,7 +4334,7 @@ name = "syncstorage-db" version = "0.22.3" dependencies = [ "async-trait", - "deadpool", + "deadpool 0.12.3", "env_logger 0.11.9", "lazy_static", "log", @@ -4350,7 +4358,7 @@ dependencies = [ "async-trait", "backtrace", "chrono", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel_migrations", "http 1.4.0", @@ -4368,7 +4376,7 @@ version = "0.22.3" dependencies = [ "async-trait", "base64", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", @@ -4389,7 +4397,7 @@ version = "0.22.3" dependencies = [ "async-trait", "chrono", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", @@ -4419,7 +4427,7 @@ dependencies = [ "async-trait", "backtrace", "chrono", - "deadpool", + "deadpool 0.12.3", "form_urlencoded", "futures 0.3.32", "google-cloud-rust-raw", @@ -4668,7 +4676,7 @@ version = "0.22.3" dependencies = [ "async-trait", "chrono", - "deadpool", + "deadpool 0.12.3", "env_logger 0.11.9", "syncserver-common", "syncserver-db-common", @@ -4689,7 +4697,7 @@ dependencies = [ "async-trait", "backtrace", "chrono", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", @@ -4708,7 +4716,7 @@ version = "0.22.3" dependencies = [ "async-trait", "chrono", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", @@ -4727,7 +4735,7 @@ version = "0.22.3" dependencies = [ "async-trait", "chrono", - "deadpool", + "deadpool 0.12.3", "diesel", "diesel-async", "diesel_migrations", diff --git a/Cargo.toml b/Cargo.toml index 080de607..b6cb1975 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ docopt = "1.1" base64 = "0.22" diesel = "2.3" -diesel-async = { version = "0.7", features = ["mysql", "deadpool", "migrations", "async-connection-wrapper"] } # worth checking when updating deadpool +diesel-async = { version = "0.9", features = ["mysql", "deadpool", "migrations", "async-connection-wrapper"] } # worth checking when updating deadpool diesel_migrations = "2.3" cadence = "1.7"