Merge pull request #347 from tayloraswift/swift-6-stdlib

Author: tayloraswift

.github/workflows/docs.yml

@@ -39,18 +39,12 @@ jobs:
                     --package-name swift-unidoc
 
     macos:
-        runs-on: macos-14
+        runs-on: macos-15
         name: macOS
         env:
             UNIDOC_ENABLE_INDEXSTORE: "0"
 
         steps:
-            -   name: Install Swift 6.0
-                uses: tayloraswift/swift-install-action@master
-                with:
-                    swift-prefix: "swift-6.0-release/xcode/swift-6.0-RELEASE"
-                    swift-id: "swift-6.0-RELEASE"
-
             -   name: Install Unidoc
                 uses: tayloraswift/swift-unidoc-action@master
 

.github/workflows/package.yml

@@ -9,15 +9,9 @@ on:
 
 jobs:
     macos:
-        runs-on: macos-14
+        runs-on: macos-15
         name: macOS
         steps:
-            -   name: Install Swift 6.0
-                uses: tayloraswift/swift-install-action@master
-                with:
-                    swift-prefix: "swift-6.0-release/xcode/swift-6.0-RELEASE"
-                    swift-id: "swift-6.0-RELEASE"
-
             -   name: Checkout repository
                 uses: actions/checkout@v3
 

.github/workflows/test.yml

@@ -37,18 +37,12 @@ jobs:
                         /bin/bash .github/pipeline
 
     macos:
-        runs-on: macos-14
+        runs-on: macos-15
         name: macOS
         env:
             UNIDOC_ENABLE_INDEXSTORE: "1"
 
         steps:
-            -   name: Install Swift 6.0
-                uses: tayloraswift/swift-install-action@master
-                with:
-                    swift-prefix: "swift-6.0-release/xcode/swift-6.0-RELEASE"
-                    swift-id: "swift-6.0-RELEASE"
-
             -   name: Checkout repository
                 uses: actions/checkout@v3
 

.gitignore

@@ -5,6 +5,7 @@
 .testing
 .unidoc
 .vscode
+.DS_Store
 
 unidoc/
 swiftpm/

Sources/Availability/Domains/Availability.PlatformDomain.swift

@@ -5,6 +5,7 @@ extension Availability
     @frozen public
     enum PlatformDomain:String, CaseIterable, Equatable, Hashable, Sendable
     {
+        case bridgeOS
         case iOS
         case macOS
         case macCatalyst
@@ -37,6 +38,7 @@ extension Availability.PlatformDomain:CustomStringConvertible
     {
         switch self
         {
+        case .bridgeOS:                         "bridgeOS"
         case .iOS:                              "iOS"
         case .macOS:                            "macOS"
         case .macCatalyst:                      "Mac Catalyst"

Sources/SourceDiagnostics/Emission/DiagnosticLevel.swift

@@ -4,6 +4,7 @@ enum DiagnosticLevel:Equatable, Hashable, Comparable
     case note
     case warning
     case error
+    case fatal
 }
 extension DiagnosticLevel:CustomStringConvertible
 {
@@ -15,6 +16,7 @@ extension DiagnosticLevel:CustomStringConvertible
         case .note:     "note"
         case .warning:  "warning"
         case .error:    "error"
+        case .fatal:    "fatal"
         }
     }
 }
@@ -27,6 +29,7 @@ extension DiagnosticLevel
         case .note:     .rgb(150, 150, 150)
         case .warning:  .magenta
         case .error:    .red
+        case .fatal:    .red
         }
     }
 }

Sources/SymbolGraphBuilder/Builds/SSGC.PackageBuild.swift

@@ -326,8 +326,7 @@ extension SSGC.PackageBuild
             throw SSGC.PackageBuildError.swift_build(code, invocation)
         }
 
-        let platform:SymbolGraphMetadata.Platform = try toolchain.platform()
-        var packages:SSGC.PackageGraph = .init(platform: platform)
+        var packages:SSGC.PackageGraph = .init(platform: try toolchain.platform())
 
         for pin:SPM.DependencyPin in pins
         {
@@ -341,13 +340,17 @@ extension SSGC.PackageBuild
             packages.attach(manifest, as: pin.identity)
         }
 
+        let standardLibrary:SSGC.StandardLibrary = .init(platform: packages.platform,
+            version: toolchain.splash.swift.version.minor)
+
         let modules:SSGC.ModuleGraph = try packages.join(dependencies: pins,
+            standardLibrary: standardLibrary,
             with: &manifest,
             as: self.id.package)
 
         //  Dump the standard library’s symbols, unless they’re already cached.
         let artifactsCached:FilePath.Directory = try toolchain.dump(
-            standardLibrary: .init(platform: platform),
+            standardLibrary: standardLibrary,
             cache: cache)
         for (module, include):(Symbol.Module, [FilePath.Directory]) in try self.modulesToDump(
             among: modules)

Sources/SymbolGraphBuilder/SSGC.Logger.swift

@@ -50,7 +50,10 @@ extension SSGC.Logger:DiagnosticLogger
             }
 
         case .ignoreErrors:
-            break
+            if  messages.status >= .fatal
+            {
+                self.failed = true
+            }
 
         case .demoteErrors:
             messages.demoteErrors(to: .warning)

Sources/SymbolGraphBuilder/SSGC.PackageGraph.swift

@@ -110,6 +110,7 @@ extension SSGC.PackageGraph
 
     consuming
     func join(dependencies pins:[SPM.DependencyPin],
+        standardLibrary:SSGC.StandardLibrary,
         with sinkManifest:inout SPM.Manifest,
         as id:Symbol.Package) throws -> SSGC.ModuleGraph
     {
@@ -144,8 +145,6 @@ extension SSGC.PackageGraph
             print("\(i + 1). \(package)")
         }
 
-        let standardLibrary:SSGC.StandardLibrary = .init(platform: self.platform)
-
         return try .init(
             standardLibrary: standardLibrary.modules.map(SSGC.ModuleLayout.init(toolchain:)),
             sparseEdges: self.sparseEdges,

Sources/SymbolGraphBuilder/Sources/SSGC.DocumentationSources.swift

@@ -115,6 +115,7 @@ extension SSGC.DocumentationSources
                 {
                     $0 + $1.declarations.reduce(0) { $0 + $1.decls.count }
                 })
+                re-exports      : \(moduleIndexes.reduce(0) { $0 + $1.reexports.count })
                 extensions      : \(moduleIndexes.reduce(0) { $0 + $1.extensions.count })
                 """)
         }
@@ -169,7 +170,11 @@ extension SSGC.DocumentationSources
                 Linked documentation!
                     time loading sources    : \(profiler.loadingSources)
                     time linking            : \(profiler.linking)
-                symbols         : \(graph.decls.symbols.count)
+                symbols             : \(graph.decls.symbols.count)
+                redirects           : \
+                \(graph.cultures.reduce(0) { $0 + $1.reexports.unhashed.count })
+                redirects (hashed)  : \
+                \(graph.cultures.reduce(0) { $0 + $1.reexports.hashed.count })
                 """)
 
             return graph