Skip to content

Commit e35badc

Browse files
committed
Fix warnings
This was a combo of deprecations and normal warnings, but all seem safe to fix.
1 parent a5329ff commit e35badc

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Sources/TSCUtility/Version.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ extension Version {
137137
if let prereleaseDelimiterIndex = prereleaseDelimiterIndex {
138138
let prereleaseStartIndex = versionString.index(after: prereleaseDelimiterIndex)
139139
let prereleaseIdentifiers = versionString[prereleaseStartIndex..<(metadataDelimiterIndex ?? versionString.endIndex)].split(separator: ".", omittingEmptySubsequences: false)
140-
guard prereleaseIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
140+
guard prereleaseIdentifiers.allSatisfy( { $0.allSatisfy({ $0.isLetter || $0.isNumber || $0 == "-" }) } ) else {
141141
throw VersionError.nonAlphaNumerHyphenalPrereleaseIdentifiers(prereleaseIdentifiers.map { String($0) })
142142
}
143143
self.prereleaseIdentifiers = prereleaseIdentifiers.map { String($0) }
@@ -148,7 +148,7 @@ extension Version {
148148
if let metadataDelimiterIndex = metadataDelimiterIndex {
149149
let metadataStartIndex = versionString.index(after: metadataDelimiterIndex)
150150
let buildMetadataIdentifiers = versionString[metadataStartIndex...].split(separator: ".", omittingEmptySubsequences: false)
151-
guard buildMetadataIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
151+
guard buildMetadataIdentifiers.allSatisfy( { $0.allSatisfy({ $0.isLetter || $0.isNumber || $0 == "-" }) } ) else {
152152
throw VersionError.nonAlphaNumerHyphenalBuildMetadataIdentifiers(buildMetadataIdentifiers.map { String($0) })
153153
}
154154
self.buildMetadataIdentifiers = buildMetadataIdentifiers.map { String($0) }

Tests/TSCUtilityTests/VersionTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,15 +1454,15 @@ class VersionTests: XCTestCase {
14541454
"-1.2.3", "1.-2.3", "1.2.-3", ".1.2.3", "v.1.2.3", "1.2..3", "v1.2.3",
14551455
]
14561456
for str in badStrings {
1457-
XCTAssertNil(Version(string: str))
1457+
XCTAssertNil(Version(str))
14581458
}
14591459

1460-
XCTAssertEqual(Version(1,2,3), Version(string: "1.2.3"))
1461-
XCTAssertEqual(Version(1,2,3), Version(string: "01.002.0003"))
1462-
XCTAssertEqual(Version(0,9,21), Version(string: "0.9.21"))
1460+
XCTAssertEqual(Version(1,2,3), Version("1.2.3"))
1461+
XCTAssertEqual(Version(1,2,3), Version("01.002.0003"))
1462+
XCTAssertEqual(Version(0,9,21), Version("0.9.21"))
14631463
XCTAssertEqual(Version(0,9,21, prereleaseIdentifiers: ["alpha", "beta"], buildMetadataIdentifiers: ["1011"]),
1464-
Version(string: "0.9.21-alpha.beta+1011"))
1465-
XCTAssertEqual(Version(0,9,21, prereleaseIdentifiers: [], buildMetadataIdentifiers: ["1011"]), Version(string: "0.9.21+1011"))
1464+
Version("0.9.21-alpha.beta+1011"))
1465+
XCTAssertEqual(Version(0,9,21, prereleaseIdentifiers: [], buildMetadataIdentifiers: ["1011"]), Version("0.9.21+1011"))
14661466
}
14671467

14681468
func testRange() {

Tests/TSCUtilityTests/miscTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ class miscTests: XCTestCase {
3030

3131
func testVersion() throws {
3232
// Valid.
33-
XCTAssertEqual(Version(string: "0.9.21-alpha.beta+1011"),
33+
XCTAssertEqual(Version("0.9.21-alpha.beta+1011"),
3434
Version(0,9,21, prereleaseIdentifiers: ["alpha", "beta"], buildMetadataIdentifiers: ["1011"]))
35-
XCTAssertEqual(Version(string: "0.9.21+1011"),
35+
XCTAssertEqual(Version("0.9.21+1011"),
3636
Version(0,9,21, prereleaseIdentifiers: [], buildMetadataIdentifiers: ["1011"]))
37-
XCTAssertEqual(Version(string: "01.002.0003"), Version(1,2,3))
38-
XCTAssertEqual(Version(string: "0.9.21"), Version(0,9,21))
37+
XCTAssertEqual(Version("01.002.0003"), Version(1,2,3))
38+
XCTAssertEqual(Version("0.9.21"), Version(0,9,21))
3939

4040
// Invalid.
4141
let invalidVersions = ["foo", "1", "1.0", "1.0.", "1.0.0."]
4242
for v in invalidVersions {
43-
XCTAssertTrue(Version(string: v) == nil)
43+
XCTAssertTrue(Version(v) == nil)
4444
}
4545
}
4646
}

0 commit comments

Comments
 (0)