Merge pull request #415 from tayloraswift/6.1

tayloraswift · web-flow · commit d9a827b143c2 · 2025-06-01T16:54:03.000-05:00
upgrade 6.0 → 6.1
diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -19,8 +19,8 @@ jobs:
             -   name: Install Swift
                 uses: tayloraswift/swift-install-action@master
                 with:
-                    swift-prefix: "swift-6.0.3-release/ubuntu2404/swift-6.0.3-RELEASE"
-                    swift-id: "swift-6.0.3-RELEASE-ubuntu24.04"
+                    swift-prefix: "swift-6.1-release/ubuntu2404/swift-6.1-RELEASE"
+                    swift-id: "swift-6.1-RELEASE-ubuntu24.04"
 
             #   This installs an older version of Unidoc, not the one we are testing.
             #   We use `--static-swift-stdlib` so it doesn’t matter if the Unidoc binary was
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
                         -v $PWD:/swift/swift-unidoc \
                         -w /swift/swift-unidoc \
                         -e SWIFT_INSTALLATION=/usr \
-                        swift:6.0.3-noble \
+                        swift:6.1-noble \
                         /bin/bash Scripts/Linux/TestAll
 
     linux:
@@ -47,8 +47,8 @@ jobs:
             -   name: Install Swift
                 uses: tayloraswift/swift-install-action@master
                 with:
-                    swift-prefix: "swift-6.0.3-release/ubuntu2404/swift-6.0.3-RELEASE"
-                    swift-id: "swift-6.0.3-RELEASE-ubuntu24.04"
+                    swift-prefix: "swift-6.1-release/ubuntu2404/swift-6.1-RELEASE"
+                    swift-id: "swift-6.1-RELEASE-ubuntu24.04"
 
             -   name: Checkout repository
                 uses: actions/checkout@v3
diff --git a/.mailmap b/.mailmap
@@ -1,2 +1,2 @@
-Dianna <kelvin13ma@gmail.com>
-Dianna <mdianna1989@gmail.com>
+Diana <kelvin13ma@gmail.com>
+Diana <mdianna1989@gmail.com>
diff --git a/Scripts/Linux/GeneratePackageSymbolGraphs b/Scripts/Linux/GeneratePackageSymbolGraphs
@@ -23,11 +23,11 @@ ssgc slave https://github.com/swiftlang/swift-syntax.git 600.0.1 \
     -u $SWIFT_INSTALLATION \
     -o TestPackages/swift-syntax.bson
 
-ssgc slave https://github.com/pointfreeco/swift-snapshot-testing.git 1.17.5 \
+ssgc slave https://github.com/pointfreeco/swift-snapshot-testing.git 1.18.3 \
     -u $SWIFT_INSTALLATION \
     -o TestPackages/swift-snapshot-testing.bson
 
-ssgc slave https://github.com/swiftlang/indexstore-db.git swift-6.0-RELEASE \
+ssgc slave https://github.com/swiftlang/indexstore-db.git swift-6.1-RELEASE \
     -u $SWIFT_INSTALLATION \
     -o TestPackages/indexstore-db.bson \
     --Xcxx -I$SWIFT_INSTALLATION/lib/swift \
diff --git a/Scripts/Linux/x86_64/aarch64-jammy.dockerfile b/Scripts/Linux/x86_64/aarch64-jammy.dockerfile
@@ -1,4 +1,4 @@
-FROM tayloraswift/swift-cross-aarch64:6.0.3-jammy
+FROM tayloraswift/swift-cross-aarch64:6.1-jammy
 
 # Only bash supports multiline strings
 SHELL ["/bin/bash", "-c"]
diff --git a/Scripts/Linux/x86_64/aarch64-noble.dockerfile b/Scripts/Linux/x86_64/aarch64-noble.dockerfile
@@ -1,4 +1,4 @@
-FROM tayloraswift/swift-cross-aarch64:6.0.3-noble
+FROM tayloraswift/swift-cross-aarch64:6.1-noble
 
 # Only bash supports multiline strings
 SHELL ["/bin/bash", "-c"]
diff --git a/Scripts/Linux/x86_64/x86_64-jammy.dockerfile b/Scripts/Linux/x86_64/x86_64-jammy.dockerfile
@@ -1,4 +1,4 @@
-FROM tayloraswift/swift-cross-aarch64:6.0.3-jammy
+FROM tayloraswift/swift-cross-aarch64:6.1-jammy
 
 RUN apt update
 RUN apt -y install libjemalloc-dev:amd64 libjemalloc2:amd64
