diff --git a/Cargo.lock b/Cargo.lock index f343c62..f7de09e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,12 +15,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "arc-swap" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" - [[package]] name = "async-tls" version = "0.9.0" @@ -82,6 +76,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "bitflags" version = "1.2.1" @@ -649,35 +649,12 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.1", + "miow", "net2", "slab", "winapi 0.2.8", ] -[[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio", - "miow 0.3.5", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio", -] - [[package]] name = "miow" version = "0.2.1" @@ -690,16 +667,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" -dependencies = [ - "socket2", - "winapi 0.3.9", -] - [[package]] name = "native-tls" version = "0.2.4" @@ -963,7 +930,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" dependencies = [ - "base64", + "base64 0.12.3", "bytes", "encoding_rs", "futures-core", @@ -1011,7 +978,7 @@ dependencies = [ [[package]] name = "rust-nitro-sniper" -version = "2.6.5" +version = "2.6.6" dependencies = [ "chrono", "colored 2.0.0", @@ -1037,7 +1004,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ - "base64", + "base64 0.12.3", "log", "ring", "sct", @@ -1138,22 +1105,23 @@ dependencies = [ [[package]] name = "serenity" -version = "0.9.0-rc.0" -source = "git+https://github.com/Melonai/serenity?branch=current#c9602b82bfeec953d1f2f780f3f58bb2fdb66411" +version = "0.9.0-rc.2" +source = "git+https://github.com/Melonai/serenity?branch=current#a4a2d3109a821de602bca9b41e10d6580a0734e0" dependencies = [ "async-trait", "async-tungstenite", - "base64", + "base64 0.13.0", "bitflags", "bytes", "chrono", "flate2", "futures", - "log", "reqwest", "serde", "serde_json", "tokio", + "tracing", + "tracing-futures", "typemap_rev", "url", ] @@ -1171,16 +1139,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "signal-hook-registry" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" -dependencies = [ - "arc-swap", - "libc", -] - [[package]] name = "slab" version = "0.4.2" @@ -1267,16 +1225,11 @@ dependencies = [ "futures-core", "iovec", "lazy_static", - "libc", "memchr", "mio", - "mio-named-pipes", - "mio-uds", "pin-project-lite", - "signal-hook-registry", "slab", "tokio-macros", - "winapi 0.3.9", ] [[package]] @@ -1340,9 +1293,21 @@ checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" dependencies = [ "cfg-if", "log", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-core" version = "0.1.15" @@ -1352,6 +1317,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-futures" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "try-lock" version = "0.2.3" @@ -1364,7 +1339,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ - "base64", + "base64 0.12.3", "byteorder", "bytes", "http", diff --git a/Cargo.toml b/Cargo.toml index 75f4390..a893485 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-nitro-sniper" -version = "2.6.5" +version = "2.6.6" authors = ["Mel"] edition = "2018" diff --git a/src/logging.rs b/src/logging.rs index f372e90..72dd917 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -167,6 +167,7 @@ pub fn set_up_logger() -> Result<(), SetLoggerError> { )) }) .level_for("serenity", log::LevelFilter::Off) + .level_for("tracing::span", log::LevelFilter::Off) .level(log::LevelFilter::Info) .chain(std::io::stdout()) .apply()?; diff --git a/src/main.rs b/src/main.rs index 777dfdf..3cbed78 100644 --- a/src/main.rs +++ b/src/main.rs @@ -77,7 +77,7 @@ async fn main() { let mut tasks = Vec::new(); for (index, token) in sniping_tokens.iter().enumerate() { - let discord_client_result = DiscordClient::new(token) + let discord_client_result = DiscordClient::builder(token) .event_handler(discord::Handler::new(handler_info.clone())) .await;