deps

Cargo.lock

@@ -1374,8 +1374,9 @@ dependencies = [
 
 [[package]]
 name = "poise"
-version = "0.1.0"
+version = "0.2.0"
-source = "git+https://github.com/jellywx/poise?branch=jellywx-pv2#86f88dc817918e96880741508ea3777d1df52a66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2eb79ba8241eb65b549e778e22a242ea30f5829f7487f10d8d95cfff9a4729"
 dependencies = [
  "async-trait",
  "derivative",
@@ -1385,14 +1386,15 @@ dependencies = [
  "once_cell",
  "poise_macros",
  "regex",
- "serenity 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serenity",
  "tokio",
 ]
 
 [[package]]
 name = "poise_macros"
-version = "0.1.0"
+version = "0.2.0"
-source = "git+https://github.com/jellywx/poise?branch=jellywx-pv2#86f88dc817918e96880741508ea3777d1df52a66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b786b4bdc58345204469420c306d8c638e465b4b1ecad7e27bf9c8a45096cf"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -1803,33 +1805,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "serenity"
-version = "0.11.2"
-source = "git+https://github.com//serenity-rs/serenity?branch=current#c9286b14136128f68e2f4a44859e3bec21fa9de6"
-dependencies = [
- "async-trait",
- "async-tungstenite",
- "base64",
- "bitflags",
- "bytes",
- "cfg-if",
- "flate2",
- "futures",
- "mime",
- "mime_guess",
- "percent-encoding",
- "reqwest",
- "serde",
- "serde-value",
- "serde_json",
- "time",
- "tokio",
- "tracing",
- "typemap_rev",
- "url",
-]
-
 [[package]]
 name = "serenity-voice-model"
 version = "0.1.1"
@@ -1938,7 +1913,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "serenity 0.11.2 (git+https://github.com//serenity-rs/serenity?branch=current)",
+ "serenity",
  "serenity-voice-model",
  "streamcatcher",
  "symphonia-core",

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 songbird = { git = "https://github.com/serenity-rs/songbird", branch = "next", features = ["builtin-queue"] }
-poise = { git = "https://github.com/jellywx/poise", branch = "jellywx-pv2" }
+poise = "0.2"
 sqlx = { version = "0.5", default-features = false, features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal"] }
 dotenv = "0.15"
 tokio = { version = "1", features = ["fs", "process", "io-util"] }
@@ -19,4 +19,4 @@ serde_json = "1.0"
 dashmap = "4.0"
 
 [patch."https://github.com/serenity-rs/serenity"]
-serenity = { git = "https://github.com//serenity-rs/serenity", branch = "current" }
+serenity = { version = "0.11" }

src/main.rs

@@ -15,7 +15,7 @@ use dotenv::dotenv;
 use poise::serenity::{
     builder::CreateApplicationCommands,
     model::{
-        gateway::{Activity, GatewayIntents},
+        gateway::GatewayIntents,
         id::{GuildId, UserId},
     },
 };