averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: protocol extensions: de-underscore indexOf()

Browse Source 
Swift SVN r28244
This commit is contained in:
Dmitri Hrybenko
2015-05-07 00:30:33 +00:00
parent 25e74d21db
commit f76ca6243e
9 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/1_stdlib/Algorithm.swift.gyb
View File

@@ -2600,13 +2600,13 @@ func callStaticFind(
collection: MinimalForwardCollection<MinimalEquatableValue>,
_ element: MinimalEquatableValue
) -> MinimalForwardCollection<MinimalEquatableValue>.Index? {
return collection._prext_indexOf(element)
return collection.indexOf(element)
}
func callGenericFind<
C : CollectionType where C.Generator.Element : Equatable
>(collection: C, _ element: C.Generator.Element) -> C.Index? {
return collection._prext_indexOf(element)
return collection.indexOf(element)
}
% for dispatch in [ 'Static', 'Generic' ]:
@@ -2677,7 +2677,7 @@ func callStaticFind(
sequence: CollectionWithCustomFindMethod,
_ element: MinimalEquatableValue
) -> CollectionWithCustomFindMethod.Index? {
return sequence._prext_indexOf(element)
return sequence.indexOf(element)
}
% for dispatch in [ 'Static', 'Generic' ]:
@@ -2703,14 +2703,14 @@ SequenceTypeAlgorithms.test("find/WhereElementIsEquatable/CustomImplementation/$
func callGenericFind_<
C : CollectionType where C.Generator.Element : Equatable
>(collection: C, _ element: C.Generator.Element) -> C.Index? {
return collection._prext_indexOf(element)
return collection.indexOf(element)
}
func callStaticFind_(
set: Set<MinimalHashableValue>,
_ element: MinimalHashableValue
) -> Set<MinimalHashableValue>.Index? {
return set._prext_indexOf(element)
return set.indexOf(element)
}
% for dispatch in [ 'Static', 'Generic' ]:
@@ -2758,7 +2758,7 @@ SequenceTypeAlgorithms.test("find/Predicate") {
test.sequence.map { MinimalEquatableValue($0) })
let closureLifetimeTracker = LifetimeTracked(0)
expectEqual(1, LifetimeTracked.instances)
let result = s._prext_indexOf {
let result = s.indexOf {
(candidate) in
_blackHole(closureLifetimeTracker)
return candidate.value == test.element