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

data_forms: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:51:39 +01:00
commit 8673b8f90e
4 changed files with 62 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/mam.rs
View file

@ -11,7 +11,6 @@ use jid::Jid;
use error::Error;
use data_forms;
use data_forms::DataForm;
use rsm::Set;
use forwarding;
@ -62,7 +61,7 @@ pub fn parse_query(root: &Element) -> Result<Query, Error> {
let mut set = None;
for child in root.children() {
if child.is("x", ns::DATA_FORMS) {
form = Some(data_forms::parse_data_form(child)?);
form = Some(DataForm::try_from(child)?);
} else if child.is("set", ns::RSM) {
set = Some(Set::try_from(child)?);
} else {
@ -177,7 +176,7 @@ pub fn serialise_query(query: &Query) -> Element {
.attr("node", query.node.clone())
.build();
//if let Some(form) = query.form {
// elem.append_child(data_forms::serialise(&form));
// elem.append_child((&form).into());
//}
if let Some(ref set) = query.set {
elem.append_child(set.into());