Merge pull request #4584 from Nirma/join_cleanup

gribozavr · web-flow · commit 190df8ef5666 · 2016-09-01T09:35:15.000-07:00
[stdlib] simplify loop logic
diff --git a/stdlib/public/core/Join.swift b/stdlib/public/core/Join.swift
@@ -37,7 +37,7 @@ public struct JoinedIterator<Base : IteratorProtocol> : IteratorProtocol
   ///
   /// Once `nil` has been returned, all subsequent calls return `nil`.
   public mutating func next() -> Base.Element.Iterator.Element? {
-    repeat {
+    while true {
       switch _state {
       case .start:
         if let nextSubSequence = _base.next() {
@@ -75,7 +75,6 @@ public struct JoinedIterator<Base : IteratorProtocol> : IteratorProtocol
 
       }
     }
-    while true
   }
 
   internal var _base: Base

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public struct JoinedIterator<Base : IteratorProtocol> : IteratorProtocol`
`37`	`37`	`///`
`38`	`38`	/// Once `nil` has been returned, all subsequent calls return `nil`.
`39`	`39`	`public mutating func next() -> Base.Element.Iterator.Element? {`
`40`		`- repeat {`
	`40`	`+ while true {`
`41`	`41`	`switch _state {`
`42`	`42`	`case .start:`
`43`	`43`	`if let nextSubSequence = _base.next() {`
`@@ -75,7 +75,6 @@ public struct JoinedIterator<Base : IteratorProtocol> : IteratorProtocol`
`75`	`75`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`- while true`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`internal var _base: Base`