Fix tests and example 05

Author: Zeyla Hellyer

examples/05_command_framework/src/main.rs

@@ -133,7 +133,7 @@ fn main() {
                 .bucket("emoji") // Make this command use the "emoji" bucket.
                 .exec_str(":cat:")
                  // Allow only administrators to call this:
-                .required_permissions(permissions::ADMINISTRATOR))
+                .required_permissions(Permissions::ADMINISTRATOR))
             .command("dog", |c| c
                 .desc("Sends an emoji with a dog.")
                 .bucket("emoji")

src/client/bridge/gateway/mod.rs

@@ -19,6 +19,7 @@ type LockedShard = Parked<Shard>;
 pub enum ShardManagerMessage {
     Restart(ShardId),
     Shutdown(ShardId),
+    #[allow(dead_code)]
     ShutdownAll,
 }
 

src/client/bridge/gateway/shard_runner.rs

@@ -12,10 +12,6 @@ use websocket::WebSocketError;
 #[cfg(feature = "framework")]
 use framework::Framework;
 
-enum EventRetrieval {
-    Some()
-}
-
 pub struct ShardRunner<H: EventHandler + 'static> {
     data: Arc<ParkingLotMutex<ShareMap>>,
     event_handler: Arc<H>,

src/framework/standard/create_command.rs

@@ -37,7 +37,12 @@ impl CreateCommand {
     /// # struct Handler;
     /// # impl EventHandler for Handler {}
     /// use serenity::client::{Client, Context};
-    /// use serenity::framework::standard::{Args, Command, StandardFramework};
+    /// use serenity::framework::standard::{
+    ///     Args,
+    ///     Command,
+    ///     CommandError,
+    ///     StandardFramework,
+    /// };
     /// use serenity::model::Message;
     /// use std::env;
     /// use std::sync::Arc;
@@ -52,8 +57,8 @@ impl CreateCommand {
     ///         .exec(ping)));
     ///
     /// fn ping(_context: &mut Context, message: &Message, _args: Args) -> Result<(),
-    /// String> {
-    ///     let _ = message.channel_id.say("Pong!");
+    /// CommandError> {
+    ///     message.channel_id.say("Pong!")?;
     ///
     ///     Ok(())
     /// }

src/voice/connection.rs

@@ -73,10 +73,10 @@ impl Connection {
 
         let hello = loop {
             match client.recv_json(VoiceEvent::decode)? {
-                VoiceEvent::Hello(received_hello) => {
+                Some(VoiceEvent::Hello(received_hello)) => {
                     break received_hello;
                 },
-                VoiceEvent::Heartbeat(_) => continue,
+                Some(VoiceEvent::Heartbeat(_)) => continue,
                 other => {
                     debug!("[Voice] Expected hello/heartbeat; got: {:?}", other);
 
@@ -388,15 +388,15 @@ fn generate_url(endpoint: &mut String) -> Result<WebsocketUrl> {
 fn encryption_key(client: &mut Client) -> Result<Key> {
     loop {
         match client.recv_json(VoiceEvent::decode)? {
-            VoiceEvent::Ready(ready) => {
+            Some(VoiceEvent::Ready(ready)) => {
                 if ready.mode != CRYPTO_MODE {
                     return Err(Error::Voice(VoiceError::VoiceModeInvalid));
                 }
 
                 return Key::from_slice(&ready.secret_key)
                     .ok_or(Error::Voice(VoiceError::KeyGen));
             },
-            VoiceEvent::Unknown(op, value) => {
+            Some(VoiceEvent::Unknown(op, value)) => {
                 debug!(
                     "[Voice] Expected ready for key; got: op{}/v{:?}",
                     op.num(),
@@ -447,7 +447,7 @@ fn start_threads(client: Arc<Mutex<Client>>, udp: &UdpSocket) -> Result<ThreadIt
     let ws_thread = ThreadBuilder::new()
         .name(format!("{} WS", thread_name))
         .spawn(move || loop {
-            while let Ok(msg) = client.lock().unwrap().recv_json(VoiceEvent::decode) {
+            while let Ok(Some(msg)) = client.lock().unwrap().recv_json(VoiceEvent::decode) {
                 if tx_clone.send(ReceiverStatus::Websocket(msg)).is_ok() {
                     return;
                 }