Merge branch 'branch-v0.4.5' into v0.5.0

1 files changed, 2 insertions, 31 deletions

diff --git a/src/builder/edit_role.rs b/src/builder/edit_role.rs
index 856ef27..7e2ff17 100644
--- a/src/builder/edit_role.rs
+++ b/src/builder/edit_role.rs
@@ -1,7 +1,6 @@
 use internal::prelude::*;
 use std::collections::HashMap;
-use std::default::Default;
-use model::{permissions, Permissions, Role};
+use model::{Permissions, Role};
 
 /// A builer to create or edit a [`Role`] for use via a number of model methods.
 ///
@@ -39,7 +38,7 @@ use model::{permissions, Permissions, Role};
 /// [`GuildId::edit_role`]: ../model/struct.GuildId.html#method.edit_role
 /// [`Role`]: ../model/struct.Role.html
 /// [`Role::edit`]: ../model/struct.Role.html#method.edit
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct EditRole(pub HashMap<&'static str, Value>);
 
 impl EditRole {
@@ -114,31 +113,3 @@ impl EditRole {
         self
     }
 }
-
-impl Default for EditRole {
-    /// Creates a builder with default parameters.
-    ///
-    /// The defaults are:
-    ///
-    /// - **color**: 10070709
-    /// - **hoist**: false
-    /// - **mentionable**: false
-    /// - **name**: new role
-    /// - **permissions**: the [general permissions set]
-    /// - **position**: 1
-    ///
-    /// [general permissions set]: ../model/permissions/constant.PRESET_GENERAL.html
-    fn default() -> EditRole {
-        let mut map = HashMap::new();
-        let permissions = Number::from(permissions::PRESET_GENERAL.bits());
-
-        map.insert("color", Value::Number(Number::from(10_070_709)));
-        map.insert("hoist", Value::Bool(false));
-        map.insert("mentionable", Value::Bool(false));
-        map.insert("name", Value::String("new role".to_string()));
-        map.insert("permissions", Value::Number(permissions));
-        map.insert("position", Value::Number(Number::from(1)));
-
-        EditRole(map)
-    }
-}