Swift 6.1 (#27)

rasberik · web-flow · commit 68a3c1d9774e · 2025-10-20T14:50:11.000+09:00
* Update dependencies

* Adopt Swift 6

* Update configurations and readme

* Revert collapsed call

* Empty commit to trigger CI

* Attempt to fix linux concurrenyc failure

* Attempt to fix linux concurrenyc failure 2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,11 +6,11 @@ on:
 jobs:
   publish:
     name: Publish
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
         xcode_version:
-          - "15.4"
+          - "16.4"
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     name: Test on Linux
     runs-on: ubuntu-22.04
     container:
-      image: swift:5.10
+      image: swift:6.1
     steps:
       - uses: actions/checkout@v2
       - name: Show Environments
@@ -26,11 +26,11 @@ jobs:
         run: make test
   macOS:
     name: Test on macOS
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
         xcode_version:
-          - "15.4"
+          - "16.4"
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
     steps:
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ SWIFT_BUILD_FLAGS := -c release --disable-sandbox
 TOOL_NAME := swift-mod
 XCODE_DEFAULT_TOOLCHAIN := /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain
 GITHUB_REPO := ra1028/$(TOOL_NAME)
-DOCKER_IMAGE_NAME := swift:5.10
+DOCKER_IMAGE_NAME := swift:6.1
 
 ifeq ($(shell uname), Darwin)
 SWIFT_BUILD_FLAGS += --arch arm64 --arch x86_64
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.1
 
 import PackageDescription
 
@@ -11,13 +11,13 @@ let package = Package(
         .executable(
             name: "swift-mod",
             targets: ["swift-mod"]
-        )
+        ),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser.git", exact: "1.5.0"),
-        .package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "510.0.3"),
-        .package(url: "https://github.com/swiftlang/swift-tools-support-core.git", exact: "0.7.1"),
-        .package(url: "https://github.com/jpsim/Yams.git", exact: "5.1.3")
+        .package(url: "https://github.com/apple/swift-argument-parser.git", exact: "1.5.1"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "601.0.1"),
+        .package(url: "https://github.com/swiftlang/swift-tools-support-core.git", exact: "0.7.3"),
+        .package(url: "https://github.com/jpsim/Yams.git", exact: "6.0.1")
     ],
     targets: [
         .executableTarget(
@@ -56,5 +56,5 @@ let package = Package(
             dependencies: ["SwiftModCore"]
         ),
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v6]
 )
diff --git a/README.md b/README.md
@@ -316,6 +316,7 @@ So you should use swift-mod version that built with compatible version of Swift
 |5.8          |0.2.0                           |
 |5.9          |0.2.0                           |
 |5.10         |0.2.1                           |
+|6.1          |0.3.0                           |
 
 ---
 
diff --git a/Sources/SwiftModCommands/Arguments.swift b/Sources/SwiftModCommands/Arguments.swift
@@ -1,13 +1,13 @@
 import ArgumentParser
 import TSCBasic
 
