From 688ae145be042c722655c4e9c46bdb8442956afb Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 14 May 2018 17:49:25 +0200
Subject: [PATCH] pubsub: Move common attributes to the module.

---
 src/pubsub/event.rs | 4 +---
 src/pubsub/mod.rs   | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs
index 8ac16caf..dea11ba4 100644
--- a/src/pubsub/event.rs
+++ b/src/pubsub/event.rs
@@ -16,9 +16,7 @@ use ns;
 
 use data_forms::DataForm;
 
-generate_id!(NodeName);
-generate_id!(ItemId);
-generate_id!(SubscriptionId);
+use pubsub::{NodeName, ItemId, SubscriptionId};
 
 #[derive(Debug, Clone)]
 pub struct Item {
diff --git a/src/pubsub/mod.rs b/src/pubsub/mod.rs
index 9eb93944..89b6f8ce 100644
--- a/src/pubsub/mod.rs
+++ b/src/pubsub/mod.rs
@@ -7,3 +7,7 @@
 pub mod event;
 
 pub use self::event::PubSubEvent;
+
+generate_id!(NodeName);
+generate_id!(ItemId);
+generate_id!(SubscriptionId);