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

forwarding: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:53:43 +01:00
commit 2f05d02d23
2 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/mam.rs
View file

@ -13,7 +13,6 @@ use error::Error;
use data_forms::DataForm;
use rsm::Set;
use forwarding;
use forwarding::Forwarded;
use ns;
@ -86,7 +85,7 @@ pub fn parse_result(root: &Element) -> Result<Result_, Error> {
let mut forwarded = None;
for child in root.children() {
if child.is("forwarded", ns::FORWARD) {
forwarded = Some(forwarding::parse_forwarded(child)?);
forwarded = Some(Forwarded::try_from(child)?);
} else {
return Err(Error::ParseError("Unknown child in result element."));
}
@ -190,7 +189,7 @@ pub fn serialise_result(result: &Result_) -> Element {
.attr("queryid", result.queryid.clone())
.attr("id", result.id.clone())
.build();
elem.append_child(forwarding::serialise(&result.forwarded));
elem.append_child((&result.forwarded).into());
elem
}