[NFC] Fix some of the new Swift main snapshots warnings

Sources/Basics/Vendor/Triple.swift

@@ -426,7 +426,7 @@ extension Triple {
     }
   }
 
-  public enum Arch: String, CaseIterable {
+  public enum Arch: String, CaseIterable, Decodable {
     /// ARM (little endian): arm, armv.*, xscale
     case arm
     // ARM (big endian): armeb

Sources/Commands/PackageTools/Init.swift

@@ -83,4 +83,8 @@ extension SwiftPackageTool {
     }
 }
 
+#if swift(<5.11)
 extension InitPackage.PackageType: ExpressibleByArgument {}
+#else
+extension InitPackage.PackageType: @retroactive ExpressibleByArgument {}
+#endif

Sources/Commands/Utilities/APIDigester.swift

@@ -322,8 +322,14 @@ extension PackageGraph {
     }
 }
 
-extension SerializedDiagnostics.SourceLocation: DiagnosticLocation {
+extension SerializedDiagnostics.SourceLocation {
     public var description: String {
         return "\(filename):\(line):\(column)"
     }
 }
+
+#if swift(<5.11)
+extension SerializedDiagnostics.SourceLocation: DiagnosticLocation {}
+#else
+extension SerializedDiagnostics.SourceLocation: @retroactive DiagnosticLocation {}
+#endif

Sources/CoreCommands/Options.swift

@@ -536,13 +536,13 @@ public struct LinkerOptions: ParsableArguments {
 
 // MARK: - Extensions
 
-extension BuildConfiguration: ExpressibleByArgument {
+extension BuildConfiguration {
     public init?(argument: String) {
         self.init(rawValue: argument)
     }
 }
 
-extension AbsolutePath: ExpressibleByArgument {
+extension AbsolutePath {
     public init?(argument: String) {
         if let cwd = localFileSystem.currentWorkingDirectory {
             guard let path = try? AbsolutePath(validating: argument, relativeTo: cwd) else {
@@ -564,13 +564,13 @@ extension AbsolutePath: ExpressibleByArgument {
     }
 }
 
-extension WorkspaceConfiguration.CheckingMode: ExpressibleByArgument {
+extension WorkspaceConfiguration.CheckingMode {
     public init?(argument: String) {
         self.init(rawValue: argument)
     }
 }
 
-extension Sanitizer: ExpressibleByArgument {
+extension Sanitizer {
     public init?(argument: String) {
         if let sanitizer = Sanitizer(rawValue: argument) {
             self = sanitizer
@@ -591,18 +591,34 @@ extension Sanitizer: ExpressibleByArgument {
     }
 }
 
-extension BuildSystemProvider.Kind: ExpressibleByArgument {}
-
-extension Version: ExpressibleByArgument {}
-
-extension PackageIdentity: ExpressibleByArgument {
+extension PackageIdentity {
     public init?(argument: String) {
         self = .plain(argument)
     }
 }
 
-extension URL: ExpressibleByArgument {
+extension URL {
     public init?(argument: String) {
         self.init(string: argument)
     }
 }
+
+#if swift(<5.11)
+extension BuildConfiguration: ExpressibleByArgument {}
+extension AbsolutePath: ExpressibleByArgument {}
+extension WorkspaceConfiguration.CheckingMode: ExpressibleByArgument {}
+extension Sanitizer: ExpressibleByArgument {}
+extension BuildSystemProvider.Kind: ExpressibleByArgument {}
+extension Version: ExpressibleByArgument {}
+extension PackageIdentity: ExpressibleByArgument {}
+extension URL: ExpressibleByArgument {}
+#else
+extension BuildConfiguration: @retroactive ExpressibleByArgument {}
+extension AbsolutePath: @retroactive ExpressibleByArgument {}
+extension WorkspaceConfiguration.CheckingMode: @retroactive ExpressibleByArgument {}
+extension Sanitizer: @retroactive ExpressibleByArgument {}
+extension BuildSystemProvider.Kind: @retroactive ExpressibleByArgument {}
+extension Version: @retroactive ExpressibleByArgument {}
+extension PackageIdentity: @retroactive ExpressibleByArgument {}
+extension URL: @retroactive ExpressibleByArgument {}
+#endif

Sources/PackageLoading/ManifestLoader.swift

@@ -1081,7 +1081,6 @@ public final class ManifestLoader: ManifestLoaderProtocol {
         for toolsVersion: ToolsVersion
     ) -> [String] {
         var cmd = [String]()
-        let libraryPath = self.toolchain.swiftPMLibrariesLocation.manifestLibraryPath
         let modulesPath = self.toolchain.swiftPMLibrariesLocation.manifestModulesPath
         cmd += ["-swift-version", toolsVersion.swiftLanguageVersion.rawValue]
         // if runtimePath is set to "PackageFrameworks" that means we could be developing SwiftPM in Xcode

Sources/PackageModel/SwiftSDKs/SwiftSDK.swift

@@ -925,3 +925,28 @@ struct SwiftSDKMetadataV4: Decodable {
     /// Mapping of triple strings to corresponding properties of such target triple.
     let targetTriples: [String: TripleProperties]
 }
+
+extension Optional where Wrapped == AbsolutePath {
+    fileprivate var configurationString: String {
+        self?.pathString ?? "not set"
+    }
+}
+
+extension Optional where Wrapped == [AbsolutePath] {
+    fileprivate var configurationString: String {
+        self?.map(\.pathString).description ?? "not set"
+    }
+}
+
+extension SwiftSDK.PathsConfiguration: CustomStringConvertible {
+    public var description: String {
+        """
+        sdkRootPath: \(sdkRootPath.configurationString)
+        swiftResourcesPath: \(swiftResourcesPath.configurationString)
+        swiftStaticResourcesPath: \(swiftStaticResourcesPath.configurationString)
+        includeSearchPaths: \(includeSearchPaths.configurationString)
+        librarySearchPaths: \(librarySearchPaths.configurationString)
+        toolsetPaths: \(toolsetPaths.configurationString)
+        """
+    }
+}

Sources/PackageRegistryTool/PackageRegistryTool+Publish.swift

@@ -237,12 +237,18 @@ extension SwiftPackageRegistryTool {
     }
 }
 
-extension SignatureFormat: ExpressibleByArgument {
+extension SignatureFormat {
     public init?(argument: String) {
         self.init(rawValue: argument.lowercased())
     }
 }
 
+#if swift(<5.11)
+extension SignatureFormat: ExpressibleByArgument {}
+#else
+extension SignatureFormat: @retroactive ExpressibleByArgument {}
+#endif
+
 enum MetadataLocation {
     case sourceTree(AbsolutePath)
     case external(AbsolutePath)

Sources/SPMBuildCore/XCFrameworkMetadata.swift

@@ -84,5 +84,3 @@ extension XCFrameworkMetadata.Library: Decodable {
         case variant = "SupportedPlatformVariant"
     }
 }
-
-extension Triple.Arch: Decodable {}

Sources/SPMTestSupport/misc.swift

@@ -375,21 +375,19 @@ extension FileSystem {
     }
 }
 
-extension URL: ExpressibleByStringLiteral {
+extension URL {
     public init(_ value: StringLiteralType) {
         self.init(string: value)!
     }
 }
 
-extension URL: ExpressibleByStringInterpolation {
+extension URL {
     public init(stringLiteral value: String) {
         self.init(string: value)!
     }
 }
 
-extension PackageIdentity: ExpressibleByStringLiteral {}
-
-extension PackageIdentity: ExpressibleByStringInterpolation {
+extension PackageIdentity {
     public init(stringLiteral value: String) {
         self = Self.plain(value)
     }
@@ -401,13 +399,13 @@ extension PackageIdentity {
     }
 }
 
-extension AbsolutePath: ExpressibleByStringLiteral {
+extension AbsolutePath {
     public init(_ value: StringLiteralType) {
         try! self.init(validating: value)
     }
 }
 
-extension AbsolutePath: ExpressibleByStringInterpolation {
+extension AbsolutePath {
     public init(stringLiteral value: String) {
         try! self.init(validating: value)
     }
@@ -429,13 +427,13 @@ extension RelativePath {
     }
 }
 
-extension RelativePath: ExpressibleByStringLiteral {
+extension RelativePath {
     public init(_ value: StringLiteralType) {
         try! self.init(validating: value)
     }
 }
 
-extension RelativePath: ExpressibleByStringInterpolation {
+extension RelativePath {
     public init(stringLiteral value: String) {
         try! self.init(validating: value)
     }
@@ -458,3 +456,23 @@ extension InitPackage {
         )
     }
 }
+
+#if swift(<5.11)
+extension RelativePath: ExpressibleByStringLiteral {}
+extension RelativePath: ExpressibleByStringInterpolation {}
+extension URL: ExpressibleByStringLiteral {}
+extension URL: ExpressibleByStringInterpolation {}
+extension PackageIdentity: ExpressibleByStringLiteral {}
+extension PackageIdentity: ExpressibleByStringInterpolation {}
+extension AbsolutePath: ExpressibleByStringLiteral {}
+extension AbsolutePath: ExpressibleByStringInterpolation {}
+#else
+extension RelativePath: @retroactive ExpressibleByStringLiteral {}
+extension RelativePath: @retroactive ExpressibleByStringInterpolation {}
+extension URL: @retroactive ExpressibleByStringLiteral {}
+extension URL: @retroactive ExpressibleByStringInterpolation {}
+extension PackageIdentity: @retroactive ExpressibleByStringLiteral {}
+extension PackageIdentity: @retroactive ExpressibleByStringInterpolation {}
+extension AbsolutePath: @retroactive ExpressibleByStringLiteral {}
+extension AbsolutePath: @retroactive ExpressibleByStringInterpolation {}
+#endif

Sources/SwiftSDKTool/Configuration/ShowConfiguration.swift

@@ -48,28 +48,3 @@ struct ShowConfiguration: ConfigurationSubcommand {
         print(swiftSDK.pathsConfiguration)
     }
 }
-
-extension SwiftSDK.PathsConfiguration: CustomStringConvertible {
-    public var description: String {
-        """
-        sdkRootPath: \(sdkRootPath.configurationString)
-        swiftResourcesPath: \(swiftResourcesPath.configurationString)
-        swiftStaticResourcesPath: \(swiftStaticResourcesPath.configurationString)
-        includeSearchPaths: \(includeSearchPaths.configurationString)
-        librarySearchPaths: \(librarySearchPaths.configurationString)
-        toolsetPaths: \(toolsetPaths.configurationString)
-        """
-    }
-}
-
-extension Optional where Wrapped == AbsolutePath {
-    fileprivate var configurationString: String {
-        self?.pathString ?? "not set"
-    }
-}
-
-extension Optional where Wrapped == [AbsolutePath] {
-    fileprivate var configurationString: String {
-        self?.map(\.pathString).description ?? "not set"
-    }
-}

Sources/Workspace/Diagnostics.swift

@@ -195,7 +195,7 @@ extension Basics.Diagnostic {
     }
 }
 
-extension FileSystemError: CustomStringConvertible {
+extension FileSystemError {
     public var description: String {
         guard let path else {
             switch self.kind {
@@ -246,3 +246,9 @@ extension FileSystemError: CustomStringConvertible {
         }
     }
 }
+
+#if swift(<5.11)
+extension FileSystemError: CustomStringConvertible {}
+#else
+extension FileSystemError: @retroactive CustomStringConvertible {}
+#endif

Sources/Workspace/Workspace.swift

@@ -1456,7 +1456,11 @@ private func warnToStderr(_ message: String) {
 }
 
 // used for manifest validation
+#if swift(<5.11)
 extension RepositoryManager: ManifestSourceControlValidator {}
+#else
+extension RepositoryManager: @retroactive ManifestSourceControlValidator {}
+#endif
 
 extension ContainerUpdateStrategy {
     var repositoryUpdateStrategy: RepositoryUpdateStrategy {

Sources/swift-bootstrap/main.swift

@@ -443,7 +443,7 @@ struct SwiftBootstrapBuildTool: ParsableCommand {
 }
 
 // TODO: move to shared area
-extension AbsolutePath: ExpressibleByArgument {
+extension AbsolutePath {
     public init?(argument: String) {
         if let cwd: AbsolutePath = localFileSystem.currentWorkingDirectory {
             guard let path = try? AbsolutePath(validating: argument, relativeTo: cwd) else {
@@ -465,8 +465,16 @@ extension AbsolutePath: ExpressibleByArgument {
     }
 }
 
-extension BuildConfiguration: ExpressibleByArgument {
+extension BuildConfiguration {
     public init?(argument: String) {
         self.init(rawValue: argument)
     }
 }
+
+#if swift(<5.11)
+extension AbsolutePath: ExpressibleByArgument {}
+extension BuildConfiguration: ExpressibleByArgument {}
+#else
+extension AbsolutePath: @retroactive ExpressibleByArgument {}
+extension BuildConfiguration: @retroactive ExpressibleByArgument {}
+#endif

Tests/PackageGraphPerformanceTests/DependencyResolverPerfTests.swift

@@ -182,7 +182,7 @@ private extension VersionSetSpecifier {
     }
 }
 
-extension ProductFilter: JSONSerializable, JSONMappable {
+extension ProductFilter {
     public func toJSON() -> JSON {
         switch self {
         case .everything:
@@ -200,3 +200,9 @@ extension ProductFilter: JSONSerializable, JSONMappable {
         }
     }
 }
+
+#if swift(<5.11)
+extension ProductFilter: JSONSerializable, JSONMappable {}
+#else
+extension ProductFilter: @retroactive JSONSerializable, @retroactive JSONMappable {}
+#endif

Tests/PackageGraphTests/DependencyResolverTests.swift

@@ -42,12 +42,6 @@ private let v1_1Range: VersionSetSpecifier = .range("1.1.0" ..< "1.2.0")
 private let v1_1_0Range: VersionSetSpecifier = .range("1.1.0" ..< "1.1.1")
 private let v2_0_0Range: VersionSetSpecifier = .range("2.0.0" ..< "2.0.1")
 
-extension PackageReference: Comparable {
-    public static func < (lhs: PackageReference, rhs: PackageReference) -> Bool {
-        return lhs.identity < rhs.identity
-    }
-}
-
 class DependencyResolverTests: XCTestCase {
     func testVersionSetSpecifier() {
         // Check `contains`.