diff --git a/COMPILING.md b/COMPILING.md index 8d0631f..cde8a47 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -80,4 +80,4 @@ cargo build --release --features metrics # MSRV -The current minimum supported rust version is `1.68.0`. +The current minimum supported rust version is `1.65.0`. diff --git a/Cargo.lock b/Cargo.lock index 31cad25..fbbeb08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "log", "pin-project-lite", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tungstenite", "webpki-roots", ] @@ -1024,15 +1024,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls", + "rustls 0.21.1", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", ] [[package]] @@ -2149,9 +2149,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.0", "bytes", @@ -2173,14 +2173,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.1", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.0", "tokio-util", "tower-service", "url", @@ -2274,6 +2274,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" @@ -2283,6 +2295,16 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -2382,9 +2404,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -2401,9 +2423,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", @@ -2470,7 +2492,7 @@ dependencies = [ "serde-value", "serde_json", "static_assertions", - "time 0.3.20", + "time 0.3.21", "tokio", "tracing", "typemap_rev", @@ -2650,7 +2672,7 @@ dependencies = [ "serenity", "songbird", "thiserror", - "time 0.3.20", + "time 0.3.21", "tokio", "zerocopy", ] @@ -2789,9 +2811,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -2801,15 +2823,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -2831,9 +2853,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", @@ -2845,14 +2867,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -2875,11 +2897,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.12" @@ -3003,7 +3035,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.20.8", "sha-1 0.10.1", "thiserror", "url", diff --git a/Cargo.toml b/Cargo.toml index 9024e9c..d9f2c52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "spoticord" version = "2.0.0-pre" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.65.0" [[bin]] name = "spoticord" @@ -20,13 +20,13 @@ lazy_static = { version = "1.4.0", optional = true } librespot = { version = "0.4.2", default-features = false } log = "0.4.17" prometheus = { version = "0.13.3", optional = true, features = ["push", "process"] } -reqwest = "0.11.16" +reqwest = "0.11.18" samplerate = "0.2.4" -serde = "1.0.160" +serde = "1.0.163" serde_json = "1.0.96" serenity = { version = "0.11.5", features = ["framework", "cache", "standard_framework"], default-features = false } songbird = "0.3.2" thiserror = "1.0.40" -time = "0.3.20" -tokio = { version = "1.27.0", features = ["rt", "full"] } +time = "0.3.21" +tokio = { version = "1.28.1", features = ["rt", "full"] } zerocopy = "0.6.1" diff --git a/Dockerfile b/Dockerfile index c545b9e..1564679 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Builder -FROM rust:1.64-buster as builder +FROM rust:1.65-buster as builder WORKDIR /app diff --git a/Dockerfile.metrics b/Dockerfile.metrics index 74d3e3b..9d7dc42 100644 --- a/Dockerfile.metrics +++ b/Dockerfile.metrics @@ -1,5 +1,5 @@ # Builder -FROM rust:1.64-buster as builder +FROM rust:1.65-buster as builder WORKDIR /app diff --git a/src/bot/events.rs b/src/bot/events.rs index b899fcc..0fd1a77 100644 --- a/src/bot/events.rs +++ b/src/bot/events.rs @@ -47,10 +47,7 @@ impl EventHandler for Handler { debug!("Ready received, logged in as {}", ready.user.name); - // Set this to true only when a command is removed/updated/created - if false { - command_manager.register(&ctx).await; - } + command_manager.register(&ctx).await; ctx.set_activity(Activity::listening(MOTD)).await;