---

thestinger · thestinger · commit 1c21161ab866 · 2013-05-18T04:48:22.000-04:00
yaml --- r: 141019 b: refs/heads/try2 c: fc65626 h: refs/heads/master i: 141017: f35a648 141015: 2a6c5cd v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 073225572a1c7c7dc9f7c2740514557105950807
+refs/heads/try2: fc656262a905a50eff2be54a87295d2952d29106
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libcore/iterator.rs b/branches/try2/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`