Skip to content

Commit 9feba0d

Browse files
[gardening] fix typo "Nuumer" → "Numer"
1 parent 4c4689c commit 9feba0d

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

Sources/TSCUtility/Version.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,31 @@ public enum VersionError: Error, CustomStringConvertible {
5252
/// The version core contains an invalid number of Identifiers.
5353
case invalidVersionCoreIdentifiersCount(_ identifiers: [String])
5454
/// Some or all of the version core identifiers contain non-numerical characters or are empty.
55-
case nonNuumericalOrEmptyVersionCoreIdentifiers(_ identifiers: [String])
55+
case nonNumericalOrEmptyVersionCoreIdentifiers(_ identifiers: [String])
5656
/// Some or all of the pre-release identifiers contain characters other than alpha-numerics and hyphens.
57-
case nonAlphaNuumerHyphenalPrereleaseIdentifiers(_ identifiers: [String])
57+
case nonAlphaNumerHyphenalPrereleaseIdentifiers(_ identifiers: [String])
5858
/// Some or all of the build metadata identifiers contain characters other than alpha-numerics and hyphens.
59-
case nonAlphaNuumerHyphenalBuildMetadataIdentifiers(_ identifiers: [String])
59+
case nonAlphaNumerHyphenalBuildMetadataIdentifiers(_ identifiers: [String])
6060

6161
public var description: String {
6262
switch self {
6363
case let .nonASCIIVersionString(versionString):
6464
return "non-ASCII characters in version string '\(versionString)'"
6565
case let .invalidVersionCoreIdentifiersCount(identifiers):
6666
return "\(identifiers.count < 3 ? "fewer" : "more") than 3 identifiers in version core '\(identifiers.joined(separator: "."))'"
67-
case let .nonNuumericalOrEmptyVersionCoreIdentifiers(identifiers):
67+
case let .nonNumericalOrEmptyVersionCoreIdentifiers(identifiers):
6868
if !identifiers.allSatisfy( { !$0.isEmpty } ) {
6969
return "empty identifiers in version core '\(identifiers.joined(separator: "."))'"
7070
} else {
7171
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
7272
let nonNumericalIdentifiers = identifiers.filter { !$0.allSatisfy(\.isNumber) }
7373
return "non-numerical characters in version core identifier\(nonNumericalIdentifiers.count > 1 ? "s" : "") \(nonNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
7474
}
75-
case let .nonAlphaNuumerHyphenalPrereleaseIdentifiers(identifiers):
75+
case let .nonAlphaNumerHyphenalPrereleaseIdentifiers(identifiers):
7676
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
7777
let nonAlhpaNumericalIdentifiers = identifiers.filter { !$0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } }
7878
return "characters other than alpha-numerics and hyphens in pre-release identifier\(nonAlhpaNumericalIdentifiers.count > 1 ? "s" : "") \(nonAlhpaNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
79-
case let .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(identifiers):
79+
case let .nonAlphaNumerHyphenalBuildMetadataIdentifiers(identifiers):
8080
// Not checking for `.isASCII` here because non-ASCII characters should've already been caught before this.
8181
let nonAlhpaNumericalIdentifiers = identifiers.filter { !$0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } }
8282
return "characters other than alpha-numerics and hyphens in build metadata identifier\(nonAlhpaNumericalIdentifiers.count > 1 ? "s" : "") \(nonAlhpaNumericalIdentifiers.map { "'\($0)'" } .joined(separator: ", "))"
@@ -118,7 +118,7 @@ extension Version {
118118
let minor = Int(versionCoreIdentifiers[1]),
119119
let patch = Int(versionCoreIdentifiers[2])
120120
else {
121-
throw VersionError.nonNuumericalOrEmptyVersionCoreIdentifiers(versionCoreIdentifiers.map { String($0) })
121+
throw VersionError.nonNumericalOrEmptyVersionCoreIdentifiers(versionCoreIdentifiers.map { String($0) })
122122
}
123123

124124
self.major = major
@@ -129,7 +129,7 @@ extension Version {
129129
let prereleaseStartIndex = versionString.index(after: prereleaseDelimiterIndex)
130130
let prereleaseIdentifiers = versionString[prereleaseStartIndex..<(metadataDelimiterIndex ?? versionString.endIndex)].split(separator: ".", omittingEmptySubsequences: false)
131131
guard prereleaseIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
132-
throw VersionError.nonAlphaNuumerHyphenalPrereleaseIdentifiers(prereleaseIdentifiers.map { String($0) })
132+
throw VersionError.nonAlphaNumerHyphenalPrereleaseIdentifiers(prereleaseIdentifiers.map { String($0) })
133133
}
134134
self.prereleaseIdentifiers = prereleaseIdentifiers.map { String($0) }
135135
} else {
@@ -140,7 +140,7 @@ extension Version {
140140
let metadataStartIndex = versionString.index(after: metadataDelimiterIndex)
141141
let buildMetadataIdentifiers = versionString[metadataStartIndex...].split(separator: ".", omittingEmptySubsequences: false)
142142
guard buildMetadataIdentifiers.allSatisfy( { $0.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" } } ) else {
143-
throw VersionError.nonAlphaNuumerHyphenalBuildMetadataIdentifiers(buildMetadataIdentifiers.map { String($0) })
143+
throw VersionError.nonAlphaNumerHyphenalBuildMetadataIdentifiers(buildMetadataIdentifiers.map { String($0) })
144144
}
145145
self.buildMetadataIdentifiers = buildMetadataIdentifiers.map { String($0) }
146146
} else {

Tests/TSCUtilityTests/VersionTests.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class VersionTests: XCTestCase {
102102
}
103103

104104
XCTAssertThrowsError(try Version(versionString: "13.21.-34")) { error in
105-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["13", "21", ""]) = error else {
105+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["13", "21", ""]) = error else {
106106
XCTFail()
107107
return
108108
}
@@ -126,15 +126,15 @@ class VersionTests: XCTestCase {
126126
}
127127

128128
XCTAssertThrowsError(try Version(versionString: "0.0.O")) { error in
129-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["0", "0", "O"]) = error else {
129+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["0", "0", "O"]) = error else {
130130
XCTFail()
131131
return
132132
}
133133
XCTAssertEqual(error.description, "non-numerical characters in version core identifier 'O'")
134134
}
135135

136136
XCTAssertThrowsError(try Version(versionString: "1.l1.O")) { error in
137-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["1", "l1", "O"]) = error else {
137+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["1", "l1", "O"]) = error else {
138138
XCTFail()
139139
return
140140
}
@@ -190,7 +190,7 @@ class VersionTests: XCTestCase {
190190
// MARK: Well-formed version core, malformed pre-release identifiers
191191

192192
XCTAssertThrowsError(try Version(versionString: "233.377.610-hello world")) { error in
193-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["hello world"]) = error else {
193+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["hello world"]) = error else {
194194
XCTFail()
195195
return
196196
}
@@ -248,15 +248,15 @@ class VersionTests: XCTestCase {
248248
}
249249

250250
XCTAssertThrowsError(try Version(versionString: "l.2.3")) { error in
251-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l", "2", "3"]) = error else {
251+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l", "2", "3"]) = error else {
252252
XCTFail()
253253
return
254254
}
255255
XCTAssertEqual(error.description, "non-numerical characters in version core identifier 'l'")
256256
}
257257

258258
XCTAssertThrowsError(try Version(versionString: "l.b.3")) { error in
259-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l", "b", "3"]) = error else {
259+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l", "b", "3"]) = error else {
260260
XCTFail()
261261
return
262262
}
@@ -296,15 +296,15 @@ class VersionTests: XCTestCase {
296296
// MARK: Well-formed version core, malformed build metadata identifiers
297297

298298
XCTAssertThrowsError(try Version(versionString: "17711.28657.46368+hello world.hello-.-world")) { error in
299-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(["hello world", "hello-", "-world"]) = error else {
299+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers(["hello world", "hello-", "-world"]) = error else {
300300
XCTFail()
301301
return
302302
}
303303
XCTAssertEqual(error.description, "characters other than alpha-numerics and hyphens in build metadata identifier 'hello world'")
304304
}
305305

306306
XCTAssertThrowsError(try Version(versionString: "28657.46368.75025+hello+world.hello world")) { error in
307-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers(["hello+world", "hello world"]) = error else {
307+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers(["hello+world", "hello world"]) = error else {
308308
XCTFail()
309309
return
310310
}
@@ -346,15 +346,15 @@ class VersionTests: XCTestCase {
346346
}
347347

348348
XCTAssertThrowsError(try Version(versionString: "196418.317811.83204O+a.whole.lot.of.build.metadata.identifiers")) { error in
349-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["196418", "317811", "83204O"]) = error else {
349+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["196418", "317811", "83204O"]) = error else {
350350
XCTFail()
351351
return
352352
}
353353
XCTAssertEqual(error.description, "non-numerical characters in version core identifier '83204O'")
354354
}
355355

356356
XCTAssertThrowsError(try Version(versionString: "abc.def.ghi+a.whole.lot.of.build.metadata.identifiers")) { error in
357-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["abc", "def", "ghi"]) = error else {
357+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["abc", "def", "ghi"]) = error else {
358358
XCTFail()
359359
return
360360
}
@@ -393,7 +393,7 @@ class VersionTests: XCTestCase {
393393
// MARK: Well-formed version core, well-formed pre-release identifiers, malformed build metadata identifiers
394394

395395
XCTAssertThrowsError(try Version(versionString: "514229.832040.1346269-beta1+ ")) { error in
396-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalBuildMetadataIdentifiers([" "]) = error else {
396+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalBuildMetadataIdentifiers([" "]) = error else {
397397
XCTFail()
398398
return
399399
}
@@ -403,7 +403,7 @@ class VersionTests: XCTestCase {
403403
// MARK: Well-formed version core, malformed pre-release identifiers, well-formed build metadata identifiers
404404

405405
XCTAssertThrowsError(try Version(versionString: "832040.1346269.2178309-beta 1.-+-")) { error in
406-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["beta 1", "-"]) = error else {
406+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["beta 1", "-"]) = error else {
407407
XCTFail()
408408
return
409409
}
@@ -414,7 +414,7 @@ class VersionTests: XCTestCase {
414414

415415
// pre-release is diagnosed before build metadata is
416416
XCTAssertThrowsError(try Version(versionString: "1346269.2178309.3524578-beta 1++")) { error in
417-
guard let error = error as? VersionError, case .nonAlphaNuumerHyphenalPrereleaseIdentifiers(["beta 1"]) = error else {
417+
guard let error = error as? VersionError, case .nonAlphaNumerHyphenalPrereleaseIdentifiers(["beta 1"]) = error else {
418418
XCTFail()
419419
return
420420
}
@@ -424,7 +424,7 @@ class VersionTests: XCTestCase {
424424
// MARK: malformed version core, well-formed pre-release identifiers, well-formed build metadata identifiers
425425

426426
XCTAssertThrowsError(try Version(versionString: " 832040.1346269.3524578-beta1+abc")) { error in
427-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers([" 832040", "1346269", "3524578"]) = error else {
427+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers([" 832040", "1346269", "3524578"]) = error else {
428428
XCTFail()
429429
return
430430
}
@@ -443,7 +443,7 @@ class VersionTests: XCTestCase {
443443

444444
// version core is diagnosed before build metadata is
445445
XCTAssertThrowsError(try Version(versionString: "l346269.abc.OOO-beta1+++.+.+")) { error in
446-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["l346269", "abc", "OOO"]) = error else {
446+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["l346269", "abc", "OOO"]) = error else {
447447
XCTFail()
448448
return
449449
}
@@ -455,7 +455,7 @@ class VersionTests: XCTestCase {
455455
XCTAssertNil(Version("352A578.5702887.9227465-beta!@#$%^&*1+asdfghjkl123456789" as String))
456456
// version core is diagnosed before pre-release is
457457
XCTAssertThrowsError(try Version(versionString: "352A578.5702887.9227465-beta!@#$%^&*1+asdfghjkl123456789")) { error in
458-
guard let error = error as? VersionError, case .nonNuumericalOrEmptyVersionCoreIdentifiers(["352A578", "5702887", "9227465"]) = error else {
458+
guard let error = error as? VersionError, case .nonNumericalOrEmptyVersionCoreIdentifiers(["352A578", "5702887", "9227465"]) = error else {
459459
XCTFail()
460460
return
461461
}

0 commit comments

Comments
 (0)