Skip to content

Commit 135802f

Browse files
committed
Fix compile errors for Swift 6 language mode
1 parent 34b1705 commit 135802f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Diff for: Tests/SwiftAlgorithmsTests/GroupedTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import XCTest
1313
import Algorithms
1414

1515
final class GroupedTests: XCTestCase {
16-
private class SampleError: Error {}
16+
private final class SampleError: Error {}
1717

1818
// Based on https://github.com/apple/swift/blob/4d1d8a9de5ebc132a17aee9fc267461facf89bf8/validation-test/stdlib/Dictionary.swift#L1974-L1988
1919

Diff for: Tests/SwiftAlgorithmsTests/KeyedTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import XCTest
1313
import Algorithms
1414

1515
final class KeyedTests: XCTestCase {
16-
private class SampleError: Error {}
16+
private final class SampleError: Error {}
1717

1818
func testUniqueKeys() {
1919
let d = ["Apple", "Banana", "Cherry"].keyed(by: { $0.first! })

Diff for: Tests/SwiftAlgorithmsTests/RandomSampleTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func validateRandomSamples<S: Sequence>(
1616
_ samples: [Int: Int],
1717
elements: S,
1818
expectedValue: Int,
19-
file: StaticString = #file, line: UInt = #line
19+
file: StaticString = (#file), line: UInt = #line
2020
) where S.Element == Int {
2121
let expectedRange = ((expectedValue / 3) * 2) ... ((expectedValue / 3) * 4)
2222
XCTAssertEqualSequences(samples.keys.sorted(), elements,

Diff for: Tests/SwiftAlgorithmsTests/TestUtilities.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func XCTAssertEqualSequences<S1: Sequence, S2: Sequence>(
7878
_ expression1: @autoclosure () throws -> S1,
7979
_ expression2: @autoclosure () throws -> S2,
8080
_ message: @autoclosure () -> String = "",
81-
file: StaticString = #file, line: UInt = #line
81+
file: StaticString = (#file), line: UInt = #line
8282
) rethrows where S1.Element: Equatable, S1.Element == S2.Element {
8383
try XCTAssertEqualSequences(expression1(), expression2(), by: ==,
8484
message(), file: file, line: line)
@@ -88,7 +88,7 @@ func XCTAssertEqualSequences<S1: Sequence, S2: Sequence>(
8888
func XCTAssertUnorderedEqualSequences<S1: Sequence, S2: Sequence>(
8989
_ expression1: @autoclosure () throws -> S1,
9090
_ expression2: @autoclosure () throws -> S2,
91-
file: StaticString = #file, line: UInt = #line
91+
file: StaticString = (#file), line: UInt = #line
9292
) rethrows where S1.Element: Equatable, S1.Element == S2.Element {
9393
var s1 = Array(try expression1())
9494
var missing: [S1.Element] = []
@@ -116,7 +116,7 @@ func XCTAssertEqualSequences<S1: Sequence, S2: Sequence>(
116116
_ expression2: @autoclosure () throws -> S2,
117117
by areEquivalent: (S1.Element, S1.Element) -> Bool,
118118
_ message: @autoclosure () -> String = "",
119-
file: StaticString = #file, line: UInt = #line
119+
file: StaticString = (#file), line: UInt = #line
120120
) rethrows where S1.Element == S2.Element {
121121

122122
func fail(_ reason: String) {
@@ -153,7 +153,7 @@ func XCTAssertEqualCollections<C1: Collection, C2: Collection>(
153153
_ expression1: @autoclosure () throws -> C1,
154154
_ expression2: @autoclosure () throws -> C2,
155155
_ message: @autoclosure () -> String = "",
156-
file: StaticString = #file, line: UInt = #line
156+
file: StaticString = (#file), line: UInt = #line
157157
) rethrows where C1.Element: Equatable, C1.Element == C2.Element {
158158
let c1 = try expression1()
159159
let c2 = try expression2()

0 commit comments

Comments
 (0)