Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

stdlib/public/core/CollectionAlgorithms.swift

@@ -72,13 +72,6 @@ extension Collection where Element : Equatable {
     }
     return nil
   }
-  
-  /// Returns the first index where the specified value appears in the
-  /// collection.
-  @inlinable
-  public func index(of _element: Element) -> Index? {
-    return firstIndex(of: _element)
-  }
 }
 
 extension Collection {
@@ -117,15 +110,6 @@ extension Collection {
     }
     return nil
   }
-  
-  /// Returns the first index in which an element of the collection satisfies
-  /// the given predicate.
-  @inlinable
-  public func index(
-    where _predicate: (Element) throws -> Bool
-  ) rethrows -> Index? {
-    return try firstIndex(where: _predicate)
-  }
 }
 
 //===----------------------------------------------------------------------===//

stdlib/public/core/MigrationSupport.swift

@@ -1011,6 +1011,28 @@ extension Collection {
   }
 }
 
+extension Collection {
+  /// Returns the first index in which an element of the collection satisfies
+  /// the given predicate.
+  @available(swift, deprecated: 5.0, renamed: "firstIndex(where:)")
+  @inlinable
+  public func index(
+    where _predicate: (Element) throws -> Bool
+  ) rethrows -> Index? {
+    return try firstIndex(where: _predicate)
+  }
+}
+
+extension Collection where Element: Equatable {
+  /// Returns the first index where the specified value appears in the
+  /// collection.
+  @available(swift, deprecated: 5.0, renamed: "firstIndex(of:)")
+  @inlinable
+  public func index(of element: Element) -> Index? {
+    return firstIndex(of: element)
+  }
+}
+
 extension String.Index {
   @available(swift, deprecated: 3.2, obsoleted: 4.0)
   public init(_position: Int) {

test/stdlib/IndexOfRenaming.swift

@@ -1,8 +1,8 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -swift-version 5
 
 let a = [10, 20, 30, 40, 50, 60]
 
-_ = a.index(of: 30)
+_ = a.index(of: 30) // expected-warning {{'index(of:)' is deprecated: renamed to 'firstIndex(of:)'}} expected-note {{use 'firstIndex(of:)' instead}}
 _ = a.firstIndex(of: 30)
-_ = a.index(where: { $0 > 30 })
+_ = a.index(where: { $0 > 30 }) // expected-warning {{'index(where:)' is deprecated: renamed to 'firstIndex(where:)'}} expected-note {{use 'firstIndex(where:)' instead}}
 _ = a.firstIndex(where: { $0 > 30 })