1 files changed, 17 insertions, 20 deletions

diff --git a/stanza/src/xep_0156.rs b/stanza/src/xep_0156.rs
index ad22f7e..bf6eac5 100644
--- a/stanza/src/xep_0156.rs
+++ b/stanza/src/xep_0156.rs
@@ -1,8 +1,5 @@
 use chrono::{DateTime, Utc};
-use peanuts::{
-    element::{FromElement, IntoElement},
-    Element, XML_NS,
-};
+use peanuts::{Element, FromElement, IntoElement, XML_NS};
 
 pub const XMLNS: &str = "http://docs.oasis-open.org/ns/xri/xrd-1.0";
 pub const SIGNATURE_XMLNS: &str = "http://www.w3.org/2000/09/xmldsig#";
@@ -19,7 +16,7 @@ pub struct XRD {
 }
 
 impl FromElement for XRD {
-    fn from_element(mut element: peanuts::Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: peanuts::Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("XRD")?;
         element.check_namespace(XMLNS)?;
 
@@ -45,7 +42,7 @@ impl FromElement for XRD {
 }
 
 impl IntoElement for XRD {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("XRD", Some(XMLNS))
             .push_attribute_opt_namespaced(XML_NS, "id", self.id.clone())
             .push_child_opt(self.expires.clone())
@@ -61,7 +58,7 @@ impl IntoElement for XRD {
 pub struct Expires(pub DateTime<Utc>);
 
 impl FromElement for Expires {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Expires")?;
         element.check_namespace(XMLNS)?;
 
@@ -70,7 +67,7 @@ impl FromElement for Expires {
 }
 
 impl IntoElement for Expires {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Expires", Some(XMLNS))
             .push_text(self.0.format("%C%y-%m-%dT%H:%M:%S%.3f%:z"))
     }
@@ -81,7 +78,7 @@ impl IntoElement for Expires {
 pub struct Subject(pub String);
 
 impl FromElement for Subject {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Subject")?;
         element.check_namespace(XMLNS)?;
 
@@ -90,7 +87,7 @@ impl FromElement for Subject {
 }
 
 impl IntoElement for Subject {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Subject", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -100,7 +97,7 @@ impl IntoElement for Subject {
 pub struct Alias(pub String);
 
 impl FromElement for Alias {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Alias")?;
         element.check_namespace(XMLNS)?;
 
@@ -109,7 +106,7 @@ impl FromElement for Alias {
 }
 
 impl IntoElement for Alias {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Alias", Some(XMLNS)).push_text(self.0.clone())
     }
 }
@@ -121,7 +118,7 @@ pub struct Property {
 }
 
 impl FromElement for Property {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Property")?;
         element.check_name(XMLNS)?;
 
@@ -134,7 +131,7 @@ impl FromElement for Property {
 }
 
 impl IntoElement for Property {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Property", Some(XMLNS))
             .push_attribute("type", self.r#type.clone())
             .push_text_opt(self.property.clone())
@@ -152,7 +149,7 @@ pub struct Link {
 }
 
 impl FromElement for Link {
-    fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Link")?;
         element.check_namespace(XMLNS)?;
 
@@ -176,7 +173,7 @@ impl FromElement for Link {
 }
 
 impl IntoElement for Link {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Link", Some(XMLNS))
             .push_attribute_opt("rel", self.rel.clone())
             .push_attribute_opt("type", self.r#type.clone())
@@ -194,7 +191,7 @@ pub struct Title {
 }
 
 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("Title")?;
         element.check_namespace(XMLNS)?;
 
@@ -207,7 +204,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_attribute_opt_namespaced(XML_NS, "lang", self.lang.clone())
             .push_text(self.title.clone())
@@ -218,7 +215,7 @@ impl IntoElement for Title {
 pub struct Signature;
 
 impl FromElement for Signature {
-    fn from_element(element: Element) -> peanuts::element::DeserializeResult<Self> {
+    fn from_element(element: Element) -> peanuts::DeserializeResult<Self> {
         element.check_name("Signature")?;
         element.check_namespace(SIGNATURE_XMLNS)?;
 
@@ -227,7 +224,7 @@ impl FromElement for Signature {
 }
 
 impl IntoElement for Signature {
-    fn builder(&self) -> peanuts::element::ElementBuilder {
+    fn builder(&self) -> peanuts::ElementBuilder {
         Element::builder("Signature", Some(SIGNATURE_XMLNS))
     }
 }