Remove the 'extras' feature flag

There aren't many things behind this flag (6), and it only causes
annoyances for locally-generated docs, which won't show these
mostly-useful items behind the flag.

5 files changed, 4 insertions, 65 deletions

diff --git a/src/ext/cache/mod.rs b/src/ext/cache/mod.rs
index ac0946b..0552a14 100644
--- a/src/ext/cache/mod.rs
+++ b/src/ext/cache/mod.rs
@@ -132,7 +132,6 @@ impl Cache {
         self.guilds.get(&id.into())
     }
 
-    #[cfg(feature = "extras")]
     pub fn get_guild_channel<C: Into<ChannelId>>(&self, id: C) -> Option<&GuildChannel> {
         let id = id.into();
 
diff --git a/src/model/permissions.rs b/src/model/permissions.rs
index 3f164fe..1c613d3 100644
--- a/src/model/permissions.rs
+++ b/src/model/permissions.rs
@@ -82,7 +82,6 @@ use ::internal::prelude::*;
 /// [Speak]: constant.SPEAK.html
 /// [Use External Emojis]: constant.USE_EXTERNAL_EMOJIS.html
 /// [Use VAD]: constant.USE_VAD.html
-#[cfg(feature="extras")]
 pub fn general() -> Permissions {
     use self::*;
 
@@ -120,7 +119,6 @@ pub fn general() -> Permissions {
 /// [Send Messages]: constant.SEND_MESSAGES.html
 /// [Send TTS Messages]: constant.SEND_TTS_MESSAGES.html
 /// [Use External Emojis]: constant.USE_EXTERNAL_EMOJIS.html
-#[cfg(feature="extras")]
 pub fn text() -> Permissions {
     use self::*;
 
@@ -142,7 +140,6 @@ pub fn text() -> Permissions {
 /// [Connect]: constant.CONNECT.html
 /// [Speak]: constant.SPEAK.html
 /// [Use VAD]: constant.USE_VAD.html
-#[cfg(feature="extras")]
 pub fn voice() -> Permissions {
     use self::*;
 
diff --git a/src/utils/builder/edit_role.rs b/src/utils/builder/edit_role.rs
index 14f1af0..b4be6d4 100644
--- a/src/utils/builder/edit_role.rs
+++ b/src/utils/builder/edit_role.rs
@@ -93,18 +93,12 @@ impl Default for EditRole {
     ///
     /// [general permissions set]: ../model/permissions/fn.general.html
     fn default() -> EditRole {
-        let mut map = ObjectBuilder::new()
+        EditRole(ObjectBuilder::new()
             .insert("color", 10070709)
             .insert("hoist", false)
             .insert("mentionable", false)
-            .insert("name", "new role".to_owned());
-
-        feature_extras_enabled! {{
-            map = map.insert("permissions", permissions::general().bits());
-        }}
-
-        map = map.insert("position", 1);
-
-        EditRole(map)
+            .insert("name", "new role".to_owned())
+            .insert("permissions", permissions::general().bits())
+            .insert("position", 1))
     }
 }
diff --git a/src/utils/macros.rs b/src/utils/macros.rs
index 4a1d93b..d9026af 100644
--- a/src/utils/macros.rs
+++ b/src/utils/macros.rs
@@ -95,55 +95,6 @@ macro_rules! feature_cache_disabled {
     }
 }
 
-// Enable/disable check for extras
-#[cfg(feature = "extras")]
-macro_rules! feature_extras {
-    ($enabled:block else $disabled:block) => {
-        {
-            feature_extras_enabled! {{
-                $enabled
-            }}
-        }
-    }
-}
-
-#[cfg(not(feature = "extras"))]
-macro_rules! feature_extras {
-    ($enabled:block else $disabled:block) => {
-        {
-            $disabled
-        }
-    };
-}
-
-#[cfg(feature = "extras")]
-macro_rules! feature_extras_enabled {
-    ($enabled:block) => {{
-        {
-            $enabled
-        }
-    }}
-}
-
-#[cfg(not(feature = "extras"))]
-macro_rules! feature_extras_enabled {
-    ($enabled:block) => {{}}
-}
-
-#[cfg(feature = "extras")]
-macro_rules! feature_extras_disabled {
-    ($disabled:block) => {{}}
-}
-
-#[cfg(not(feature = "extras"))]
-macro_rules! feature_extras_disabled {
-    ($disabled:block) => {
-        {
-            $disabled
-        }
-    }
-}
-
 // Enable/disable check for framework
 #[cfg(feature = "framework")]
 macro_rules! feature_framework {
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index cb97a58..2356ece 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -8,7 +8,6 @@ pub mod builder;
 
 mod colour;
 
-#[cfg(feature = "extras")]
 mod message_builder;
 
 pub use self::colour::Colour;
@@ -20,7 +19,6 @@ use std::io::Read;
 use std::path::Path;
 use ::internal::prelude::*;
 
-#[cfg(feature = "extras")]
 pub use self::message_builder::MessageBuilder;
 
 macro_rules! cdn_concat {