remove toolchain from FileBuildSettings

Author: Richard Howell

Sources/SKCore/CompilationDatabaseBuildSystem.swift

@@ -43,7 +43,6 @@ extension CompilationDatabaseBuildSystem: BuildSystem {
     guard let db = database(for: url),
           let cmd = db[url].first else { return nil }
     return FileBuildSettings(
-      preferredToolchain: nil, // FIXME: infer from path
       compilerArguments: Array(cmd.commandLine.dropFirst()),
       workingDirectory: cmd.directory
     )

Sources/SKCore/FallbackBuildSystem.swift

@@ -59,7 +59,7 @@ public final class FallbackBuildSystem: BuildSystem {
       ]
     }
     args.append(path.pathString)
-    return FileBuildSettings(preferredToolchain: nil, compilerArguments: args)
+    return FileBuildSettings(compilerArguments: args)
   }
 
   func settingsClang(_ path: AbsolutePath, _ language: Language) -> FileBuildSettings {
@@ -71,6 +71,6 @@ public final class FallbackBuildSystem: BuildSystem {
       ]
     }
     args.append(path.pathString)
-    return FileBuildSettings(preferredToolchain: nil, compilerArguments: args)
+    return FileBuildSettings(compilerArguments: args)
   }
 }

Sources/SKCore/FileBuildSettings.swift

@@ -12,26 +12,20 @@
 
 /// Build settings for a single file.
 ///
-/// Encapsulates all the settings needed to compile a single file, including the compiler arguments,
-/// working directory, and preferred toolchain if any. FileBuildSettings are typically the result
-/// of a BuildSystem query.
+/// Encapsulates all the settings needed to compile a single file, including the compiler arguments
+/// and working directory. FileBuildSettings are typically the result of a BuildSystem query.
 public struct FileBuildSettings {
 
-  /// The Toolchain that is preferred for compiling this file, if any.
-  public var preferredToolchain: Toolchain? = nil
-
   /// The compiler arguments to use for this file.
   public var compilerArguments: [String]
 
   /// The working directory to resolve any relative paths in `compilerArguments`.
   public var workingDirectory: String? = nil
 
   public init(
-    preferredToolchain: Toolchain? = nil,
     compilerArguments: [String],
     workingDirectory: String? = nil)
   {
-    self.preferredToolchain = preferredToolchain
     self.compilerArguments = compilerArguments
     self.workingDirectory = workingDirectory
   }

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -257,10 +257,7 @@ extension SwiftPMWorkspace {
     func impl(_ path: AbsolutePath) -> FileBuildSettings? {
       for package in packageGraph.packages where path == package.manifest.path {
         let compilerArgs = workspace.interpreterFlags(for: package.path) + [path.pathString]
-        return FileBuildSettings(
-          preferredToolchain: nil,
-          compilerArguments: compilerArgs
-        )
+        return FileBuildSettings(compilerArguments: compilerArgs)
       }
       return nil
     }
@@ -319,7 +316,6 @@ extension SwiftPMWorkspace {
     args += td.compileArguments()
 
     return FileBuildSettings(
-      preferredToolchain: nil,
       compilerArguments: args,
       workingDirectory: workspacePath.pathString)
   }
@@ -382,7 +378,6 @@ extension SwiftPMWorkspace {
     }
 
     return FileBuildSettings(
-      preferredToolchain: nil,
       compilerArguments: args,
       workingDirectory: workspacePath.pathString)
   }