Skip to content

Commit

Permalink
Merge pull request swiftlang#7510 from airspeedswift/zip-aliases
Browse files Browse the repository at this point in the history
[stdlib] Deprecate aliases on Zip2Sequence
  • Loading branch information
airspeedswift authored Feb 16, 2017
2 parents 6581d0e + 8002484 commit 863dfca
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion stdlib/public/core/Zip.swift
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,15 @@ public struct Zip2Iterator<
public struct Zip2Sequence<Sequence1 : Sequence, Sequence2 : Sequence>
: Sequence {


@available(*, deprecated, renamed: "Sequence1.Iterator")
public typealias Stream1 = Sequence1.Iterator
@available(*, deprecated, renamed: "Sequence2.Iterator")
public typealias Stream2 = Sequence2.Iterator

/// A type whose instances can produce the elements of this
/// sequence, in order.
public typealias Iterator = Zip2Iterator<Stream1, Stream2>
public typealias Iterator = Zip2Iterator<Sequence1.Iterator, Sequence2.Iterator>

@available(*, unavailable, renamed: "Iterator")
public typealias Generator = Iterator
Expand Down

0 comments on commit 863dfca

Please sign in to comment.