Update to Swift 5.3 (#20)

Author: kevinmbeaulieu

.swift-version

@@ -1 +1 @@
-5.0
+5.3

.travis.yml

@@ -1,5 +1,5 @@
 language: swift
-osx_image: xcode11.4
+osx_image: xcode12.2
 branches:
   only:
   - master

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 // Copyright 2020 Thumbtack, Inc.
@@ -38,8 +38,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "0.50200.0")),
-        .package(name: "swift-argument-parser", url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.2.0")),
+        .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "0.50300.0")), // Minor releases correspond to Swift versions (i.e., use 0.50x000.y with Swift 5.x)
+        .package(name: "swift-argument-parser", url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "0.2.0")),
     ],
     targets: [
         .target(

Package.swift

@@ -75,8 +75,8 @@ public class FastStrategy: SyntaxVisitor, Strategy {
 
     override public func visit(_ token: TokenSyntax) -> SyntaxVisitorContinueKind {
         if includeSyntax.contains(.constructorCall),
-            case let .identifier(identifier) = token.tokenKind,
-            types.contains(identifier) {
+           case let .identifier(identifier) = token.tokenKind,
+           types.contains(identifier) {
             increment(identifier, token: token)
         }
 
@@ -89,16 +89,16 @@ public class FastStrategy: SyntaxVisitor, Strategy {
         if let baseIdentifierExpr = base.as(IdentifierExprSyntax.self) {
             if case let .identifier(baseIdentifier) = baseIdentifierExpr.identifier.tokenKind {
                 if includeSyntax.contains(.staticPropertyReference),
-                    types.contains(baseIdentifier) {
+                   types.contains(baseIdentifier) {
                     increment(baseIdentifier, token: baseIdentifierExpr.identifier)
                     return .skipChildren
                 }
 
                 if includeSyntax.contains(.constructorCall),
-                    let moduleName = moduleName,
-                    baseIdentifier == moduleName,
-                    case let .identifier(identifier) = node.name.tokenKind,
-                    types.contains(identifier) {
+                   let moduleName = moduleName,
+                   baseIdentifier == moduleName,
+                   case let .identifier(identifier) = node.name.tokenKind,
+                   types.contains(identifier) {
                     increment(identifier, token: node.name)
                     return .skipChildren
                 }
@@ -108,12 +108,12 @@ public class FastStrategy: SyntaxVisitor, Strategy {
 
         } else if let baseMemberAccessExpr = base.as(MemberAccessExprSyntax.self) {
             if includeSyntax.contains(.staticPropertyReference),
-                let moduleName = moduleName,
-                let innerBaseIdentifierExpr = baseMemberAccessExpr.base?.as(IdentifierExprSyntax.self),
-                case let .identifier(innerBaseIdentifier) = innerBaseIdentifierExpr.identifier.tokenKind,
-                innerBaseIdentifier == moduleName,
-                case let .identifier(innerIdentifier) = baseMemberAccessExpr.name.tokenKind,
-                types.contains(innerIdentifier) {
+               let moduleName = moduleName,
+               let innerBaseIdentifierExpr = baseMemberAccessExpr.base?.as(IdentifierExprSyntax.self),
+               case let .identifier(innerBaseIdentifier) = innerBaseIdentifierExpr.identifier.tokenKind,
+               innerBaseIdentifier == moduleName,
+               case let .identifier(innerIdentifier) = baseMemberAccessExpr.name.tokenKind,
+               types.contains(innerIdentifier) {
                 increment(innerIdentifier, token: baseMemberAccessExpr.name)
                 return .skipChildren
             }
@@ -194,31 +194,31 @@ public class FastStrategy: SyntaxVisitor, Strategy {
     }
 
     override public func visit(_: UnknownSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: InOutExprSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: AssignmentExprSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: TypeExprSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: TypeAnnotationSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: TypeInitializerClauseSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: TypealiasDeclSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_ node: TypeInheritanceClauseSyntax) -> SyntaxVisitorContinueKind {
@@ -240,19 +240,19 @@ public class FastStrategy: SyntaxVisitor, Strategy {
     }
 
     override public func visit(_: ImportDeclSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: FunctionSignatureSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: AsTypePatternSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     override public func visit(_: AsExprSyntax) -> SyntaxVisitorContinueKind {
-        return .skipChildren
+        .skipChildren
     }
 
     // MARK: - Private

Sources/STARLib/FastStrategy.swift

@@ -16,7 +16,7 @@ import XCTest
 
 #if !canImport(ObjectiveC)
     public func allTests() -> [XCTestCaseEntry] {
-        return [
+        [
             testCase(FastStrategyTests.allTests),
         ]
     }