From 061fc92e5f8f930aaa866e426f8f4ce648def6a6 Mon Sep 17 00:00:00 2001
From: Ben Cohen <ben_cohen@apple.com>
Date: Thu, 3 May 2018 14:51:31 -0700
Subject: [PATCH 1/2] Undeprecate Countable*Range

---
 stdlib/public/core/ClosedRange.swift | 1 -
 stdlib/public/core/Range.swift       | 2 --
 2 files changed, 3 deletions(-)

diff --git a/stdlib/public/core/ClosedRange.swift b/stdlib/public/core/ClosedRange.swift
index f31c634a3565b..4fb3ba44640d8 100644
--- a/stdlib/public/core/ClosedRange.swift
+++ b/stdlib/public/core/ClosedRange.swift
@@ -495,6 +495,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 a60ecf1d8cba7..a0858171f23a9 100644
--- a/stdlib/public/core/Range.swift
+++ b/stdlib/public/core/Range.swift
@@ -905,10 +905,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

From 51b9468c90098e639f5d8df744844b8ecffee77d Mon Sep 17 00:00:00 2001
From: Ben Cohen <ben_cohen@apple.com>
Date: Fri, 4 May 2018 09:31:06 -0700
Subject: [PATCH 2/2] Remove check for deprecation warnings

---
 test/Compatibility/stdlib_generic_typealiases.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 }
 }