Change Sequence.contains(_:) where Element: Hashable to receive any Sequence (#1169)

MartonioJunior · web-flow · commit 2938a79608e5 · 2024-04-03T18:56:00.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,8 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
 
 ### Changed
 - **Sequence**
-    - `sorted(by:)`, `sorted(by:with:)`, `sorted(by:and:)`, `sorted(by:and:and:)`, `sum(for:)`, `first(where:equals:)` now have alternatives that receive functions as parameters. This change maintains compatibility with KeyPath while making the methods more flexible. [#1170](https://github.com/SwifterSwift/SwifterSwift/pull/1170) by [MartonioJunior](https://github.com/MartonioJunior)
+  - `sorted(by:)`, `sorted(by:with:)`, `sorted(by:and:)`, `sorted(by:and:and:)`, `sum(for:)`, `first(where:equals:)` now have alternatives that receive functions as parameters. This change maintains compatibility with KeyPath while making the methods more flexible. [#1170](https://github.com/SwifterSwift/SwifterSwift/pull/1170) by [MartonioJunior](https://github.com/MartonioJunior)
+  - `contains(_:)` for `Element: Hashable` now can receive any type that conforms to `Sequence`, not just an `Array`. [#1169](https://github.com/SwifterSwift/SwifterSwift/pull/1169) by [MartonioJunior](https://github.com/MartonioJunior)
 
 ### Fixed
 - **PrivacyInfo.xcprivacy**
diff --git a/Sources/SwifterSwift/SwiftStdlib/SequenceExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/SequenceExtensions.swift
@@ -341,24 +341,24 @@ public extension Sequence where Element: Equatable {
     ///        ["h", "e", "l", "l", "o"].contains(["l", "o"]) -> true
     ///
     /// - Parameter elements: array of elements to check.
-    /// - Returns: true if array contains all given items.
+    /// - Returns: true if sequence contains all given items.
     /// - Complexity: _O(m·n)_, where _m_ is the length of `elements` and _n_ is the length of this sequence.
-    func contains(_ elements: [Element]) -> Bool {
+    func contains<S>(_ elements: S) -> Bool where S: Sequence, Element == S.Element {
         return elements.allSatisfy { contains($0) }
     }
 }
 
 public extension Sequence where Element: Hashable {
-    /// SwifterSwift: Check if array contains an array of elements.
+    /// SwifterSwift: Check if sequence contains elements of another sequence.
     ///
     ///        [1, 2, 3, 4, 5].contains([1, 2]) -> true
     ///        [1.2, 2.3, 4.5, 3.4, 4.5].contains([2, 6]) -> false
     ///        ["h", "e", "l", "l", "o"].contains(["l", "o"]) -> true
     ///
-    /// - Parameter elements: array of elements to check.
-    /// - Returns: true if array contains all given items.
+    /// - Parameter elements: sequence of elements to check.
+    /// - Returns: true if sequence contains all given items.
     /// - Complexity: _O(m + n)_, where _m_ is the length of `elements` and _n_ is the length of this sequence.
-    func contains(_ elements: [Element]) -> Bool {
+    func contains<S: Sequence>(_ elements: S) -> Bool where Element == S.Element {
         let set = Set(self)
         return elements.allSatisfy { set.contains($0) }
     }
diff --git a/Tests/SwiftStdlibTests/SequenceExtensionsTests.swift b/Tests/SwiftStdlibTests/SequenceExtensionsTests.swift
@@ -112,6 +112,20 @@ final class SequenceExtensionsTests: XCTestCase {
         XCTAssert([1, 2, 3].contains([2, 3]))
         XCTAssert([1, 2, 3].contains([1, 3]))
         XCTAssertFalse([1, 2, 3].contains([4, 5]))
+        
+        XCTAssert([Int]().contains(AnyIterator({ nil })))
+        XCTAssertFalse([Int]().contains(AnyIterator([1, 2].makeIterator())))
+        XCTAssert([1, 2, 3].contains(AnyIterator([1, 2].makeIterator())))
+        XCTAssert([1, 2, 3].contains(AnyIterator([2, 3].makeIterator())))
+        XCTAssert([1, 2, 3].contains(AnyIterator([1, 3].makeIterator())))
+        XCTAssertFalse([1, 2, 3].contains(AnyIterator([4, 5].makeIterator())))
+        
+        XCTAssert([Int]().contains(Set<Int>()))
+        XCTAssertFalse([Int]().contains(Set([1, 2])))
+        XCTAssert([1, 2, 3].contains(Set([1, 2])))
+        XCTAssert([1, 2, 3].contains(Set([2, 3])))
+        XCTAssert([1, 2, 3].contains(Set([1, 3])))
+        XCTAssertFalse([1, 2, 3].contains(Set([4, 5])))
     }
 
     func testContainsDuplicates() {
