xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stanza_error: Simplify with IntoElements.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-25 01:14:36 +01:00
commit 764a7190e9
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/stanza_error.rs
View file

@ -8,7 +8,7 @@ use std::convert::TryFrom;
use std::str::FromStr;
use std::collections::BTreeMap;
use minidom::{Element, IntoAttributeValue};
use minidom::{Element, IntoElements, IntoAttributeValue, ElementEmitter};
use error::Error;
use jid::Jid;
@ -110,9 +110,9 @@ impl FromStr for DefinedCondition {
}
}
impl From<DefinedCondition> for String {
fn from(defined_condition: DefinedCondition) -> String {
String::from(match defined_condition {
impl IntoElements for DefinedCondition {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_child(Element::builder(match self {
DefinedCondition::BadRequest => "bad-request",
DefinedCondition::Conflict => "conflict",
DefinedCondition::FeatureNotImplemented => "feature-not-implemented",
@ -135,7 +135,7 @@ impl From<DefinedCondition> for String {
DefinedCondition::SubscriptionRequired => "subscription-required",
DefinedCondition::UndefinedCondition => "undefined-condition",
DefinedCondition::UnexpectedRequest => "unexpected-request",
})
}).ns(ns::XMPP_STANZAS).build());
}
}
@ -207,9 +207,7 @@ impl Into<Element> for StanzaError {
.ns(ns::JABBER_CLIENT)
.attr("type", self.type_)
.attr("by", self.by.and_then(|by| Some(String::from(by))))
.append(Element::builder(self.defined_condition)
.ns(ns::XMPP_STANZAS)
.build())
.append(self.defined_condition)
.build();
for (lang, text) in self.texts {
let elem = Element::builder("text")