Merge pull request #161 from stephencelis/tidying

Use more succinct code and constructs (nfc)

Author: mxcl

Sources/ManifestParser/TOML.swift

@@ -213,11 +213,11 @@ private struct Lexer {
 
         // Consume and cache the next character.
         lookahead = utf8[index]
-        nextIndex = index.advancedBy(1)
+        nextIndex = index.successor()
 
         // Normalize line endings.
         if lookahead == "\r".utf8Constant && utf8[nextIndex!] == "\n".utf8Constant {
-            nextIndex = nextIndex!.advancedBy(1)
+            nextIndex = nextIndex!.successor()
             lookahead = "\n".utf8Constant
         }
 
@@ -277,7 +277,7 @@ private struct Lexer {
                     break
                 }
             }
-            return .StringLiteral(value: String(utf8[Range(start: startIndex.advancedBy(1), end: endIndex)]))
+            return .StringLiteral(value: String(utf8[Range(start: startIndex.successor(), end: endIndex)]))
 
         // Numeric literals.
         //

Sources/ManifestParser/fromTOML().swift

@@ -95,7 +95,7 @@ extension PackageDescription.Target {
 
         // Parse the dependencies.
         var dependencies: [PackageDescription.Target.Dependency] = []
-        if case .Some(.Array(let array)) = table.items["dependencies"] {
+        if case .Array(let array)? = table.items["dependencies"] {
             for item in array.items {
                 dependencies.append(PackageDescription.Target.Dependency.fromTOML(item))
             }

Sources/Utility/StringExtensions.swift

@@ -48,9 +48,9 @@ extension String {
 
         loop: while true {
             switch cc.first {
-            case .None:
+            case nil:
                 return nil
-            case .Some("\n"), .Some("\r"), .Some(" "), .Some("\t"), .Some("\r\n"):
+            case "\n"?, "\r"?, " "?, "\t"?, "\r\n"?:
                 cc = cc.dropFirst()
             default:
                 break loop
@@ -59,9 +59,9 @@ extension String {
 
         loop: while true {
             switch cc.last {
-            case .None:
+            case nil:
                 return nil
-            case .Some("\n"), .Some("\r"), .Some(" "), .Some("\t"), .Some("\r\n"):
+            case "\n"?, "\r"?, " "?, "\t"?, "\r\n"?:
                 cc = cc.dropLast()
             default:
                 break loop

Tests/Transmute/ModuleTests.swift

@@ -114,7 +114,7 @@ class ModuleTests: XCTestCase {
 
         // precise order is not important, but it is important that the following are true
         let t6rd = t6.recursiveDeps
-        XCTAssertEqual(t6rd.indexOf(t3)!, t6rd.indexOf(t4)!.advancedBy(1))
+        XCTAssertEqual(t6rd.indexOf(t3)!, t6rd.indexOf(t4)!.successor())
         XCTAssert(t6rd.indexOf(t5)! < t6rd.indexOf(t2)!)
         XCTAssert(t6rd.indexOf(t5)! < t6rd.indexOf(t1)!)
         XCTAssert(t6rd.indexOf(t2)! < t6rd.indexOf(t1)!)
@@ -143,7 +143,7 @@ class ModuleTests: XCTestCase {
 
         // precise order is not important, but it is important that the following are true
         let t6rd = t6.recursiveDeps
-        XCTAssertEqual(t6rd.indexOf(t3)!, t6rd.indexOf(t4)!.advancedBy(1))
+        XCTAssertEqual(t6rd.indexOf(t3)!, t6rd.indexOf(t4)!.successor())
         XCTAssert(t6rd.indexOf(t5)! < t6rd.indexOf(t2)!)
         XCTAssert(t6rd.indexOf(t5)! < t6rd.indexOf(t1)!)
         XCTAssert(t6rd.indexOf(t2)! < t6rd.indexOf(t1)!)