Bump swift syntax and stacky macros.

* also silence retroactive conformance warnings.

Signed-off-by: furby™ <[email protected]>

Package.resolved

@@ -9,15 +9,6 @@
         "version" : "1.1.2"
       }
     },
-    {
-      "identity" : "javascriptkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/swiftwasm/JavaScriptKit",
-      "state" : {
-        "revision" : "bfaba41ab62aaa89080f9d467eb68497e77a8a10",
-        "version" : "0.20.0"
-      }
-    },
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
@@ -59,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stackotter/swift-macro-toolkit",
       "state" : {
-        "revision" : "687075e7bf976e121d083e922a07c7a9350ca85d",
-        "version" : "0.4.0"
+        "revision" : "e706aa98bc28f82677923f7b8f560bba6f90fac2",
+        "version" : "0.6.0"
       }
     },
     {
@@ -75,10 +66,10 @@
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82",
-        "version" : "510.0.3"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {

Package.swift

@@ -4,7 +4,7 @@ import CompilerPluginSupport
 import Foundation
 import PackageDescription
 
-let noWasm = ProcessInfo.processInfo.environment["NO_WASM"] == "1"
+let yesWasm = ProcessInfo.processInfo.environment["YES_WASM"] == "1"
 
 let wasmTarget: Target = .executableTarget(
     name: "GalahWeb",
@@ -34,16 +34,15 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
         .package(
-            url: "https://github.com/apple/swift-syntax.git",
-            from: "510.0.3"
+            url: "https://github.com/swiftlang/swift-syntax.git",
+            from: "600.0.1"
         ),
         .package(
             url: "https://github.com/stackotter/swift-macro-toolkit",
-            from: "0.4.0"
+            from: "0.6.0"
         ),
-        .package(url: "https://github.com/swiftwasm/carton", from: "1.1.2"),
-        .package(url: "https://github.com/swiftwasm/JavaScriptKit", exact: "0.20.0"),
-    ],
+        .package(url: "https://github.com/swiftwasm/carton", from: "1.1.2")
+    ] + (yesWasm ? [.package(url: "https://github.com/swiftwasm/JavaScriptKit", exact: "0.20.0")] : []),
     targets: [
         .executableTarget(
             name: "galah",
@@ -74,5 +73,5 @@ let package = Package(
             name: "GalahInterpreterTests",
             dependencies: ["GalahInterpreter"]
         ),
-    ] + (noWasm ? [] : [wasmTarget])
+    ] + (yesWasm ? [wasmTarget] : [])
 )

Sources/GalahInterpreter/Diagnostic.swift

@@ -144,7 +144,7 @@ extension [WithDiagnostics<CheckedAST.Fn>] {
     }
 }
 
-extension [Diagnostic]: Error {}
+extension [Diagnostic]: Swift.Error {}
 
 protocol Foldable<Element>: Error {
     associatedtype Element

Sources/galah/Cli.swift

@@ -4,7 +4,7 @@ import GalahInterpreter
 
 var standardError = FileHandle.standardError
 
-extension FileHandle: TextOutputStream {
+extension FileHandle: Swift.TextOutputStream {
     public func write(_ string: String) {
         let data = Data(string.utf8)
         self.write(data)