From f3205ef4caf1e787ac81acc2dc099093b423a3e7 Mon Sep 17 00:00:00 2001 From: jellywx Date: Wed, 27 Jan 2021 12:36:04 +0000 Subject: [PATCH] updated dependency to fix process leak --- Cargo.lock | 159 ++++++++++++++++++++++------------------------------- Cargo.toml | 2 +- 2 files changed, 66 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e20ffa6..a82c2b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,7 +87,7 @@ checksum = "f7cc5408453d37e2b1c6f01d8078af1da58b6cfa6a80fa2ede3bd2b9a6ada9c4" dependencies = [ "futures-io", "futures-util", - "log 0.4.13", + "log 0.4.14", "pin-project 1.0.4", "tokio", "tokio-rustls", @@ -119,7 +119,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927791de46f70facea982dbfaf19719a41ce6064443403be631a85de6a58fff9" dependencies = [ - "log 0.4.13", + "log 0.4.14", "pkg-config", ] @@ -215,28 +215,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" -[[package]] -name = "cargo-platform" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" -dependencies = [ - "cargo-platform", - "semver 0.11.0", - "semver-parser 0.10.2", - "serde", - "serde_json", -] - [[package]] name = "cc" version = "1.0.66" @@ -367,6 +345,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + [[package]] name = "digest" version = "0.9.0" @@ -583,7 +571,7 @@ checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc" dependencies = [ "cc", "libc", - "log 0.4.13", + "log 0.4.14", "rustc_version", "winapi 0.3.9", ] @@ -755,7 +743,7 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "futures-util", "hyper", - "log 0.4.13", + "log 0.4.14", "rustls", "tokio", "tokio-rustls", @@ -894,16 +882,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.13", + "log 0.4.14", ] [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -970,7 +958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" dependencies = [ "libc", - "log 0.4.13", + "log 0.4.14", "miow", "ntapi", "winapi 0.3.9", @@ -1003,7 +991,7 @@ checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", - "log 0.4.13", + "log 0.4.14", "openssl", "openssl-probe", "openssl-sys", @@ -1013,6 +1001,18 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nix" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" +dependencies = [ + "bitflags 1.2.1", + "cc", + "cfg-if 1.0.0", + "libc", +] + [[package]] name = "nom" version = "6.1.0" @@ -1211,15 +1211,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - [[package]] name = "pin-project" version = "0.4.27" @@ -1371,9 +1362,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", @@ -1507,7 +1498,7 @@ dependencies = [ "ipnet", "js-sys", "lazy_static", - "log 0.4.13", + "log 0.4.14", "mime", "mime_guess", "native-tls", @@ -1577,7 +1568,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0", + "semver", ] [[package]] @@ -1587,7 +1578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" dependencies = [ "base64 0.13.0", - "log 0.4.13", + "log 0.4.14", "ring", "sct", "webpki", @@ -1670,17 +1661,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", - "serde", + "semver-parser", ] [[package]] @@ -1689,29 +1670,20 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.122" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "974ef1bd2ad8a507599b336595454081ff68a9599b4890af7643c0c0ed73a62c" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.122" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dee1f300f838c8ac340ecb0112b3ac472464fa67e87292bdb3dfc9c49128e17" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" dependencies = [ "proc-macro2", "quote", @@ -1724,6 +1696,7 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" dependencies = [ + "indexmap", "itoa", "ryu", "serde", @@ -1864,19 +1837,21 @@ dependencies = [ [[package]] name = "songbird" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f1769451d1ca9e07a3b8a1450d486e76374331634e151a3f6ec78dae2afcc4" +checksum = "ed1268c7dead3227f6a2f7dddfa1a7a2f8208ddbe7dcdf845cd754df1135724c" dependencies = [ "async-trait", "async-tungstenite", "audiopus", "byteorder", + "dashmap", "discortp", "flume", "futures", + "nix", "parking_lot", - "rand 0.8.2", + "rand 0.8.3", "serde", "serde_json", "serenity", @@ -1898,7 +1873,7 @@ version = "1.1.1" dependencies = [ "dotenv", "lazy_static", - "log 0.4.13", + "log 0.4.14", "regex", "regex_command_attr", "reqwest", @@ -1949,7 +1924,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.4.2" -source = "git+https://github.com/ant32/sqlx.git?branch=tokio-1.0#ea545870599920591c22b01946dd88fdf9673ab7" +source = "git+https://github.com/launchbadge/sqlx.git#af7f2594457e991fd84a97a2170f79801fbdf1df" dependencies = [ "sqlx-core", "sqlx-macros", @@ -1958,7 +1933,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.4.2" -source = "git+https://github.com/ant32/sqlx.git?branch=tokio-1.0#ea545870599920591c22b01946dd88fdf9673ab7" +source = "git+https://github.com/launchbadge/sqlx.git#af7f2594457e991fd84a97a2170f79801fbdf1df" dependencies = [ "ahash 0.6.3", "atoi", @@ -1980,7 +1955,7 @@ dependencies = [ "hex", "itoa", "libc", - "log 0.4.13", + "log 0.4.14", "memchr", "num-bigint 0.3.1", "once_cell", @@ -1996,6 +1971,7 @@ dependencies = [ "sqlx-rt", "stringprep", "thiserror", + "tokio-stream", "url", "webpki", "webpki-roots 0.21.0", @@ -2005,16 +1981,17 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.4.2" -source = "git+https://github.com/ant32/sqlx.git?branch=tokio-1.0#ea545870599920591c22b01946dd88fdf9673ab7" +source = "git+https://github.com/launchbadge/sqlx.git#af7f2594457e991fd84a97a2170f79801fbdf1df" dependencies = [ - "cargo_metadata", "dotenv", "either", "futures", "heck", - "lazy_static", + "once_cell", "proc-macro2", "quote", + "serde", + "serde_json", "sqlx-core", "sqlx-rt", "syn", @@ -2024,7 +2001,7 @@ dependencies = [ [[package]] name = "sqlx-rt" version = "0.2.0" -source = "git+https://github.com/ant32/sqlx.git?branch=tokio-1.0#ea545870599920591c22b01946dd88fdf9673ab7" +source = "git+https://github.com/launchbadge/sqlx.git#af7f2594457e991fd84a97a2170f79801fbdf1df" dependencies = [ "once_cell", "tokio", @@ -2150,7 +2127,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.2", + "rand 0.8.3", "redox_syscall 0.2.4", "remove_dir_all", "winapi 0.3.9", @@ -2207,9 +2184,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -2292,7 +2269,7 @@ dependencies = [ "bytes 1.0.1", "futures-core", "futures-sink", - "log 0.4.13", + "log 0.4.14", "pin-project-lite", "tokio", "tokio-stream", @@ -2364,7 +2341,7 @@ dependencies = [ "http", "httparse", "input_buffer", - "log 0.4.13", + "log 0.4.14", "rand 0.7.3", "sha-1", "url", @@ -2383,12 +2360,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - [[package]] name = "unicase" version = "2.6.0" @@ -2507,7 +2478,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.13", + "log 0.4.14", "try-lock", ] @@ -2543,7 +2514,7 @@ checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.13", + "log 0.4.14", "proc-macro2", "quote", "syn", diff --git a/Cargo.toml b/Cargo.toml index fde6886..57f55a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] serenity = { version = "0.10", features = ["voice", "collector"] } -sqlx = { git = "https://github.com/ant32/sqlx.git", branch = "tokio-1.0", default-features = false, features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal"] } +sqlx = { git = "https://github.com/launchbadge/sqlx.git", default-features = false, features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal"] } dotenv = "0.15" tokio = { version = "1.0", features = ["fs", "process", "io-util"] } lazy_static = "1.4"