diff --git a/Scripts/Linux/x86_64/x86_64-noble.dockerfile b/Scripts/Linux/x86_64/x86_64-noble.dockerfile
@@ -1,4 +1,4 @@
-FROM tayloraswift/swift-cross-aarch64:6.0.3-noble
+FROM tayloraswift/swift-cross-aarch64:6.1-noble
 
 RUN apt update
 RUN apt -y install libjemalloc-dev:amd64 libjemalloc2:amd64
diff --git a/Sources/SymbolGraphCompiler/SSGC.SymbolDump.swift b/Sources/SymbolGraphCompiler/SSGC.SymbolDump.swift
@@ -94,7 +94,6 @@ extension SSGC.SymbolDump
 
         for j:Int in self.vertices.indices
         {
-            try
             {
                 //  Deport foreign doccomments.
                 if  let doccomment:SymbolGraphPart.Vertex.Doccomment = $0.doccomment,
@@ -103,16 +102,18 @@ extension SSGC.SymbolDump
                     $0.doccomment = nil
                 }
                 //  Trim file path prefixes.
+                //  As of 6.1, symbolgraph-extract sometimes emits paths from inside the swift
+                //  installation directory.
                 guard
-                let base:Symbol.FileBase = copy base
+                let base:Symbol.FileBase = copy base,
+                let rebased:Symbol.File = try? $0.location?.file.rebased(against: base)
                 else
                 {
                     $0.location = nil
                     return
                 }
 
-                try $0.location?.file.rebase(against: base)
-
+                $0.location?.file = rebased
             } (&self.vertices[j])
         }
     }
diff --git a/Sources/SymbolGraphPartTests/DocumentationInheritance.swift b/Sources/SymbolGraphPartTests/DocumentationInheritance.swift
@@ -132,36 +132,42 @@ struct DocumentationInheritance
                 .intrinsicWitness(.init(
                     _ : "s24DocumentationInheritance15OtherRefinementPAAE8protocolytvp",
                     of: "s24DocumentationInheritance8ProtocolP8protocolytvp",
-                    origin: .init("s24DocumentationInheritance8ProtocolP8protocolytvp"))),
+                    origin: "s24DocumentationInheritance8ProtocolP8protocolytvp")),
+
+                .requirement(.init(
+                    _ : "s24DocumentationInheritance10RefinementP8protocolytvp",
+                    of: "s24DocumentationInheritance10RefinementP",
+                    origin: "s24DocumentationInheritance8ProtocolP8protocolytvp")),
+
+                .override(.init(
+                    _ : "s24DocumentationInheritance10RefinementP8protocolytvp",
+                    of: "s24DocumentationInheritance8ProtocolP8protocolytvp",
+                    origin: "s24DocumentationInheritance8ProtocolP8protocolytvp")),
 
                 .member(.init(
                     _ : "s24DocumentationInheritance9ConformerV7nowhereytvp",
                     in: .scalar("s24DocumentationInheritance9ConformerV"),
-                    origin: .init("s24DocumentationInheritance10RefinementP7nowhereytvp"))),
+                    origin: "s24DocumentationInheritance10RefinementP7nowhereytvp")),
 
                 .member(.init(
                     _ : "s24DocumentationInheritance9ConformerV10refinementytvp",
                     in: .scalar(.init("s:24DocumentationInheritance9ConformerV")!),
-                    origin: .init(.init(
-                        "s:24DocumentationInheritance10RefinementP10refinementytvp")!))),
+                    origin: "s24DocumentationInheritance10RefinementP10refinementytvp")),
 
                 .member(.init(
                     _ : "s24DocumentationInheritance9ConformerV9conformerytvp",
                     in: .scalar("s24DocumentationInheritance9ConformerV"),
-                    origin: .init(
-                        "s24DocumentationInheritance10RefinementP9conformerytvp"))),
+                    origin: "s24DocumentationInheritance10RefinementP9conformerytvp")),
 
                 .member(.init(
                     _ : "s24DocumentationInheritance9ConformerV10everywhereytvp",
                     in: .scalar("s24DocumentationInheritance9ConformerV"),
-                    origin: .init(
-                        "s24DocumentationInheritance10RefinementP10everywhereytvp"))),
+                    origin: "s24DocumentationInheritance10RefinementP10everywhereytvp")),
 
                 .member(.init(
                     _ : "s24DocumentationInheritance9ConformerV8protocolytvp",
                     in: .scalar("s24DocumentationInheritance9ConformerV"),
-                    origin: .init(
-                        "s24DocumentationInheritance8ProtocolP8protocolytvp"))),
+                    origin: "s24DocumentationInheritance8ProtocolP8protocolytvp")),
             ])
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.AnyRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.AnyRelationship.swift
@@ -16,21 +16,39 @@ extension Symbol
         case requirement            (RequirementRelationship)
     }
 }