-public enum Mode: String, CaseIterable, ExpressibleByArgument {
+public enum Mode: String, CaseIterable, Sendable, ExpressibleByArgument {
     case modify
     case dryRun = "dry-run"
     case check
 }
 
-extension AbsolutePath: ExpressibleByArgument {
+extension AbsolutePath: @retroactive ExpressibleByArgument {
     public init?(argument: String) {
         if let cwd = localFileSystem.currentWorkingDirectory {
             try? self.init(validating: argument, relativeTo: cwd)
diff --git a/Sources/SwiftModCommands/Configuration/Configuration+Template.swift b/Sources/SwiftModCommands/Configuration/Configuration+Template.swift
@@ -3,7 +3,7 @@ import SwiftModRules
 import TSCBasic
 
 public extension Configuration {
-    static let template: Configuration = {
+    nonisolated(unsafe) static let template: Configuration = {
         let format = Format(
             indent: .spaces(4),
             lineBreakBeforeEachArgument: true
diff --git a/Sources/SwiftModCommands/InitCommand.swift b/Sources/SwiftModCommands/InitCommand.swift
@@ -3,7 +3,7 @@ import Foundation
 import TSCBasic
 
 public struct InitCommand: ParsableCommand {
-    public static var configuration = CommandConfiguration(
+    public static let configuration = CommandConfiguration(
         commandName: "init",
         abstract: "Generates a modify configuration file."
     )
diff --git a/Sources/SwiftModCommands/RulesCommand.swift b/Sources/SwiftModCommands/RulesCommand.swift
@@ -2,7 +2,7 @@ import ArgumentParser
 import SwiftModCore
 
 public struct RulesCommand: ParsableCommand {
-    public static var configuration = CommandConfiguration(
+    public static let configuration = CommandConfiguration(
         commandName: "rules",
         abstract: "Display the list of rules."
     )
diff --git a/Sources/SwiftModCommands/RunCommand.swift b/Sources/SwiftModCommands/RunCommand.swift
@@ -4,7 +4,7 @@ import SwiftModCore
 import TSCBasic
 
 public struct RunCommand: ParsableCommand {
-    public static var configuration = CommandConfiguration(
+    public static let configuration = CommandConfiguration(
         commandName: "run",
         abstract: "Runs modification."
     )
diff --git a/Sources/SwiftModCommands/Runners/RunCommandRunner.swift b/Sources/SwiftModCommands/Runners/RunCommandRunner.swift
@@ -5,7 +5,7 @@ import SwiftSyntax
 import TSCBasic
 import Yams
 
-internal struct RunCommandRunner {
+internal struct RunCommandRunner: @unchecked Sendable {
     enum Error: Swift.Error, CustomStringConvertible {
         case readOrParseFileFailed(path: AbsolutePath, error: Swift.Error)
         case writeFileContentsFailed(path: AbsolutePath, error: Swift.Error)
@@ -109,7 +109,7 @@ private extension RunCommandRunner {
                     let modifiedSyntax: Syntax
 
                     do {
-                        source = try self.fileSystem.readFileContents(path).cString
+                        source = try fileSystem.readFileContents(path).cString
                         syntax = Syntax(Parser.parse(source: source))
                         modifiedSyntax = pipeline.visit(syntax)
                     }
diff --git a/Sources/SwiftModCore/Format.swift b/Sources/SwiftModCore/Format.swift
@@ -1,4 +1,4 @@
-public struct Format: Codable, Equatable {
+public struct Format: Codable, Equatable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case indent
         case lineBreakBeforeEachArgument
diff --git a/Sources/SwiftModCore/Helpers/Atomic.swift b/Sources/SwiftModCore/Helpers/Atomic.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public final class Atomic<Value> {
+public final class Atomic<Value>: @unchecked Sendable {
     public var value: Value {
         get { modify { $0 } }
         set { modify { $0 = newValue } }
diff --git a/Sources/SwiftModCore/Helpers/InteractiveWriter.swift b/Sources/SwiftModCore/Helpers/InteractiveWriter.swift
@@ -1,4 +1,5 @@
 import TSCBasic
+@preconcurrency import TSCLibc
 
 public protocol InteractiveWriterProtocol {
     func write(_ string: String, inColor color: TerminalController.Color, bold: Bool)
@@ -10,7 +11,7 @@ public extension InteractiveWriterProtocol {
     }
 }
 
-public final class InteractiveWriter: InteractiveWriterProtocol {
+public final class InteractiveWriter: InteractiveWriterProtocol, @unchecked Sendable {
     public static let stdout = InteractiveWriter(stream: stdoutStream)
     public static let stderr = InteractiveWriter(stream: stderrStream)
 
@@ -33,6 +34,26 @@ public final class InteractiveWriter: InteractiveWriterProtocol {
     }
 }
 
+private extension InteractiveWriter {
+    nonisolated(unsafe) static var stdoutStream: ThreadSafeOutputByteStream {
+        try! ThreadSafeOutputByteStream(
+            LocalFileOutputByteStream(
+                filePointer: TSCLibc.stdout,
+                closeOnDeinit: false
+            )
+        )
+    }
+
+    nonisolated(unsafe) static var stderrStream: ThreadSafeOutputByteStream {
+        try! ThreadSafeOutputByteStream(
+            LocalFileOutputByteStream(
+                filePointer: TSCLibc.stderr,
+                closeOnDeinit: false
+            )
+        )
+    }
+}
+
 public final class InMemoryInteractiveWriter: InteractiveWriterProtocol {
     public struct Input: Equatable {
         public let string: String
diff --git a/Sources/SwiftModCore/Helpers/RulePipeline.swift b/Sources/SwiftModCore/Helpers/RulePipeline.swift
@@ -1,6 +1,6 @@
 import SwiftSyntax
 
-public struct RulePipeline {
+public struct RulePipeline: @unchecked Sendable {
     private let rules: ContiguousArray<Rule>
 
     public init<S: Sequence>(_ rules: S) where S.Element == Rule {
diff --git a/Sources/SwiftModCore/Indent.swift b/Sources/SwiftModCore/Indent.swift
@@ -1,4 +1,4 @@
-public enum Indent: Codable, Equatable {
+public enum Indent: Codable, Equatable, Sendable {
     case spaces(Int)
     case tab
 
diff --git a/Sources/SwiftModCore/RuleDescription.swift b/Sources/SwiftModCore/RuleDescription.swift
@@ -1,12 +1,12 @@
-public struct RuleDescription {
+public struct RuleDescription: Sendable {
     public var name: String
     public var priority: RulePriority
     public var overview: String
-    public var exampleOptions: DynamicEncodable
+    nonisolated(unsafe) public var exampleOptions: DynamicEncodable
     public var exampleBefore: String
     public var exampleAfter: String
 
-    public init<Options: Encodable>(
+    public init<Options: Sendable & Encodable>(
         name: String,
         priority: RulePriority,
         overview: String,
@@ -17,7 +17,11 @@ public struct RuleDescription {
         self.name = name
         self.priority = priority
         self.overview = overview
-        self.exampleOptions = DynamicEncodable(encode: exampleOptions.encode)
+        self.exampleOptions = DynamicEncodable(
+            encode: { encoder in
+                try exampleOptions.encode(to: encoder)
+            }
+        )
         self.exampleBefore = exampleBefore
         self.exampleAfter = exampleAfter
     }
diff --git a/Sources/SwiftModCore/RulePriority.swift b/Sources/SwiftModCore/RulePriority.swift
@@ -1,4 +1,4 @@
-public struct RulePriority: RawRepresentable, Comparable {
+public struct RulePriority: RawRepresentable, Comparable, Sendable {
     public var rawValue: Int
 
     public static let high = RulePriority(rawValue: 1000)
diff --git a/Sources/SwiftModRules/DefaultAccessLevelRule.swift b/Sources/SwiftModRules/DefaultAccessLevelRule.swift
@@ -42,15 +42,15 @@ public final class DefaultAccessLevelRule: RuleDefinition {
             """
     )
 
-    public enum AccessLebel: String, Codable {
+    public enum AccessLebel: String, Codable, Sendable {
         case openOrPublic
         case `public`
         case `internal`
         case `fileprivate`
         case `private`
     }
 
-    public struct Options: Codable {
+    public struct Options: Codable, Sendable {
         public var accessLevel: AccessLebel
         public var implicitInternal: Bool?
 
diff --git a/Sources/SwiftModRules/DefaultMemberwiseInitializerRule.swift b/Sources/SwiftModRules/DefaultMemberwiseInitializerRule.swift
@@ -51,7 +51,7 @@ public final class DefaultMemberwiseInitializerRule: RuleDefinition {
             """
     )
 
-    public struct Options: Codable {
+    public struct Options: Codable, Sendable {
         public var implicitInitializer: Bool?
         public var implicitInternal: Bool?
         public var ignoreClassesWithInheritance: Bool?
@@ -329,6 +329,8 @@ private extension TypeSyntax {
         if self.is(FunctionTypeSyntax.self) {
             return TypeSyntax(
                 AttributedTypeSyntax(
+                    leadingTrivia: nil,
+                    specifiers: [],
                     attributes: AttributeListSyntax([
                         .attribute(
                             AttributeSyntax(
@@ -338,7 +340,8 @@ private extension TypeSyntax {
                             )
                         )
                     ]),
-                    baseType: self
+                    baseType: self,
+                    trailingTrivia: nil
                 )
             )
         }
diff --git a/Sources/swift-mod/SwiftMod.swift b/Sources/swift-mod/SwiftMod.swift
@@ -3,7 +3,7 @@ import SwiftModCommands
 
 @main
 struct SwiftMod: ParsableCommand {
-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
         commandName: "swift-mod",
         abstract: "Modifies Swift source code with rules",
         subcommands: [
diff --git a/Tests/SwiftModCommandsTests/Configuration+CodableTests.swift b/Tests/SwiftModCommandsTests/Configuration+CodableTests.swift
@@ -3,7 +3,7 @@ import SwiftModCore
 import XCTest
 import Yams
 
-func assertConfigurationCoding(_ configuration: Configuration, file: StaticString = #file, line: UInt = #line) {
+func assertConfigurationCoding(_ configuration: Configuration, file: StaticString = #filePath, line: UInt = #line) {
     do {
         let encoded = try YAMLEncoder().encode(configuration)
         let decoded = try YAMLDecoder().decode(Configuration.self, from: encoded)
diff --git a/Tests/SwiftModRulesTests/Helpers.swift b/Tests/SwiftModRulesTests/Helpers.swift
@@ -3,7 +3,7 @@ import SwiftModCore
 import SwiftParser
 import XCTest
 
-func assertRuleDescription(_ rule: AnyRule, file: StaticString = #file, line: UInt = #line) throws {
+func assertRuleDescription(_ rule: AnyRule, file: StaticString = #filePath, line: UInt = #line) throws {
     let description = type(of: rule).description
     let encodedOptions = try? JSONEncoder().encode(description.exampleOptions)
     let exampleSyntax = Parser.parse(source: description.exampleBefore)
@@ -15,7 +15,7 @@ func assertRuleDescription(_ rule: AnyRule, file: StaticString = #file, line: UI
     XCTAssertEqual(exampleModified, description.exampleAfter, file: file, line: line)
 }
 
-func assertRule(_ rule: AnyRule, source: String, expected: String, file: StaticString = #file, line: UInt = #line) throws {
+func assertRule(_ rule: AnyRule, source: String, expected: String, file: StaticString = #filePath, line: UInt = #line) throws {
     let syntax = Parser.parse(source: source)
     let modified = rule.rewriter().visit(syntax).description
     XCTAssertEqual(modified, expected, file: file, line: line)
diff --git a/Tools/Package.resolved b/Tools/Package.resolved
diff --git a/Tools/Package.swift b/Tools/Package.swift

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import Foundation`
`3`	`3`	`import TSCBasic`
`4`	`4`
`5`	`5`	`public struct InitCommand: ParsableCommand {`
`6`		`- public static var configuration = CommandConfiguration(`
	`6`	`+ public static let configuration = CommandConfiguration(`
`7`	`7`	`commandName: "init",`
`8`	`8`	`abstract: "Generates a modify configuration file."`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import ArgumentParser`
`2`	`2`	`import SwiftModCore`
`3`	`3`
`4`	`4`	`public struct RulesCommand: ParsableCommand {`
`5`		`- public static var configuration = CommandConfiguration(`
	`5`	`+ public static let configuration = CommandConfiguration(`
`6`	`6`	`commandName: "rules",`
`7`	`7`	`abstract: "Display the list of rules."`
`8`	`8`	`)`