From 7e9b46cdbf7f63ffc3a65faec687cbe3b2fed393 Mon Sep 17 00:00:00 2001
From: Ben Cohen <airspeedswift@users.noreply.github.com>
Date: Mon, 7 May 2018 09:52:52 -0700
Subject: [PATCH] [stdlib] Undeprecate Countable*Range (#16360)

* Undeprecate Countable*Range

* Remove check for deprecation warnings
---
 stdlib/public/core/ClosedRange.swift                | 1 -
 stdlib/public/core/Range.swift                      | 2 --
 test/Compatibility/stdlib_generic_typealiases.swift | 5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/stdlib/public/core/ClosedRange.swift b/stdlib/public/core/ClosedRange.swift
index a2bb514cc5f07..5b720fdaffded 100644
--- a/stdlib/public/core/ClosedRange.swift
+++ b/stdlib/public/core/ClosedRange.swift
@@ -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
diff --git a/stdlib/public/core/Range.swift b/stdlib/public/core/Range.swift
index 56a6601cc8bdc..33b3782dcd487 100644
--- a/stdlib/public/core/Range.swift
+++ b/stdlib/public/core/Range.swift
@@ -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
diff --git a/test/Compatibility/stdlib_generic_typealiases.swift b/test/Compatibility/stdlib_generic_typealiases.swift
index eed311043a2dc..75574a3e920ac 100644
--- a/test/Compatibility/stdlib_generic_typealiases.swift
+++ b/test/Compatibility/stdlib_generic_typealiases.swift
@@ -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>()
   }
@@ -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 }
 }