+extension Symbol.AnyRelationship:CustomStringConvertible
+{
+    public
+    var description:String
+    {
+        switch self
+        {
+        case .conformance       (let self): self.description
+        case .intrinsicWitness  (let self): self.description
+        case .extension         (let self): self.description
+        case .inheritance       (let self): self.description
+        case .feature           (let self): self.description
+        case .member            (let self): self.description
+        case .override          (let self): self.description
+        case .requirement       (let self): self.description
+        }
+    }
+}
 extension Symbol.AnyRelationship
 {
     @inlinable public
     var existential:any SymbolRelationship
     {
         switch self
         {
-        case .conformance           (let relationship): relationship
-        case .intrinsicWitness      (let relationship): relationship
-        case .extension             (let relationship): relationship
-        case .inheritance           (let relationship): relationship
-        case .feature               (let relationship): relationship
-        case .member                (let relationship): relationship
-        case .override              (let relationship): relationship
-        case .requirement           (let relationship): relationship
+        case .conformance       (let self): self
+        case .intrinsicWitness  (let self): self
+        case .extension         (let self): self
+        case .inheritance       (let self): self
+        case .feature           (let self): self
+        case .member            (let self): self
+        case .override          (let self): self
+        case .requirement       (let self): self
         }
     }
 
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.ConformanceRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.ConformanceRelationship.swift
@@ -34,7 +34,8 @@ extension Symbol.ConformanceRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (conformance: \(self.source), to: \(self.target))
+        /\(self.source) CONFORMS TO \(self.target) \
+        (\(self.conditions.count) condition(s), \(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.ExtensionRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.ExtensionRelationship.swift
@@ -29,7 +29,7 @@ extension Symbol.ExtensionRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (extension: \(self.source), of: \(self.target))
+        /\(self.source) EXTENDS \(self.target)/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.FeatureRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.FeatureRelationship.swift
@@ -29,7 +29,7 @@ extension Symbol.FeatureRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (feature: \(self.source), of: \(self.target))
+        /\(self.source) INHERITED BY \(self.target) (\(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.InheritanceRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.InheritanceRelationship.swift
@@ -55,7 +55,7 @@ extension Symbol.InheritanceRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (inheritance by: \(self.source), of: \(self.target))
+        /\(self.source) INHERITS FROM \(self.target) (\(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.IntrinsicWitnessRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.IntrinsicWitnessRelationship.swift
@@ -57,7 +57,7 @@ extension Symbol.IntrinsicWitnessRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (default implementation: \(self.source), of: \(self.target))
+        /\(self.source) IMPLEMENTS \(self.target) (\(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.MemberRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.MemberRelationship.swift
@@ -57,7 +57,7 @@ extension Symbol.MemberRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (member: \(self.source), of: \(self.target))
+        /\(self.source) MEMBER OF \(self.target) (\(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.OverrideRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.OverrideRelationship.swift
@@ -58,7 +58,7 @@ extension Symbol.OverrideRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (override: \(self.source), of: \(self.target))
+        /\(self.source) OVERRIDES \(self.target) (\(self.origin == nil ? 0 : 1) origin(s))/
         """
     }
 }
diff --git a/Sources/SymbolGraphParts/Relationships/Symbol.RequirementRelationship.swift b/Sources/SymbolGraphParts/Relationships/Symbol.RequirementRelationship.swift
@@ -14,6 +14,7 @@ extension Symbol
         public
         let optional:Bool
 
+        @inlinable public
         init(_ source:Symbol.Decl,
             of target:Symbol.Decl,
             origin:Symbol.Decl? = nil,
@@ -65,7 +66,8 @@ extension Symbol.RequirementRelationship:CustomStringConvertible
     var description:String
     {
         """
-        (\(self.optional ? "optional " : "")requirement: \(self.source), of: \(self.target))
+        /\(self.source) REQUIRED BY \(self.target) \
+        (\(self.origin == nil ? 0 : 1) origin(s), optional: \(self.optional))/
         """
     }
 }
diff --git a/Sources/SymbolGraphValidationTests/Main.swift b/Sources/SymbolGraphValidationTests/Main.swift
@@ -123,7 +123,7 @@ struct Precompiled
             $0.insert($1.package.name)
         }
 
-        #expect(dependencies == ["swift-syntax"])
+        #expect(dependencies == ["swift-syntax", "swift-custom-dump", "xctest-dynamic-overlay"])
 
         #expect(object.graph.cultures.count > 0)
         #expect(object.graph.decls.nodes.count > 0)
diff --git a/Sources/UnidocDBTests/PackageAliasing.swift b/Sources/UnidocDBTests/PackageAliasing.swift
@@ -43,8 +43,8 @@ struct PackageAliasing:Unidoc.TestBattery
         try await unidoc.alias(existing: "cc", package: "ccc")
         try await unidoc.alias(existing: "cc", package: "ccc")
 
-        for (queried, expected):
-            (Symbol.Package, (symbol:Symbol.Package, id:Unidoc.Package)) in [
+        for (queried, (symbol, id)):
+            (Symbol.Package, (Symbol.Package, Unidoc.Package)) in [
             ("a", ("a", 0)),
             ("b", ("b", 1)),
             ("c", ("c", 2)),
@@ -57,8 +57,8 @@ struct PackageAliasing:Unidoc.TestBattery
             let (package, new):(Unidoc.PackageMetadata, Bool) = try await unidoc.index(
                 package: queried)
 
-            #expect(package.symbol == expected.symbol)
-            #expect(package.id == expected.id)
+            #expect(package.symbol == symbol)
+            #expect(package.id == id)
             #expect(!new)
         }
     }
diff --git a/Sources/UnidocUI/Unidoc.RenderFormat (ext).swift b/Sources/UnidocUI/Unidoc.RenderFormat (ext).swift
@@ -17,6 +17,6 @@ extension Unidoc.RenderFormat
 
     var availableVersions:[String]
     {
-        ["6.0.3"]
+        ["6.1"]
     }
 }
diff --git a/Sources/unidocd/Main.swift b/Sources/unidocd/Main.swift
@@ -42,7 +42,7 @@ struct Main
         name: [.customLong("swift-toolchain"), .customShort("u")],
         help: "The path to a Swift toolchain directory, usually ending in 'usr'",
         completion: .directory)
-    var toolchain:FilePath.Directory = "/home/ubuntu/6.0.3/aarch64/usr"
+    var toolchain:FilePath.Directory = "/home/ubuntu/6.1/aarch64/usr"
 
     @Option(
         name: [.customLong("swift-sdk"), .customShort("k")],

-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -Dianna <[email protected]>
 -Dianna <[email protected]>
 +Diana <[email protected]>
 +Diana <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM tayloraswift/swift-cross-aarch64:6.0.3-jammy`
	`1`	`+FROM tayloraswift/swift-cross-aarch64:6.1-jammy`
`2`	`2`
`3`	`3`	`# Only bash supports multiline strings`
`4`	`4`	`SHELL ["/bin/bash", "-c"]`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ extension SSGC.SymbolDump`
`94`	`94`
`95`	`95`	`for j:Int in self.vertices.indices`
`96`	`96`	`{`
`97`		`- try`
`98`	`97`	`{`
`99`	`98`	`// Deport foreign doccomments.`
`100`	`99`	`if let doccomment:SymbolGraphPart.Vertex.Doccomment = $0.doccomment,`
`@@ -103,16 +102,18 @@ extension SSGC.SymbolDump`
`103`	`102`	`$0.doccomment = nil`
`104`	`103`	`}`
`105`	`104`	`// Trim file path prefixes.`
	`105`	`+ // As of 6.1, symbolgraph-extract sometimes emits paths from inside the swift`
	`106`	`+ // installation directory.`
`106`	`107`	`guard`
`107`		`- let base:Symbol.FileBase = copy base`
	`108`	`+ let base:Symbol.FileBase = copy base,`
	`109`	`+ let rebased:Symbol.File = try? $0.location?.file.rebased(against: base)`
`108`	`110`	`else`
`109`	`111`	`{`
`110`	`112`	`$0.location = nil`
`111`	`113`	`return`
`112`	`114`	`}`
`113`	`115`
`114`		`- try $0.location?.file.rebase(against: base)`
`115`		`-`
	`116`	`+ $0.location?.file = rebased`
`116`	`117`	`} (&self.vertices[j])`
`117`	`118`	`}`
`118`	`119`	`}`