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

6
src/disco.rs
View file

@ -4,12 +4,14 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
use std::convert::TryFrom;
use minidom::Element;
use error::Error;
use ns;
use data_forms::{DataForm, DataFormType, parse_data_form};
use data_forms::{DataForm, DataFormType};
#[derive(Debug, Clone, PartialEq)]
pub struct Feature {
@ -74,7 +76,7 @@ pub fn parse_disco(root: &Element) -> Result<Disco, Error> {
name: name,
});
} else if child.is("x", ns::DATA_FORMS) {
let data_form = parse_data_form(child)?;
let data_form = DataForm::try_from(child)?;
match data_form.type_ {
DataFormType::Result_ => (),
_ => return Err(Error::ParseError("Data form must have a 'result' type in disco#info.")),