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

Replace Into<Element> with From<…> for Element.

Browse source 
This allows Element::from() to work, and since Into<Element> is
automatically implemented for any type implementing From there is no
change to existing code.
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-20 20:36:13 +01:00
commit 487dbdc6de
28 changed files with 266 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/stanza_error.rs
View file

@ -172,15 +172,15 @@ impl TryFrom<Element> for StanzaError {
}
}
impl Into<Element> for StanzaError {
fn into(self) -> Element {
impl From<StanzaError> for Element {
fn from(err: StanzaError) -> Element {
let mut root = Element::builder("error")
.ns(ns::JABBER_CLIENT)
.attr("type", self.type_)
.attr("by", self.by.and_then(|by| Some(String::from(by))))
.append(self.defined_condition)
.attr("type", err.type_)
.attr("by", err.by.and_then(|by| Some(String::from(by))))
.append(err.defined_condition)
.build();
for (lang, text) in self.texts {
for (lang, text) in err.texts {
let elem = Element::builder("text")
.ns(ns::XMPP_STANZAS)
.attr("xml:lang", lang)
@ -188,7 +188,7 @@ impl Into<Element> for StanzaError {
.build();
root.append_child(elem);
}
if let Some(other) = self.other {
if let Some(other) = err.other {
root.append_child(other);
}
root