Skip to content

Commit d25fbc8

Browse files
[4.2][stdlib] undeprecate countable range (#16361)
* Undeprecate Countable*Range * Remove check for deprecation warnings
1 parent 0ec0881 commit d25fbc8

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

stdlib/public/core/ClosedRange.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,5 @@ extension ClosedRange {
505505
@available(*, deprecated, renamed: "ClosedRange.Index")
506506
public typealias ClosedRangeIndex<T> = ClosedRange<T>.Index where T: Strideable, T.Stride: SignedInteger
507507

508-
@available(*, deprecated: 4.2, renamed: "ClosedRange")
509508
public typealias CountableClosedRange<Bound: Strideable> = ClosedRange<Bound>
510509
where Bound.Stride : SignedInteger

stdlib/public/core/Range.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,10 +910,8 @@ extension Range {
910910
}
911911
}
912912

913-
@available(*, deprecated, renamed: "Range")
914913
public typealias CountableRange<Bound: Strideable> = Range<Bound>
915914
where Bound.Stride : SignedInteger
916915

917-
@available(*, deprecated: 4.2, renamed: "PartialRangeFrom")
918916
public typealias CountablePartialRangeFrom<Bound: Strideable> = PartialRangeFrom<Bound>
919917
where Bound.Stride : SignedInteger

test/Compatibility/stdlib_generic_typealiases.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
struct RequiresStrideable<T: Strideable> { }
44

5-
extension CountableRange { // expected-warning{{'CountableRange' is deprecated: renamed to 'Range'}}
6-
// expected-note@-1{{use 'Range' instead}}{{11-25=Range}}
5+
extension CountableRange {
76
func testStrideable() {
87
_ = RequiresStrideable<Bound>()
98
}
@@ -24,7 +23,5 @@ extension DictionaryIndex {
2423
}
2524

2625
extension CountableRange where Element == Int {
27-
// expected-warning@-1{{'CountableRange' is deprecated: renamed to 'Range'}}
28-
// expected-note@-2{{use 'Range' instead}}
2926
func getLowerBoundAsInt() -> Int { return lowerBound }
3027
}

0 commit comments

Comments
 (0)