Minor fixes

Author: stevapple

.gitignore

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

Package.resolved

@@ -72,9 +72,9 @@ let package = Package(
       dependencies: ["SwiftOptions", "ArgumentParser"]),
 
     /// The `makeOptions` utility (for importing option definitions).
-    .target(
-      name: "makeOptions",
-      dependencies: []),
+    // .target(
+    //   name: "makeOptions",
+    //   dependencies: []),
   ],
   cxxLanguageStandard: .cxx14
 )
@@ -95,13 +95,13 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
 }
 
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
-  package.dependencies += [
-    .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("main")),
-    .package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "4.0.0")),
-    // The 'swift-argument-parser' version declared here must match that
-    // used by 'swift-package-manager' and 'sourcekit-lsp'. Please coordinate
-    // dependency version changes here with those projects.
-    .package(url: "https://github.com/apple/swift-argument-parser.git", .branch("main")),
+    package.dependencies += [
+        .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("main")),
+        .package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "4.0.0")),
+        // The 'swift-argument-parser' version declared here must match that
+        // used by 'swift-package-manager' and 'sourcekit-lsp'. Please coordinate
+        // dependency version changes here with those projects.
+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.3.2")),
     ]
 } else {
     package.dependencies += [

Package.swift

@@ -229,5 +229,3 @@ extension DarwinToolchain {
   }
 
 }
-
-// TODO: Implement `addArgsToLinkStdlib` for `WindowsToolchain`.

Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

@@ -172,7 +172,7 @@ extension WindowsToolchain {
         }
       }
 
-      // Run clang++ in verbose mode if "-v" is set
+      // Run clang in verbose mode if "-v" is set
       try commandLine.appendLast(.v, from: &parsedOptions)
 
       // These custom arguments should be right before the object file at the

Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift

@@ -109,7 +109,7 @@ class AssertDiagnosticsTests: FailableTestCase {
     }
   }
 
-  func testAssertDriverDiagosotics() throws {
+  func testAssertDriverDiagnostics() throws {
     try assertNoDriverDiagnostics(args: "swiftc", "test.swift")
 
     try assertDriverDiagnostics(args: "swiftc", "test.swift") { driver, verify in

Tests/SwiftDriverTests/AssertDiagnosticsTests.swift

@@ -314,7 +314,11 @@ final class NonincrementalCompilationTests: XCTestCase {
 
 final class IncrementalCompilationTests: XCTestCase {
 
+#if os(Windows)
+  var tempDir: AbsolutePath = AbsolutePath(ProcessEnv.vars["TEMP"]!)
+#else
   var tempDir: AbsolutePath = AbsolutePath("/tmp")
+#endif
 
   let module = "theModule"
   var OFM: AbsolutePath {

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -7,7 +7,7 @@ extension AssertDiagnosticsTests {
     // to regenerate.
     static let __allTests__AssertDiagnosticsTests = [
         ("testAssertDiagnostics", testAssertDiagnostics),
-        ("testAssertDriverDiagosotics", testAssertDriverDiagosotics),
+        ("testAssertDriverDiagnostics", testAssertDriverDiagnostics),
         ("testAssertNoDiagnostics", testAssertNoDiagnostics),
     ]
 }