mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Rename SequenceType.generate() to SequenceType.iterator()
This commit is contained in:
committed by
Max Moiseev
parent
2cf172160c
commit
1c0047829a
@@ -122,8 +122,8 @@ struct SequenceWithCustomUnderestimateCount : SequenceType {
|
||||
self._data = MinimalSequence(elements: data.map(OpaqueValue.init))
|
||||
}
|
||||
|
||||
func generate() -> MinimalSequence<OpaqueValue<Int>>.Iterator {
|
||||
return _data.generate()
|
||||
func iterator() -> MinimalSequence<OpaqueValue<Int>>.Iterator {
|
||||
return _data.iterator()
|
||||
}
|
||||
|
||||
func underestimateCount() -> Int {
|
||||
@@ -456,7 +456,7 @@ ArrayTestSuite.test("${array_type}/_withUnsafeMutableBufferPointerIfSupported/Re
|
||||
ArrayTestSuite.test(
|
||||
"${array_type}/mutationDoesNotAffectIterator/subscript/store") {
|
||||
var arr: ${array_type}<Int> = [ 1010, 1020, 1030 ]
|
||||
var g = arr.generate()
|
||||
var g = arr.iterator()
|
||||
arr[0] = 1011
|
||||
expectEqual([ 1010, 1020, 1030 ], Array(IteratorSequence(g)))
|
||||
}
|
||||
@@ -464,7 +464,7 @@ ArrayTestSuite.test(
|
||||
ArrayTestSuite.test(
|
||||
"${array_type}/mutationDoesNotAffectIterator/subscript/append") {
|
||||
var arr: ${array_type}<Int> = [ 1010, 1020, 1030 ]
|
||||
var g = arr.generate()
|
||||
var g = arr.iterator()
|
||||
arr.append(1040)
|
||||
expectEqual([ 1010, 1020, 1030 ], Array(IteratorSequence(g)))
|
||||
}
|
||||
@@ -472,7 +472,7 @@ ArrayTestSuite.test(
|
||||
ArrayTestSuite.test(
|
||||
"${array_type}/mutationDoesNotAffectIterator/subscript/replaceRange") {
|
||||
var arr: ${array_type}<Int> = [ 1010, 1020, 1030 ]
|
||||
var g = arr.generate()
|
||||
var g = arr.iterator()
|
||||
arr.replaceRange(1..<3, with: [ 1040, 1050, 1060 ])
|
||||
expectEqual([ 1010, 1020, 1030 ], Array(IteratorSequence(g)))
|
||||
}
|
||||
@@ -1593,7 +1593,7 @@ final class EvilCollection : CollectionType {
|
||||
return TestValueTy(i)
|
||||
}
|
||||
|
||||
func generate() -> IndexingGenerator<EvilCollection> {
|
||||
func iterator() -> IndexingGenerator<EvilCollection> {
|
||||
return IndexingGenerator(self)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user