Minor fixes

Author: stevapple

.gitignore

@@ -5,4 +5,3 @@
 xcuserdata/
 .swiftpm
 .idea/
-.idea/

Sources/SwiftDriver/Toolchains/Toolchain.swift

@@ -145,12 +145,7 @@ extension Toolchain {
   /// looks in the `executableDir`, `xcrunFind` or in the `searchPaths`.
   /// - Parameter executable: executable to look for [i.e. `swift`].
   func lookup(executable: String) throws -> AbsolutePath {
-    let filename: String
-    #if os(Windows)
-      filename = "\(executable).exe"
-    #else
-      filename = executable
-    #endif
+    let filename = executable + executableFileSuffix
     if let overrideString = envVar(forExecutable: executable) {
       return try AbsolutePath(validating: overrideString)
     } else if let toolDir = toolDirectory,

Sources/swift-driver/main.swift

@@ -45,11 +45,7 @@ do {
   if case .subcommand(let subcommand) = mode {
     // We are running as a subcommand, try to find the subcommand adjacent to the executable we are running as.
     // If we didn't find the tool there, let the OS search for it.
-    #if os(Windows)
-      let filename = subcommand + ".exe"
-    #else
-      let filename = subcommand
-    #endif
+    let filename = subcommand + executableFileSuffix
     let subcommandPath = Process.findExecutable(arguments[0])?.parentDirectory.appending(component: filename)
                          ?? Process.findExecutable(filename)
 

Tests/SwiftDriverTests/ModuleDependencyGraphTests.swift

@@ -970,7 +970,6 @@ extension ModuleDependencyGraph {
     let directlyIinvalidatedNodes = getInvalidatedNodesForSimulatedLoad(
       swiftDepsIndex,
       dependencyDescriptions,
-      includeAddedExternals: true,
       interfaceHash,
       includePrivateDeps: includePrivateDeps,
       hadCompilationError: hadCompilationError)
@@ -983,7 +982,6 @@ extension ModuleDependencyGraph {
   func getInvalidatedNodesForSimulatedLoad(
     _ swiftDepsIndex: Int,
     _ dependencyDescriptions: [MockDependencyKind: [String]],
-    includeAddedExternals: Bool,
     _ interfaceHashIfPresent: String? = nil,
     includePrivateDeps: Bool = true,
     hadCompilationError: Bool = false