Merge pull request #358 from chriseidhof/simplify-filter

nadavrot · nadavrot · commit 3f46ee368393 · 2015-12-08T21:40:54.000-08:00
Simplify filter implementation
diff --git a/stdlib/public/core/Filter.swift b/stdlib/public/core/Filter.swift
@@ -25,13 +25,12 @@ public struct LazyFilterGenerator<
   ///   since the copy was made, and no preceding call to `self.next()`
   ///   has returned `nil`.
   public mutating func next() -> Base.Element? {
-    var n: Base.Element?
-    for/*ever*/;; {
-      n = _base.next()
-      if n != nil ? _predicate(n!) : true {
+    while let n = _base.next() {
+      if _predicate(n) {
         return n
       }
     }
+    return nil
   }
 
   /// Creates an instance that produces the elements `x` of `base`

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,12 @@ public struct LazyFilterGenerator<`
`25`	`25`	/// since the copy was made, and no preceding call to `self.next()`
`26`	`26`	/// has returned `nil`.
`27`	`27`	`public mutating func next() -> Base.Element? {`
`28`		`- var n: Base.Element?`
`29`		`- for/ever/;; {`
`30`		`- n = _base.next()`
`31`		`- if n != nil ? _predicate(n!) : true {`
	`28`	`+ while let n = _base.next() {`
	`29`	`+ if _predicate(n) {`
`32`	`30`	`return n`
`33`	`31`	`}`
`34`	`32`	`}`
	`33`	`+ return nil`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	/// Creates an instance that produces the elements `x` of `base`