Merge remote-tracking branch 'origin' into swift-3-api-guidelines

This commit is contained in:
Max Moiseev
2015-12-14 12:05:35 -08:00
638 changed files with 3342 additions and 2349 deletions

View File

@@ -96,8 +96,8 @@ public struct EnumeratedIterator<
///
/// - Requires: No preceding call to `self.next()` has returned `nil`.
public mutating func next() -> Element? {
guard let b = _base.next() else { return .None }
return .Some((offset: _count++, element: b))
guard let b = _base.next() else { return nil }
return (offset: _count++, element: b)
}
}