aboutsummaryrefslogtreecommitdiff
path: root/src/client/bridge
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2017-10-04 22:18:16 -0500
committerZeyla Hellyer <[email protected]>2017-10-09 15:48:18 -0700
commitda05efc610e59087887adb71bbeb71bc7b1494b6 (patch)
treee527b6aa1c97bcd850e90b3580f674173587fd68 /src/client/bridge
parentReplace Vec parameters by IntoIterator (#176) (diff)
downloadserenity-da05efc610e59087887adb71bbeb71bc7b1494b6.tar.xz
serenity-da05efc610e59087887adb71bbeb71bc7b1494b6.zip
Fix most clippy warnings
Diffstat (limited to 'src/client/bridge')
-rw-r--r--src/client/bridge/gateway/shard_manager.rs7
-rw-r--r--src/client/bridge/gateway/shard_queuer.rs9
2 files changed, 2 insertions, 14 deletions
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
index 3bdf0f9..5dbe0c3 100644
--- a/src/client/bridge/gateway/shard_manager.rs
+++ b/src/client/bridge/gateway/shard_manager.rs
@@ -127,12 +127,7 @@ impl ShardManager {
}
pub fn run(&mut self) {
- loop {
- let value = match self.thread_rx.recv() {
- Ok(value) => value,
- Err(_) => break,
- };
-
+ while let Ok(value) = self.thread_rx.recv() {
match value {
ShardManagerMessage::Restart(shard_id) => self.restart(shard_id),
ShardManagerMessage::Shutdown(shard_id) => self.shutdown(shard_id),
diff --git a/src/client/bridge/gateway/shard_queuer.rs b/src/client/bridge/gateway/shard_queuer.rs
index 76e3872..f35acb7 100644
--- a/src/client/bridge/gateway/shard_queuer.rs
+++ b/src/client/bridge/gateway/shard_queuer.rs
@@ -40,14 +40,7 @@ pub struct ShardQueuer<H: EventHandler + Send + Sync + 'static> {
impl<H: EventHandler + Send + Sync + 'static> ShardQueuer<H> {
pub fn run(&mut self) {
- loop {
- let msg = match self.rx.recv() {
- Ok(msg) => msg,
- Err(_) => {
- break;
- }
- };
-
+ while let Ok(msg) = self.rx.recv() {
match msg {
ShardQueuerMessage::Shutdown => break,
ShardQueuerMessage::Start(shard_id, shard_total) => {