pubsub: Move Subscription to the module.

src/pubsub/event.rs

@@ -16,7 +16,7 @@ use ns;
 
 use data_forms::DataForm;
 
-use pubsub::{NodeName, ItemId, SubscriptionId};
+use pubsub::{NodeName, ItemId, Subscription, SubscriptionId};
 
 #[derive(Debug, Clone)]
 pub struct Item {
@@ -58,13 +58,6 @@ impl From<Item> for Element {
     }
 }
 
-generate_attribute!(Subscription, "subscription", {
-    None => "none",
-    Pending => "pending",
-    Subscribed => "subscribed",
-    Unconfigured => "unconfigured",
-}, Default = None);
-
 #[derive(Debug, Clone)]
 pub enum PubSubEvent {
     /*

src/pubsub/mod.rs

@@ -11,3 +11,10 @@ pub use self::event::PubSubEvent;
 generate_id!(NodeName);
 generate_id!(ItemId);
 generate_id!(SubscriptionId);
+
+generate_attribute!(Subscription, "subscription", {
+    None => "none",
+    Pending => "pending",
+    Subscribed => "subscribed",
+    Unconfigured => "unconfigured",
+}, Default = None);