aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/parsing_utils.rs
diff options
context:
space:
mode:
authorKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
committerKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
commit045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch)
tree1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /components/style/parsing_utils.rs
parentd6ba37c68c34a3748a789caeca225083275757e5 (diff)
parenta40b94d7f946d75e1a66af206efda9879b89c707 (diff)
downloadservo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz
servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'components/style/parsing_utils.rs')
-rw-r--r--components/style/parsing_utils.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/style/parsing_utils.rs b/components/style/parsing_utils.rs
index 3afd7ba0353..1fd1034e117 100644
--- a/components/style/parsing_utils.rs
+++ b/components/style/parsing_utils.rs
@@ -71,11 +71,11 @@ pub fn parse_comma_separated<T>(iter: ParserIter,
parse_one: |ParserIter| -> Result<T, ()>)
-> Result<Vec<T>, ()> {
let mut values = vec![try!(parse_one(iter))];
- for component_value in iter {
- match component_value {
- &Comma => values.push(try!(parse_one(iter))),
- _ => return Err(())
+ loop {
+ match iter.next() {
+ Some(&Comma) => values.push(try!(parse_one(iter))),
+ Some(_) => return Err(()),
+ None => return Ok(values),
}
}
- Ok(values)
}