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

ecaps2: Use a reference everywhere, instead of taking ownership.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-04-20 21:53:46 +01:00
commit 411e421732
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ecaps2.rs
View file

@ -7,13 +7,13 @@ use error::Error;
use disco::{Feature, Identity, Disco, parse_disco}; use disco::{Feature, Identity, Disco, parse_disco};
use data_forms::DataForm; use data_forms::DataForm;
fn compute_item(field: String) -> Vec<u8> { fn compute_item(field: &String) -> Vec<u8> {
let mut bytes = field.as_bytes().to_vec(); let mut bytes = field.as_bytes().to_vec();
bytes.push(0x1f); bytes.push(0x1f);
bytes bytes
} }
fn compute_items<T, F: Fn(T) -> Vec<u8>>(things: Vec<T>, separator: u8, encode: F) -> Vec<u8> { fn compute_items<T, F: Fn(&T) -> Vec<u8>>(things: &Vec<T>, separator: u8, encode: F) -> Vec<u8> {
let mut string: Vec<u8> = vec!(); let mut string: Vec<u8> = vec!();
let mut accumulator: Vec<Vec<u8>> = vec!(); let mut accumulator: Vec<Vec<u8>> = vec!();
for thing in things { for thing in things {
@ -29,36 +29,36 @@ fn compute_items<T, F: Fn(T) -> Vec<u8>>(things: Vec<T>, separator: u8, encode:
string string
} }
fn compute_features(features: Vec<Feature>) -> Vec<u8> { fn compute_features(features: &Vec<Feature>) -> Vec<u8> {
compute_items(features, 0x1c, |feature| compute_item(feature.var)) compute_items(features, 0x1c, |feature| compute_item(&feature.var))
} }
fn compute_identities(identities: Vec<Identity>) -> Vec<u8> { fn compute_identities(identities: &Vec<Identity>) -> Vec<u8> {
compute_items(identities, 0x1c, |identity| { compute_items(identities, 0x1c, |identity| {
let mut bytes = compute_item(identity.category); let mut bytes = compute_item(&identity.category);
bytes.append(&mut compute_item(identity.type_)); bytes.append(&mut compute_item(&identity.type_));
bytes.append(&mut compute_item(identity.xml_lang)); bytes.append(&mut compute_item(&identity.xml_lang));
bytes.append(&mut compute_item(identity.name.unwrap_or(String::new()))); bytes.append(&mut compute_item(&identity.name.clone().unwrap_or(String::new())));
bytes.push(0x1e); bytes.push(0x1e);
bytes bytes
}) })
} }
fn compute_extensions(extensions: Vec<DataForm>) -> Vec<u8> { fn compute_extensions(extensions: &Vec<DataForm>) -> Vec<u8> {
compute_items(extensions, 0x1c, |extension| { compute_items(extensions, 0x1c, |extension| {
compute_items(extension.fields, 0x1d, |field| { compute_items(&extension.fields, 0x1d, |field| {
let mut bytes = compute_item(field.var); let mut bytes = compute_item(&field.var);
bytes.append(&mut compute_items(field.values, 0x1e, bytes.append(&mut compute_items(&field.values, 0x1e,
|value| compute_item(value))); |value| compute_item(value)));
bytes bytes
}) })
}) })
} }
fn compute_disco(disco: Disco) -> Vec<u8> { pub fn compute_disco(disco: &Disco) -> Vec<u8> {
let features_string = compute_features(disco.features); let features_string = compute_features(&disco.features);
let identities_string = compute_identities(disco.identities); let identities_string = compute_identities(&disco.identities);
let extensions_string = compute_extensions(disco.extensions); let extensions_string = compute_extensions(&disco.extensions);
let mut final_string = vec!(); let mut final_string = vec!();
final_string.extend(features_string); final_string.extend(features_string);
@ -69,7 +69,7 @@ fn compute_disco(disco: Disco) -> Vec<u8> {
pub fn convert_element(root: &Element) -> Result<Vec<u8>, Error> { pub fn convert_element(root: &Element) -> Result<Vec<u8>, Error> {
let disco = parse_disco(root)?; let disco = parse_disco(root)?;
let final_string = compute_disco(disco); let final_string = compute_disco(&disco);
Ok(final_string) Ok(final_string)
} }