diff --git a/Cargo.lock b/Cargo.lock index 2bc49e1..964d79c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,21 +115,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-global-executor" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - [[package]] name = "async-io" version = "1.9.0" @@ -189,33 +174,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - [[package]] name = "async-stream" version = "0.3.3" @@ -557,16 +515,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "ctr" version = "0.8.0" @@ -945,17 +893,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "futures-rustls" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" -dependencies = [ - "futures-io", - "rustls", - "webpki", -] - [[package]] name = "futures-sink" version = "0.3.24" @@ -1035,18 +972,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -[[package]] -name = "gloo-timers" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "h2" version = "0.3.14" @@ -1321,15 +1246,6 @@ dependencies = [ "serde", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1382,7 +1298,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", - "value-bag", ] [[package]] @@ -2449,6 +2364,7 @@ dependencies = [ "sqlx-rt", "stringprep", "thiserror", + "tokio-stream", "url", "webpki-roots", ] @@ -2478,8 +2394,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ - "async-std", - "futures-rustls", + "once_cell", + "tokio", + "tokio-rustls", ] [[package]] @@ -2689,6 +2606,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + [[package]] name = "tokio-stream" version = "0.1.9" @@ -2906,16 +2834,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/dcspkg-create/Cargo.toml b/dcspkg-create/Cargo.toml index ae2fc4e..8ac67c3 100644 --- a/dcspkg-create/Cargo.toml +++ b/dcspkg-create/Cargo.toml @@ -19,5 +19,5 @@ clap = { version = "4.0.29", features = ["derive", "cargo"] } dialoguer = "0.10.2" semver = "1.0.13" url = "2.3.0" -sqlx = { version = "0.6.2", features = ["sqlite", "runtime-async-std-rustls"] } +sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls"] } dcspkg = { path = "../dcspkg" } diff --git a/dcspkg-server/Cargo.toml b/dcspkg-server/Cargo.toml index 59e5209..6dd6b45 100644 --- a/dcspkg-server/Cargo.toml +++ b/dcspkg-server/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/uwcs/dcspkg" license = "MIT" [dependencies] -sqlx = { version = "0.6.2", features = ["sqlite"] } +sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls"] } rocket = { version = "0.5.0-rc.2", features = ["json"] } dotenv = "0.15.0" serde = { version = "1.0.144", features = ["derive"] }