1 files changed, 21 insertions, 24 deletions

diff --git a/stanza/src/xep_0004.rs b/stanza/src/xep_0004.rs
index f929517..f6ff7a0 100644
--- a/stanza/src/xep_0004.rs
+++ b/stanza/src/xep_0004.rs
@@ -1,9 +1,6 @@
 use std::str::FromStr;
 
-use peanuts::{
-    element::{FromElement, IntoElement},
-    DeserializeError, Element,
-};
+use peanuts::{DeserializeError, Element, FromElement, IntoElement};
 
 pub const XMLNS: &str = "jabber:x:data";
 
@@ -18,7 +15,7 @@ pub struct X {
 }
 
 impl FromElement for X {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("x")?;
         element.check_namespace(XMLNS)?;
 
@@ -42,7 +39,7 @@ impl FromElement for X {
 }
 
 impl IntoElement for X {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("x", Some(XMLNS))
             .push_attribute("type", self.r#type.clone())
             .push_children(self.instructions.clone())
@@ -91,7 +88,7 @@ impl ToString for XType {
 pub struct Instructions(pub String);
 
 impl FromElement for Instructions {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("instructions")?;
         element.check_namespace(XMLNS)?;
 
@@ -100,7 +97,7 @@ impl FromElement for Instructions {
 }
 
 impl IntoElement for Instructions {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("instructions", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -109,7 +106,7 @@ impl IntoElement for Instructions {
 pub struct Title(pub String);
 
 impl FromElement for Title {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("instructions")?;
         element.check_namespace(XMLNS)?;
 
@@ -118,7 +115,7 @@ impl FromElement for Title {
 }
 
 impl IntoElement for Title {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("title", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -135,7 +132,7 @@ pub struct Field {
 }
 
 impl FromElement for Field {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("field")?;
         element.check_namespace(XMLNS)?;
 
@@ -166,7 +163,7 @@ impl FromElement for Field {
 }
 
 impl IntoElement for Field {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         let mut builder = Element::builder("field", Some(XMLNS))
             .push_attribute_opt("label", self.label.clone())
             .push_attribute_opt("type", self.r#type.clone())
@@ -239,7 +236,7 @@ impl ToString for FieldType {
 pub struct Desc(pub String);
 
 impl FromElement for Desc {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("desc")?;
         element.check_namespace(XMLNS)?;
 
@@ -248,7 +245,7 @@ impl FromElement for Desc {
 }
 
 impl IntoElement for Desc {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("desc", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -257,7 +254,7 @@ impl IntoElement for Desc {
 pub struct Required;
 
 impl FromElement for Required {
-    fn from_element(element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("required")?;
         element.check_namespace(XMLNS)?;
 
@@ -266,7 +263,7 @@ impl FromElement for Required {
 }
 
 impl IntoElement for Required {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("required", Some(XMLNS))
     }
 }
@@ -278,7 +275,7 @@ pub struct XOption {
 }
 
 impl FromElement for XOption {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("option")?;
         element.check_namespace(XMLNS)?;
 
@@ -291,7 +288,7 @@ impl FromElement for XOption {
 }
 
 impl IntoElement for XOption {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("option", Some(XMLNS))
             .push_attribute_opt("label", self.label.clone())
             .push_child(self.value.clone())
@@ -302,7 +299,7 @@ impl IntoElement for XOption {
 pub struct Value(pub String);
 
 impl FromElement for Value {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("value")?;
         element.check_namespace(XMLNS)?;
 
@@ -311,7 +308,7 @@ impl FromElement for Value {
 }
 
 impl IntoElement for Value {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("value", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -323,7 +320,7 @@ pub struct Reported {
 }
 
 impl FromElement for Reported {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("reported")?;
         element.check_namespace(XMLNS)?;
 
@@ -334,7 +331,7 @@ impl FromElement for Reported {
 }
 
 impl IntoElement for Reported {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("reported", Some(XMLNS)).push_children(self.fields.clone())
     }
 }
@@ -345,7 +342,7 @@ pub struct Item {
 }
 
 impl FromElement for Item {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("item")?;
         element.check_namespace(XMLNS)?;
 
@@ -356,7 +353,7 @@ impl FromElement for Item {
 }
 
 impl IntoElement for Item {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("item", Some(XMLNS)).push_children(self.fields.clone())
     }
 }