diff options
Diffstat (limited to 'stanza/src/sasl.rs')
-rw-r--r-- | stanza/src/sasl.rs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/stanza/src/sasl.rs b/stanza/src/sasl.rs index 598a91b..58aab84 100644 --- a/stanza/src/sasl.rs +++ b/stanza/src/sasl.rs @@ -1,9 +1,6 @@ use std::{fmt::Display, ops::Deref}; -use peanuts::{ - element::{FromElement, IntoElement}, - DeserializeError, Element, -}; +use peanuts::{DeserializeError, Element, FromElement, IntoElement}; use thiserror::Error; pub const XMLNS: &str = "urn:ietf:params:xml:ns:xmpp-sasl"; @@ -14,7 +11,7 @@ pub struct Mechanisms { } impl FromElement for Mechanisms { - fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> { element.check_name("mechanisms")?; element.check_namespace(XMLNS)?; let mechanisms: Vec<Mechanism> = element.pop_children()?; @@ -27,7 +24,7 @@ impl FromElement for Mechanisms { } impl IntoElement for Mechanisms { - fn builder(&self) -> peanuts::element::ElementBuilder { + fn builder(&self) -> peanuts::ElementBuilder { Element::builder("mechanisms", Some(XMLNS)).push_children( self.mechanisms .iter() @@ -40,7 +37,7 @@ impl IntoElement for Mechanisms { pub struct Mechanism(String); impl FromElement for Mechanism { - fn from_element(mut element: peanuts::Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: peanuts::Element) -> peanuts::DeserializeResult<Self> { element.check_name("mechanism")?; element.check_namespace(XMLNS)?; @@ -51,7 +48,7 @@ impl FromElement for Mechanism { } impl IntoElement for Mechanism { - fn builder(&self) -> peanuts::element::ElementBuilder { + fn builder(&self) -> peanuts::ElementBuilder { Element::builder("mechanism", Some(XMLNS)).push_text(self.0.clone()) } } @@ -71,7 +68,7 @@ pub struct Auth { } impl IntoElement for Auth { - fn builder(&self) -> peanuts::element::ElementBuilder { + fn builder(&self) -> peanuts::ElementBuilder { Element::builder("auth", Some(XMLNS)) .push_attribute("mechanism", self.mechanism.clone()) .push_text(self.sasl_data.clone()) @@ -90,7 +87,7 @@ impl Deref for Challenge { } impl FromElement for Challenge { - fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> { element.check_name("challenge")?; element.check_namespace(XMLNS)?; @@ -112,7 +109,7 @@ impl Deref for Success { } impl FromElement for Success { - fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> { element.check_name("success")?; element.check_namespace(XMLNS)?; @@ -130,7 +127,7 @@ pub enum ServerResponse { } impl FromElement for ServerResponse { - fn from_element(element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(element: Element) -> peanuts::DeserializeResult<Self> { match element.identify() { (Some(XMLNS), "challenge") => { Ok(ServerResponse::Challenge(Challenge::from_element(element)?)) @@ -164,7 +161,7 @@ impl Deref for Response { } impl IntoElement for Response { - fn builder(&self) -> peanuts::element::ElementBuilder { + fn builder(&self) -> peanuts::ElementBuilder { Element::builder("response", Some(XMLNS)).push_text(self.0.clone()) } } @@ -212,7 +209,7 @@ impl Display for Failure { } impl FromElement for Failure { - fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> { element.check_name("failure")?; element.check_namespace(XMLNS)?; @@ -250,7 +247,7 @@ pub enum FailureType { } impl FromElement for FailureType { - fn from_element(element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(element: Element) -> peanuts::DeserializeResult<Self> { match element.identify() { (Some(XMLNS), "aborted") => Ok(FailureType::Aborted), (Some(XMLNS), "account-disabled") => Ok(FailureType::AccountDisabled), @@ -276,7 +273,7 @@ pub struct Text { } impl FromElement for Text { - fn from_element(mut element: Element) -> peanuts::element::DeserializeResult<Self> { + fn from_element(mut element: Element) -> peanuts::DeserializeResult<Self> { element.check_name("text")?; element.check_namespace(XMLNS)?; |