@@ -10,7 +10,7 @@ public func contain<S: Sequence, T: Equatable>(_ items: [T]) -> Predicate<S>
1010 where S. Iterator. Element == T {
1111 return Predicate . simple ( " contain < \( arrayAsString ( items) ) > " ) { actualExpression in
1212 if let actual = try actualExpression. evaluate ( ) {
13- let matches = items. all {
13+ let matches = items. allSatisfy {
1414 return actual. contains ( $0)
1515 }
1616 return PredicateStatus ( bool: matches)
@@ -27,7 +27,7 @@ public func contain(_ substrings: String...) -> Predicate<String> {
2727public func contain( _ substrings: [ String ] ) -> Predicate < String > {
2828 return Predicate . simple ( " contain < \( arrayAsString ( substrings) ) > " ) { actualExpression in
2929 if let actual = try actualExpression. evaluate ( ) {
30- let matches = substrings. all {
30+ let matches = substrings. allSatisfy {
3131 let range = actual. range ( of: $0)
3232 return range != nil && !range!. isEmpty
3333 }
@@ -45,7 +45,7 @@ public func contain(_ substrings: NSString...) -> Predicate<NSString> {
4545public func contain( _ substrings: [ NSString ] ) -> Predicate < NSString > {
4646 return Predicate . simple ( " contain < \( arrayAsString ( substrings) ) > " ) { actualExpression in
4747 if let actual = try actualExpression. evaluate ( ) {
48- let matches = substrings. all { actual. range ( of: $0. description) . length != 0 }
48+ let matches = substrings. allSatisfy { actual. range ( of: $0. description) . length != 0 }
4949 return PredicateStatus ( bool: matches)
5050 }
5151 return . fail
@@ -60,7 +60,7 @@ public func contain(_ items: Any?...) -> Predicate<NMBContainer> {
6060public func contain( _ items: [ Any ? ] ) -> Predicate < NMBContainer > {
6161 return Predicate . simple ( " contain < \( arrayAsString ( items) ) > " ) { actualExpression in
6262 guard let actual = try actualExpression. evaluate ( ) else { return . fail }
63- let matches = items. all { item in
63+ let matches = items. allSatisfy { item in
6464 return item. map { actual. contains ( $0) } ?? false
6565 }
6666 return PredicateStatus ( bool: matches)
0 commit comments