Skip to content

[4.2-04-30][stdlib] Undeprecate countable range #16818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2018
Merged

[4.2-04-30][stdlib] Undeprecate countable range #16818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion stdlib/public/core/ClosedRange.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,5 @@ extension ClosedRange {
@available(*, deprecated, renamed: "ClosedRange.Index")
public typealias ClosedRangeIndex<T> = ClosedRange<T>.Index where T: Strideable, T.Stride: SignedInteger

@available(*, deprecated: 4.2, renamed: "ClosedRange")
public typealias CountableClosedRange<Bound: Strideable> = ClosedRange<Bound>
where Bound.Stride : SignedInteger
2 changes: 0 additions & 2 deletions stdlib/public/core/Range.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,10 +915,8 @@ extension Range {
}
}

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

@available(*, deprecated: 4.2, renamed: "PartialRangeFrom")
public typealias CountablePartialRangeFrom<Bound: Strideable> = PartialRangeFrom<Bound>
where Bound.Stride : SignedInteger
5 changes: 1 addition & 4 deletions test/Compatibility/stdlib_generic_typealiases.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

struct RequiresStrideable<T: Strideable> { }

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

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