diff options
| author | Zeyla Hellyer <[email protected]> | 2017-04-09 12:24:14 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-04-09 12:24:14 -0700 |
| commit | c8536c111117f26833fb1bceff734ac1abc55479 (patch) | |
| tree | 6d4c3d78fb4809d6c70968af1ce87f4a2e77fd36 /src/ext | |
| parent | Remove support for group calls and guild sync (diff) | |
| download | serenity-c8536c111117f26833fb1bceff734ac1abc55479.tar.xz serenity-c8536c111117f26833fb1bceff734ac1abc55479.zip | |
Clippy lints + permission byte literals
Perform a number of various clippy lints, and rewrite the permissions
values to use byte literals instead of bitshifts.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/voice/connection.rs | 16 | ||||
| -rw-r--r-- | src/ext/voice/handler.rs | 2 | ||||
| -rw-r--r-- | src/ext/voice/threading.rs | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/ext/voice/connection.rs b/src/ext/voice/connection.rs index 1b2569d..db254a4 100644 --- a/src/ext/voice/connection.rs +++ b/src/ext/voice/connection.rs @@ -96,7 +96,7 @@ impl Connection { hello }; - if !has_valid_mode(hello.modes) { + if !has_valid_mode(&hello.modes) { return Err(Error::Voice(VoiceError::VoiceModeUnavailable)); } @@ -220,7 +220,7 @@ impl Connection { } } else { loop { - if let Err(_) = self.thread_items.rx.try_recv() { + if self.thread_items.rx.try_recv().is_err() { break; } } @@ -411,7 +411,7 @@ fn get_encryption_key(receiver: &mut WsReceiver<WebSocketStream>) } #[inline] -fn has_valid_mode(modes: Vec<String>) -> bool { +fn has_valid_mode(modes: &[String]) -> bool { modes.iter().any(|s| s == CRYPTO_MODE) } @@ -437,13 +437,13 @@ fn start_threads(mut receiver: WsReceiver<WebSocketStream>, udp: &UdpSocket) loop { if let Ok((len, _)) = udp_clone.recv_from(&mut buffer) { - let piece = buffer[..len].iter().cloned().collect(); + let piece = buffer[..len].to_vec(); let send = tx.send(ReceiverStatus::Udp(piece)); - if let Err(_) = send { + if send.is_err() { return; } - } else if let Ok(_) = udp_close_reader.try_recv() { + } else if udp_close_reader.try_recv().is_ok() { 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(_) = tx_clone.send(ReceiverStatus::Websocket(msg)) { + if tx_clone.send(ReceiverStatus::Websocket(msg)).is_ok() { return; } } - if let Ok(_) = ws_close_reader.try_recv() { + if ws_close_reader.try_recv().is_ok() { return; } diff --git a/src/ext/voice/handler.rs b/src/ext/voice/handler.rs index cb5838c..60cc6e6 100644 --- a/src/ext/voice/handler.rs +++ b/src/ext/voice/handler.rs @@ -220,7 +220,7 @@ impl Handler { /// [`standalone`]: #method.standalone pub fn leave(&mut self) { // Only send an update if we were in a voice channel. - if let Some(_) = self.channel_id { + if self.channel_id.is_some() { self.channel_id = None; self.update(); diff --git a/src/ext/voice/threading.rs b/src/ext/voice/threading.rs index 3986f48..4777231 100644 --- a/src/ext/voice/threading.rs +++ b/src/ext/voice/threading.rs @@ -10,11 +10,11 @@ pub fn start(guild_id: GuildId, rx: MpscReceiver<Status>) { ThreadBuilder::new() .name(name) - .spawn(move || runner(rx)) + .spawn(move || runner(&rx)) .expect(&format!("[Voice] Error starting guild: {:?}", guild_id)); } -fn runner(rx: MpscReceiver<Status>) { +fn runner(rx: &MpscReceiver<Status>) { let mut sender = None; let mut receiver = None; let mut connection = None; |