---

thestinger · thestinger · commit 9f92c3ebcabc · 2013-05-18T04:48:22.000-04:00
yaml --- r: 62465 b: refs/heads/snap-stage3 c: fc65626 h: refs/heads/master i: 62463: e2ae320 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 073225572a1c7c7dc9f7c2740514557105950807
+refs/heads/snap-stage3: fc656262a905a50eff2be54a87295d2952d29106
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libcore/iterator.rs b/branches/snap-stage3/src/libcore/iterator.rs
@@ -325,17 +325,13 @@ pub struct FilterMapIterator<'self, A, B, T> {
 impl<'self, A, B, T: Iterator<A>> Iterator<B> for FilterMapIterator<'self, A, B, T> {
     #[inline]
     fn next(&mut self) -> Option<B> {
-        loop {
-            match self.iter.next() {
-                None    => { return None; }
-                Some(a) => {
-                    match (self.f)(a) {
-                        Some(b) => { return Some(b); }
-                        None    => { loop; }
-                    }
-                }
+        for self.iter.advance |x| {
+            match (self.f)(x) {
+                Some(y) => return Some(y),
+                None => ()
             }
         }
+        None
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -325,17 +325,13 @@ pub struct FilterMapIterator<'self, A, B, T> {`
`325`	`325`	`impl<'self, A, B, T: Iterator<A>> Iterator<B> for FilterMapIterator<'self, A, B, T> {`
`326`	`326`	`#[inline]`
`327`	`327`	`fn next(&mut self) -> Option<B> {`
`328`		`- loop {`
`329`		`- match self.iter.next() {`
`330`		`- None => { return None; }`
`331`		`- Some(a) => {`
`332`		`- match (self.f)(a) {`
`333`		`- Some(b) => { return Some(b); }`
`334`		`- None => { loop; }`
`335`		`- }`
`336`		`- }`
	`328`	`+ for self.iter.advance \|x\| {`
	`329`	`+ match (self.f)(x) {`
	`330`	`+ Some(y) => return Some(y),`
	`331`	`+ None => ()`
`337`	`332`	`}`
`338`	`333`	`}`
	`334`	`+ None`
`339`	`335`	`}`
`340`	`336`	`}`
`341`	`337`