Remove swift-format and docc dependencies from Package.swift

Those dependencies are just for development and not needed for the
end-users. This change makes the build process simpler and faster.

Author: kateinoigakukun

Package.swift

@@ -102,8 +102,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     package.dependencies += [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
         .package(url: "https://github.com/apple/swift-system", .upToNextMinor(from: "1.2.1")),
-        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-        .package(url: "https://github.com/apple/swift-format.git", from: "510.1.0"),
     ]
 } else {
     package.dependencies += [

Sources/WAT/Parser/WastParser.swift

@@ -16,7 +16,7 @@ struct WastParser {
 
     mutating func nextDirective() throws -> WastDirective? {
         var originalParser = parser
-        guard let _ = try parser.peek(.leftParen) else { return nil }
+        guard (try parser.peek(.leftParen)) != nil else { return nil }
         try parser.consume()
         guard try WastDirective.peek(wastParser: self) else {
             if try peekModuleField() {

Sources/WasmKit/Execution/Runtime/Profiler.swift

@@ -3,7 +3,7 @@ import SystemPackage
 
 /// A simple time-profiler for guest process to emit `chrome://tracing` format
 /// This profiler works only when WasmKit is built with debug configuration (`swift build -c debug`)
-@_documentation(visibility:internal)
+@_documentation(visibility: internal)
 public class GuestTimeProfiler: RuntimeInterceptor {
     struct Event: Codable {
         enum Phase: String, Codable {

Sources/WasmKit/Execution/Runtime/Runtime.swift

@@ -11,7 +11,7 @@ public final class Runtime {
     }
 }
 
-@_documentation(visibility:internal)
+@_documentation(visibility: internal)
 public protocol RuntimeInterceptor {
     func onEnterFunction(_ address: FunctionAddress, store: Store)
     func onExitFunction(_ address: FunctionAddress, store: Store)

Sources/WasmKit/Translator.swift

@@ -245,7 +245,7 @@ struct InstructionTranslator: InstructionVisitor {
                 throw TranslationError("Truncating to \(height) but the stack height is \(self.height)")
             }
             while height != self.height {
-                guard let _ = self.values.popLast() else {
+                guard self.values.popLast() != nil else {
                     throw TranslationError("Internal consistency error: Stack height is \(self.height) but failed to pop")
                 }
             }

Tests/WasmKitTests/FuzzTranslatorRegressionTests.swift

@@ -1,5 +1,5 @@
-import XCTest
 import WasmKit
+import XCTest
 
 final class FuzzTranslatorRegressionTests: XCTestCase {
     func testRunAll() async throws {
@@ -10,7 +10,7 @@ final class FuzzTranslatorRegressionTests: XCTestCase {
         for file in try FileManager.default.contentsOfDirectory(atPath: failCasesDir.path) {
             let path = failCasesDir.appendingPathComponent(file).path
             print("Fuzz regression test: \(path)")
-            
+
             let data = try Data(contentsOf: URL(fileURLWithPath: path))
             do {
                 var module = try WasmKit.parseWasm(bytes: Array(data))

Utilities/format.py

@@ -1,43 +1,54 @@
 #!/usr/bin/env python3
 
 import subprocess
-import json
+import os
 
-
-def all_swiftpm_targets():
-    # List up all SwiftPM targets by "swift package dump-package"
-    output = subprocess.run(
-        ["swift", "package", "dump-package"], stdout=subprocess.PIPE)
-    package = json.loads(output.stdout)
-    targets = []
-    for target in package["targets"]:
-        if target["type"] == "plugin":
-            continue
-        targets.append(target["name"])
-
-    return targets
+SOURCE_ROOT = os.path.relpath(os.path.join(os.path.dirname(__file__), ".."))
 
 
 def run(arguments):
     print("Running: " + " ".join(arguments))
     subprocess.run(arguments, check=True)
 
 
+def build_swift_format():
+    # Build swift-format
+    package_path = os.path.join(SOURCE_ROOT, "Vendor", "swift-format")
+    bin_path = os.path.join(package_path, ".build", "release", "swift-format")
+    if os.path.exists(bin_path):
+        return bin_path
+
+    run(["./Vendor/checkout-dependency", "swift-format"])
+
+    run([
+      "swift", "build", "-c", "release",
+      "--package-path", package_path])
+    return bin_path
+
+
 def main():
-    targets = all_swiftpm_targets()
+    targets = []
+    for targets_dir in ["Sources", "Tests"]:
+        targets_path = os.path.join(SOURCE_ROOT, targets_dir)
+        for target in os.listdir(targets_path):
+            if not os.path.isdir(os.path.join(targets_path, target)):
+                continue
+            targets.append(os.path.join(targets_dir, target))
+
     # NOTE: SystemExtras is not included in the list of targets because it
     #       follows swift-system style conventions, which is different from
     #       swift-format.
-    targets.remove("SystemExtras")
+    targets.remove(os.path.join("Sources", "SystemExtras"))
 
-    arguments = ["swift", "package",
-                 "--allow-writing-to-package-directory", "format-source-code"]
-    for target in targets:
-        arguments.append("--target")
-        arguments.append(target)
+    swift_format = build_swift_format()
 
+    arguments = [
+        swift_format, "format", "--in-place", "--recursive", "--parallel"
+    ]
+    for target in targets:
+        arguments.append(os.path.join(SOURCE_ROOT, target))
+    arguments.append(os.path.join(SOURCE_ROOT, "Package.swift"))
     run(arguments)
-    run(["swift", "format", "--in-place", "Package.swift"])
 
 
 if __name__ == "__main__":

Vendor/dependencies.json

@@ -7,6 +7,10 @@
     "repository": "https://github.com/WebAssembly/wasi-testsuite.git",
     "revision": "c9c751586fd86b321d595bbef13f2c7403cfdbc5"
   },
+  "swift-format": {
+    "repository": "https://github.com/swiftlang/swift-format.git",
+    "revision": "b268009b0d1182f9a573311c1a69eee9a7fd3d3f"
+  },
   "coremark": {
     "repository": "https://github.com/eembc/coremark.git",
     "revision": "d5fad6bd094899101a4e5fd53af7298160ced6ab"