diff options
| author | Austin Hellyer <[email protected]> | 2017-01-24 11:03:31 -0800 |
|---|---|---|
| committer | Austin Hellyer <[email protected]> | 2017-01-24 11:03:31 -0800 |
| commit | 8260b04fc40857bf0e50d00d91ec900f6700d02d (patch) | |
| tree | de3e680d7c9ef48734b7ddac684ba4317cd180e7 /src/ext | |
| parent | Avoid a lot of Arc/Message/RwLock clones (diff) | |
| download | serenity-8260b04fc40857bf0e50d00d91ec900f6700d02d.tar.xz serenity-8260b04fc40857bf0e50d00d91ec900f6700d02d.zip | |
Properly drop on binds
Instead of binding to `_why`, bind to `_`, dropping the value.
This is pretty much just leftover from when the library was being
rapidly developed before being released.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/voice/connection.rs | 12 | ||||
| -rw-r--r-- | src/ext/voice/handler.rs | 11 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/ext/voice/connection.rs b/src/ext/voice/connection.rs index 3f40d85..1b2569d 100644 --- a/src/ext/voice/connection.rs +++ b/src/ext/voice/connection.rs @@ -83,7 +83,7 @@ impl Connection { break; }, - VoiceEvent::Heartbeat(_heartbeat) => continue, + VoiceEvent::Heartbeat(_) => continue, other => { debug!("[Voice] Expected hello/heartbeat; got: {:?}", other); @@ -220,7 +220,7 @@ impl Connection { } } else { loop { - if let Err(_why) = self.thread_items.rx.try_recv() { + if let Err(_) = self.thread_items.rx.try_recv() { break; } } @@ -440,10 +440,10 @@ fn start_threads(mut receiver: WsReceiver<WebSocketStream>, udp: &UdpSocket) let piece = buffer[..len].iter().cloned().collect(); let send = tx.send(ReceiverStatus::Udp(piece)); - if let Err(_why) = send { + if let Err(_) = send { return; } - } else if let Ok(_v) = udp_close_reader.try_recv() { + } else if let Ok(_) = udp_close_reader.try_recv() { return; } } @@ -454,12 +454,12 @@ fn start_threads(mut receiver: WsReceiver<WebSocketStream>, udp: &UdpSocket) .spawn(move || { loop { while let Ok(msg) = receiver.recv_json(VoiceEvent::decode) { - if let Err(_why) = tx_clone.send(ReceiverStatus::Websocket(msg)) { + if let Err(_) = tx_clone.send(ReceiverStatus::Websocket(msg)) { return; } } - if let Ok(_v) = ws_close_reader.try_recv() { + if let Ok(_) = ws_close_reader.try_recv() { return; } diff --git a/src/ext/voice/handler.rs b/src/ext/voice/handler.rs index f954d22..949e725 100644 --- a/src/ext/voice/handler.rs +++ b/src/ext/voice/handler.rs @@ -161,13 +161,10 @@ impl Handler { /// This does _not_ forget settings, like whether to be self-deafened or /// self-muted. pub fn leave(&mut self) { - match self.channel_id { - None => return, - Some(_channel_id) => { - self.channel_id = None; + if let Some(_) = self.channel_id { + self.channel_id = None; - self.update(); - }, + self.update(); } } @@ -231,7 +228,7 @@ impl Handler { // If already connected to the given channel, do nothing. return; }, - Some(_current_id) => { + Some(_) => { self.channel_id = Some(channel_id); self.update(); |