1 files changed, 21 insertions, 24 deletions

diff --git a/stanza/src/xep_0060/owner.rs b/stanza/src/xep_0060/owner.rs
index 7cf4355..0617712 100644
--- a/stanza/src/xep_0060/owner.rs
+++ b/stanza/src/xep_0060/owner.rs
@@ -1,10 +1,7 @@
 use std::str::FromStr;
 
 use jid::JID;
-use peanuts::{
-    element::{FromElement, IntoElement},
-    DeserializeError, Element,
-};
+use peanuts::{DeserializeError, Element, FromElement, IntoElement};
 
 use crate::xep_0004::X;
 
@@ -21,7 +18,7 @@ pub enum Pubsub {
 }
 
 impl FromElement for Pubsub {
-    fn from_element(mut element: peanuts::Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: peanuts::Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("pubsub")?;
         element.check_namespace(XMLNS)?;
 
@@ -44,7 +41,7 @@ impl FromElement for Pubsub {
 }
 
 impl IntoElement for Pubsub {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         let builder = Element::builder("pubsub", Some(XMLNS));
 
         match self {
@@ -65,7 +62,7 @@ pub struct Affiliations {
 }
 
 impl FromElement for Affiliations {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("affiliations")?;
         element.check_namespace(XMLNS)?;
 
@@ -78,7 +75,7 @@ impl FromElement for Affiliations {
 }
 
 impl IntoElement for Affiliations {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("affiliations", Some(XMLNS))
             .push_attribute("node", self.node.clone())
             .push_children(self.affiliations.clone())
@@ -92,7 +89,7 @@ pub struct Affiliation {
 }
 
 impl FromElement for Affiliation {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("affiliation")?;
         element.check_namespace(XMLNS)?;
 
@@ -104,7 +101,7 @@ impl FromElement for Affiliation {
 }
 
 impl IntoElement for Affiliation {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("affiliation", Some(XMLNS))
             .push_attribute("affiliation", self.affiliation.clone())
             .push_attribute("jid", self.jid.clone())
@@ -158,7 +155,7 @@ pub struct Configure {
 }
 
 impl FromElement for Configure {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("configure")?;
         element.check_namespace(XMLNS)?;
 
@@ -171,7 +168,7 @@ impl FromElement for Configure {
 }
 
 impl IntoElement for Configure {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("configure", Some(XMLNS))
             .push_attribute_opt("node", self.node.clone())
             .push_child_opt(self.configure.clone())
@@ -182,7 +179,7 @@ impl IntoElement for Configure {
 pub struct Default(Option<X>);
 
 impl FromElement for Default {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("default")?;
         element.check_namespace(XMLNS)?;
 
@@ -191,7 +188,7 @@ impl FromElement for Default {
 }
 
 impl IntoElement for Default {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("default", Some(XMLNS)).push_child_opt(self.0.clone())
     }
 }
@@ -203,7 +200,7 @@ pub struct Delete {
 }
 
 impl FromElement for Delete {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("delete")?;
         element.check_namespace(XMLNS)?;
 
@@ -216,7 +213,7 @@ impl FromElement for Delete {
 }
 
 impl IntoElement for Delete {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("delete", Some(XMLNS))
             .push_attribute("node", self.node.clone())
             .push_child_opt(self.redirect.clone())
@@ -229,7 +226,7 @@ pub struct Purge {
 }
 
 impl FromElement for Purge {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("purge")?;
         element.check_namespace(XMLNS)?;
 
@@ -240,7 +237,7 @@ impl FromElement for Purge {
 }
 
 impl IntoElement for Purge {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("purge", Some(XMLNS)).push_attribute("node", self.node.clone())
     }
 }
@@ -251,7 +248,7 @@ pub struct Redirect {
 }
 
 impl FromElement for Redirect {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("redirect")?;
         element.check_namespace(XMLNS)?;
 
@@ -262,7 +259,7 @@ impl FromElement for Redirect {
 }
 
 impl IntoElement for Redirect {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("redirect", Some(XMLNS)).push_attribute("uri", self.uri.clone())
     }
 }
@@ -274,7 +271,7 @@ pub struct Subscriptions {
 }
 
 impl FromElement for Subscriptions {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("subscriptions")?;
         element.check_namespace(XMLNS)?;
 
@@ -290,7 +287,7 @@ impl FromElement for Subscriptions {
 }
 
 impl IntoElement for Subscriptions {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("subscriptions", Some(XMLNS))
             .push_attribute("node", self.node.clone())
             .push_children(self.subscriptions.clone())
@@ -304,7 +301,7 @@ pub struct Subscription {
 }
 
 impl FromElement for Subscription {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("subscription")?;
         element.check_namespace(XMLNS)?;
 
@@ -316,7 +313,7 @@ impl FromElement for Subscription {
 }
 
 impl IntoElement for Subscription {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("subscription", Some(XMLNS))
             .push_attribute("subscription", self.subscription.clone())
             .push_attribute("jid", self.jid.clone())