aboutsummaryrefslogtreecommitdiff
path: root/src/framework
diff options
context:
space:
mode:
Diffstat (limited to 'src/framework')
-rw-r--r--src/framework/standard/command.rs31
1 files changed, 3 insertions, 28 deletions
diff --git a/src/framework/standard/command.rs b/src/framework/standard/command.rs
index aa8f7d8..1415d9b 100644
--- a/src/framework/standard/command.rs
+++ b/src/framework/standard/command.rs
@@ -3,7 +3,6 @@ use super::{Args, Configuration};
use client::Context;
use model::{Message, Permissions};
use std::collections::HashMap;
-use std::error::Error as StdError;
use std::fmt;
pub type Check = Fn(&mut Context, &Message, &mut Args, &Arc<Command>) -> bool
@@ -30,33 +29,9 @@ pub enum CommandOrAlias {
#[derive(Clone, Debug)]
pub struct Error(String);
-impl fmt::Display for Error {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(&self.0, f)
- }
-}
-
-impl<E: StdError> From<E> for Error {
- fn from(e: E) -> Self {
- Error(format!("{}", e))
- }
-}
-
-impl From<Custom> for Error {
- fn from(Custom(e): Custom) -> Self {
- Error(e)
- }
-}
-
-/// A custom "variant" of [`Error`]
-///
-/// [`Error`]: #struct.Error.html
-#[derive(Clone, Debug)]
-pub struct Custom(String);
-
-impl From<String> for Custom {
- fn from(e: String) -> Custom {
- Custom(e)
+impl<D: fmt::Display> From<D> for Error {
+ fn from(d: D) -> Self {
+ Error(format!("{}", d))
}
}