From 735f59e3421d9cd9aa908318880467e93af2d788 Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Sat, 7 Oct 2017 17:14:06 +0200
Subject: Add the Display trait to Plugins

---
 src/plugin.rs | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/plugin.rs b/src/plugin.rs
index 473cab1..fdaad43 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -2,7 +2,7 @@ use std::fmt;
 use irc::client::prelude::*;
 use irc::error::Error as IrcError;
 
-pub trait Plugin: Send + Sync + fmt::Debug {
+pub trait Plugin: Send + Sync + fmt::Display + fmt::Debug {
     fn is_allowed(&self, server: &IrcServer, message: &Message) -> bool;
     fn execute(&mut self, server: &IrcServer, message: &Message) -> Result<(), IrcError>;
 }
@@ -10,25 +10,22 @@ pub trait Plugin: Send + Sync + fmt::Debug {
 #[macro_export]
 macro_rules! register_plugin {
     ($t:ident) => {
-        #[derive(Debug)]
-        pub struct $t;
-
-        impl $t {
-            pub fn new() -> $t {
-                $t { }
-            }
-        }
-    };
+        use std::fmt;
 
-    ($t:ident, $element: ident: $ty: ty) => {
         #[derive(Debug)]
         pub struct $t {
-            $element: $ty
+            _name: &'static str,
+        }
+
+        impl fmt::Display for $t {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                write!(f, "{}", self._name)
+            }
         }
 
         impl $t {
             pub fn new() -> $t {
-                $t { $element: <$ty>::new() }
+                $t { _name: stringify!($t) }
             }
         }
     };
-- 
cgit v1.2.3-70-g09d2