arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove clone from into_iter

Browse source
This commit is contained in:
Matthew Piziak 2016-08-08 17:52:24 -04:00
parent b600b3bafe
commit 9e77a839d3
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
saphyr/src/yaml.rs
View file

@ -234,7 +234,7 @@ pub fn $name(self) -> Option<$t> {
} }
} }
); );
); );
impl Yaml { impl Yaml {
define_as!(as_bool, bool, Boolean); define_as!(as_bool, bool, Boolean);
@ -245,7 +245,7 @@ impl Yaml {
define_as_ref!(as_vec, &Array, Array); define_as_ref!(as_vec, &Array, Array);
define_into!(into_bool, bool, Boolean); define_into!(into_bool, bool, Boolean);
define_into!(into_i64, i64, Integer); define_into!(into_i64, i64, Integer);
define_into!(into_string, String, String); define_into!(into_string, String, String);
define_into!(into_hash, Hash, Hash); define_into!(into_hash, Hash, Hash);
define_into!(into_vec, Array, Array); define_into!(into_vec, Array, Array);
@ -344,22 +344,21 @@ impl IntoIterator for Yaml {
type IntoIter = YamlIter; type IntoIter = YamlIter;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
YamlIter {yaml: self, index: 0} let mut yaml = self.into_vec().unwrap_or(vec![]);
yaml.reverse();
YamlIter {yaml: yaml}
} }
} }
pub struct YamlIter { pub struct YamlIter {
yaml: Yaml, yaml: Vec<Yaml>,
index: usize,
} }
impl Iterator for YamlIter { impl Iterator for YamlIter {
type Item = Yaml; type Item = Yaml;
fn next(&mut self) -> Option<Yaml> { fn next(&mut self) -> Option<Yaml> {
let result = self.yaml[self.index].clone(); self.yaml.pop()
self.index += 1;
Some(result)
} }
} }
@ -540,7 +539,7 @@ a1: &DEFAULT
assert!(YamlLoader::load_from_str("---This used to cause an infinite loop").is_ok()); assert!(YamlLoader::load_from_str("---This used to cause an infinite loop").is_ok());
assert_eq!(YamlLoader::load_from_str("----"), Ok(vec![Yaml::String(String::from("----"))])); assert_eq!(YamlLoader::load_from_str("----"), Ok(vec![Yaml::String(String::from("----"))]));
assert_eq!(YamlLoader::load_from_str("--- #here goes a comment"), Ok(vec![Yaml::Null])); assert_eq!(YamlLoader::load_from_str("--- #here goes a comment"), Ok(vec![Yaml::Null]));
assert_eq!(YamlLoader::load_from_str("---- #here goes a comment"), Ok(vec![Yaml::String(String::from("----"))])); assert_eq!(YamlLoader::load_from_str("---- #here goes a comment"), Ok(vec![Yaml::String(String::from("----"))]));
} }
#[test] #[test]
@ -561,13 +560,13 @@ a1: &DEFAULT
- !!float 2 - !!float 2
- !!bool true - !!bool true
- !!bool false - !!bool false
- 0xFF - 0xFF
- 0o77 - 0o77
- +12345 - +12345
"; ";
let mut out = YamlLoader::load_from_str(&s).unwrap().into_iter(); let mut out = YamlLoader::load_from_str(&s).unwrap().into_iter();
let mut doc = out.next().unwrap().into_iter(); let mut doc = out.next().unwrap().into_iter();
assert_eq!(doc.next().unwrap().into_string().unwrap(), "string"); assert_eq!(doc.next().unwrap().into_string().unwrap(), "string");
assert_eq!(doc.next().unwrap().into_string().unwrap(), "string"); assert_eq!(doc.next().unwrap().into_string().unwrap(), "string");
assert_eq!(doc.next().unwrap().into_string().unwrap(), "string"); assert_eq!(doc.next().unwrap().into_string().unwrap(), "string");
@ -583,7 +582,7 @@ a1: &DEFAULT
assert_eq!(doc.next().unwrap().into_bool().unwrap(), true); assert_eq!(doc.next().unwrap().into_bool().unwrap(), true);
assert_eq!(doc.next().unwrap().into_bool().unwrap(), false); assert_eq!(doc.next().unwrap().into_bool().unwrap(), false);
assert_eq!(doc.next().unwrap().into_i64().unwrap(), 255); assert_eq!(doc.next().unwrap().into_i64().unwrap(), 255);
assert_eq!(doc.next().unwrap().into_i64().unwrap(), 63); assert_eq!(doc.next().unwrap().into_i64().unwrap(), 63);
assert_eq!(doc.next().unwrap().into_i64().unwrap(), 12345); assert_eq!(doc.next().unwrap().into_i64().unwrap(), 12345);
} }
} }