Skip to content

Commit

Permalink
Deps: Bump twilight versions -> 0.5 (#79)
Browse files Browse the repository at this point in the history
  • Loading branch information
vilgotf authored and FelixMcFelix committed Jun 14, 2021
1 parent edcd39a commit d2bb277
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ default-features = false

[dependencies.twilight-gateway]
optional = true
version = "0.4"
version = "0.5"
default-features = false

[dependencies.twilight-model]
optional = true
version = "0.4"
version = "0.5"
default-features = false

[dependencies.typemap_rev]
Expand Down Expand Up @@ -186,8 +186,8 @@ serenity-native = ["serenity/native_tls_backend", "native", "gateway", "serenity
twilight-rustls = ["twilight", "twilight-gateway/rustls", "rustls", "gateway"]
twilight-native = ["twilight", "twilight-gateway/native", "native", "gateway"]
twilight = ["twilight-model"]
simd-zlib = ["twilight-gateway/simd-zlib"]
stock-zlib = ["twilight-gateway/stock-zlib"]
zlib-simd = ["twilight-gateway/zlib-simd"]
zlib-stock = ["twilight-gateway/zlib-stock"]
serenity-deps = ["async-trait"]

rustls-marker = []
Expand Down Expand Up @@ -224,7 +224,7 @@ youtube-dlc = []
builtin-queue = []

# Used for docgen/testing/benchmarking.
full-doc = ["default", "twilight-rustls", "builtin-queue", "stock-zlib"]
full-doc = ["default", "twilight-rustls", "builtin-queue", "zlib-stock"]
internals = []

[[bench]]
Expand Down
6 changes: 3 additions & 3 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ compile_error!(

#[cfg(all(
feature = "twilight",
not(any(feature = "simd-zlib", feature = "stock-zlib"))
not(any(feature = "zlib-simd", feature = "zlib-stock"))
))]
compile_error!(
"Twilight requires you to specify a zlib backend: \
either the `simd-zlib` or `stock-zlib` feature must be
either the `zlib-simd` or `zlib-stock` feature must be
selected.\n\
If you are unsure, go with `stock-zlib`."
If you are unsure, go with `zlib-stock`."
);

fn main() {}
10 changes: 5 additions & 5 deletions examples/twilight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ tracing = "0.1"
tracing-subscriber = "0.2"
serde_json = { version = "1" }
tokio = { features = ["macros", "rt-multi-thread", "sync"], version = "1" }
twilight-gateway = "0.4"
twilight-http = "0.4"
twilight-model = "0.4"
twilight-standby = "0.4"
twilight-gateway = "0.5"
twilight-http = "0.5"
twilight-model = "0.5"
twilight-standby = "0.5"

[dependencies.songbird]
path = "../.."
default-features = false
features = ["twilight-rustls", "gateway", "driver", "stock-zlib"]
features = ["twilight-rustls", "gateway", "driver", "zlib-stock"]
15 changes: 7 additions & 8 deletions examples/twilight/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,15 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
// Initialize the tracing subscriber.
tracing_subscriber::fmt::init();

let state = {
let token = env::var("DISCORD_TOKEN")?;
let token = env::var("DISCORD_TOKEN")?;

let http = HttpClient::new(&token);
let user_id = http.current_user().await?.id;
let http = HttpClient::new(&token);

let (cluster, mut events) =
Cluster::new(token, Intents::GUILD_MESSAGES | Intents::GUILD_VOICE_STATES).await?;

let cluster =
Cluster::new(token, Intents::GUILD_MESSAGES | Intents::GUILD_VOICE_STATES).await?;
let state = {
let user_id = http.current_user().await?.id;

let shard_count = cluster.shards().len();
let songbird = Songbird::twilight(cluster.clone(), shard_count as u64, user_id);
Expand All @@ -80,8 +81,6 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
}
};

let mut events = state.cluster.events();

while let Some(event) = events.next().await {
state.standby.process(&event.1);
state.songbird.process(&event.1).await;
Expand Down

0 comments on commit d2bb277

Please sign in to comment.