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

hashes: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:46:11 +01:00
commit 1ec3806629
3 changed files with 43 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/jingle_ft.rs
View file

@ -6,8 +6,7 @@
use std::convert::TryFrom;
use hashes;
use hashes::{Hash, parse_hash};
use hashes::Hash;
use minidom::{Element, IntoElements, ElementEmitter};
@ -32,7 +31,7 @@ impl IntoElements for Range {
})
.build();
for hash in self.hashes {
elem.append_child(hashes::serialise(&hash));
elem.append_child((&hash).into());
}
emitter.append_child(elem);
}
@ -149,7 +148,7 @@ impl<'a> TryFrom<&'a Element> for Description {
if !hash_element.is("hash", ns::HASHES) {
return Err(Error::ParseError("Unknown element in JingleFT range."));
}
range_hashes.push(parse_hash(hash_element)?);
range_hashes.push(Hash::try_from(hash_element)?);
}
range = Some(Range {
offset: offset,
@ -157,7 +156,7 @@ impl<'a> TryFrom<&'a Element> for Description {
hashes: range_hashes,
});
} else if file_payload.is("hash", ns::HASHES) {
hashes.push(parse_hash(file_payload)?);
hashes.push(Hash::try_from(file_payload)?);
} else {
return Err(Error::ParseError("Unknown element in JingleFT file."));
}
@ -220,7 +219,7 @@ impl<'a> Into<Element> for &'a File {
.build());
}
for hash in self.hashes.clone() {
root.append_child(hashes::serialise(&hash));
root.append_child((&hash).into());
}
root
}