Improve `BanOptions` to be more efficient and remove uneccessary `Read` imports

6 files changed, 9 insertions, 19 deletions

diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index e5f410b..21ce9f1 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -4,8 +4,6 @@ use ::model::*;
 #[cfg(feature="model")]
 use std::fmt::Write as FmtWrite;
 #[cfg(feature="model")]
-use std::io::Read;
-#[cfg(feature="model")]
 use ::builder::{CreateMessage, EditChannel, GetMessages};
 #[cfg(feature="cache")]
 use ::CACHE;
diff --git a/src/model/channel/group.rs b/src/model/channel/group.rs
index 0b4f380..116b6c1 100644
--- a/src/model/channel/group.rs
+++ b/src/model/channel/group.rs
@@ -6,8 +6,6 @@ use std::borrow::Cow;
 #[cfg(feature="model")]
 use std::fmt::Write as FmtWrite;
 #[cfg(feature="model")]
-use std::io::Read;
-#[cfg(feature="model")]
 use ::builder::{CreateMessage, GetMessages};
 #[cfg(feature="model")]
 use ::http::{self, AttachmentType};
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index f15fb91..a506187 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -4,8 +4,6 @@ use ::model::*;
 #[cfg(feature="model")]
 use std::fmt::{Display, Formatter, Result as FmtResult};
 #[cfg(feature="model")]
-use std::io::Read;
-#[cfg(feature="model")]
 use std::mem;
 #[cfg(feature="cache")]
 use ::CACHE;
diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs
index 5c29a52..708e276 100644
--- a/src/model/channel/mod.rs
+++ b/src/model/channel/mod.rs
@@ -24,8 +24,6 @@ use ::model::*;
 #[cfg(feature="model")]
 use std::fmt::{Display, Formatter, Result as FmtResult};
 #[cfg(feature="model")]
-use std::io::Read;
-#[cfg(feature="model")]
 use ::builder::{CreateMessage, GetMessages};
 #[cfg(feature="model")]
 use ::http::AttachmentType;
diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs
index b105d7e..570a212 100644
--- a/src/model/channel/private_channel.rs
+++ b/src/model/channel/private_channel.rs
@@ -4,8 +4,6 @@ use super::deserialize_single_recipient;
 use ::model::*;
 
 #[cfg(feature="model")]
-use std::io::Read;
-#[cfg(feature="model")]
 use ::builder::{CreateMessage, GetMessages};
 #[cfg(feature="model")]
 use ::http::AttachmentType;
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 2b382a0..ab817e7 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -18,7 +18,7 @@ use ::utils::Colour;
 
 pub trait BanOptions {
     fn dmd(&self) -> u8 { 0 }
-    fn reason(&self) -> String { "".to_string() }
+    fn reason(&self) -> &str { "" }
 }
 
 impl BanOptions for u8 {
@@ -28,14 +28,14 @@ impl BanOptions for u8 {
 }
 
 impl BanOptions for str {
-    fn reason(&self) -> String {
-        self.to_string()
+    fn reason(&self) -> &str {
+        self
     }
 }
 
 impl BanOptions for String {
-    fn reason(&self) -> String {
-        self.clone()
+    fn reason(&self) -> &str {
+        &self
     }
 }
 
@@ -44,8 +44,8 @@ impl<'a> BanOptions for (u8, &'a str) {
         self.0
     }
 
-    fn reason(&self) -> String {
-        self.1.to_string()
+    fn reason(&self) -> &str {
+        self.1
     }
 }
 
@@ -54,8 +54,8 @@ impl BanOptions for (u8, String) {
         self.0
     }
 
-    fn reason(&self) -> String {
-        self.1.clone()
+    fn reason(&self) -> &str {
+        &self.1
     }
 }