restore TSC Diagnostics Location behavior

tomerd · tomerd · commit 80d3decd0f40 · 2021-10-05T20:39:47.000-07:00
motivation: downstream clients still depend on TSC Diagnostics Location

changes:
* preserve original TSC Location in metadata and bridge it back when exposing TSC diagnostics
* adjust test
diff --git a/Sources/Basics/Observability.swift b/Sources/Basics/Observability.swift
@@ -174,7 +174,7 @@ extension DiagnosticsEmitterProtocol {
         // FIXME: this brings in the TSC API still
         if let errorProvidingLocation = error as? DiagnosticLocationProviding, let diagnosticLocation = errorProvidingLocation.diagnosticLocation {
             metadata = metadata ?? ObservabilityMetadata()
-            metadata?.legacyLocation = diagnosticLocation.description
+            metadata?.legacyDiagnosticLocation = .init(diagnosticLocation)
         }
 
         let message: String
@@ -465,7 +465,7 @@ extension Diagnostic {
             metadata = .none
         } else {
             metadata = ObservabilityMetadata()
-            metadata?.legacyLocation = diagnostic.location.description
+            metadata?.legacyDiagnosticLocation = .init(diagnostic.location)
         }
 
         switch diagnostic.behavior {
@@ -504,8 +504,8 @@ extension ObservabilitySystem {
 extension TSCDiagnostic {
     init(_ diagnostic: Diagnostic) {
         let location: DiagnosticLocation
-        if let metadata = diagnostic.metadata {
-            location = metadata.legacyDiagnosticLocation
+        if let legacyLocation = diagnostic.metadata?.legacyDiagnosticLocation {
+            location = legacyLocation.underlying
         } else {
             location = UnknownLocation.location
         }
@@ -525,7 +525,7 @@ extension TSCDiagnostic {
 
 //@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
 extension ObservabilityMetadata {
-    public var legacyLocation: String? {
+    public var legacyDiagnosticLocation: DiagnosticLocationWrapper? {
         get {
             self[LegacyLocationKey.self]
         }
@@ -535,24 +535,18 @@ extension ObservabilityMetadata {
     }
 
     enum LegacyLocationKey: Key {
-        typealias Value = String
+        typealias Value = DiagnosticLocationWrapper
     }
-}
 
-@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
-extension ObservabilityMetadata {
-    fileprivate var legacyDiagnosticLocation: DiagnosticLocation {
-        if let legacyLocation = self.legacyLocation {
-            return DiagnosticLocationWrapper(legacyLocation)
-        }
-        return UnknownLocation.location
-    }
+    public struct DiagnosticLocationWrapper: DiagnosticLocation {
+        let underlying: DiagnosticLocation
 
-    private struct DiagnosticLocationWrapper: DiagnosticLocation {
-        var description: String
+        public init (_ underlying: DiagnosticLocation) {
+            self.underlying = underlying
+        }
 
-        init (_ location: String) {
-            self.description = location
+        public var description: String {
+            self.underlying.description
         }
     }
 }
diff --git a/Sources/Commands/SwiftTool.swift b/Sources/Commands/SwiftTool.swift
@@ -1066,10 +1066,10 @@ private final class InteractiveWriter {
 // we should remove this as we make use of the new scope and metadata to provide better contextual information
 extension ObservabilityMetadata {
     fileprivate var diagnosticPrefix: String? {
-        if let legacyLocation = self.legacyLocation {
-            return legacyLocation
-        } else if let packageIdentity = self.packageIdentity, let packageLocation = self.packageLocation {
+        if let packageIdentity = self.packageIdentity, let packageLocation = self.packageLocation {
             return "'\(packageIdentity)' \(packageLocation)"
+        } else if let legacyLocation = self.legacyDiagnosticLocation {
+            return legacyLocation.description
         } else {
             return .none
         }
diff --git a/Sources/PackageGraph/PackageGraph+Loading.swift b/Sources/PackageGraph/PackageGraph+Loading.swift
@@ -97,7 +97,7 @@ extension PackageGraph {
         for node in allNodes {
             let nodeObservabilityScope = observabilityScope.makeChildScope(
                 description: "loading package \(node.identity)",
-                metadata: .packageMetadata(identity: node.identity, location: node.manifest.packageLocation)
+                metadata: .packageMetadata(identity: node.identity, location: node.manifest.packageLocation, path: node.manifest.path.parentDirectory)
             )
 
             let manifest = node.manifest
diff --git a/Sources/PackageLoading/PackageBuilder.swift b/Sources/PackageLoading/PackageBuilder.swift
@@ -283,7 +283,7 @@ public final class PackageBuilder {
         self.warnAboutImplicitExecutableTargets = warnAboutImplicitExecutableTargets
         self.observabilityScope = observabilityScope.makeChildScope(
             description: "PackageBuilder",
-            metadata: .packageMetadata(identity: self.identity, location: self.manifest.packageLocation)
+            metadata: .packageMetadata(identity: self.identity, location: self.manifest.packageLocation, path: self.packagePath)
         )
         self.fileSystem = fileSystem
     }
diff --git a/Sources/PackageLoading/TargetSourcesBuilder.swift b/Sources/PackageLoading/TargetSourcesBuilder.swift
@@ -80,7 +80,7 @@ public struct TargetSourcesBuilder {
         self.fileSystem = fileSystem
 
         self.observabilityScope = observabilityScope.makeChildScope(description: "TargetSourcesBuilder") {
-            var metadata = ObservabilityMetadata.packageMetadata(identity: packageIdentity, location: packageLocation)
+            var metadata = ObservabilityMetadata.packageMetadata(identity: packageIdentity, location: packageLocation, path: packagePath)
             metadata.targetName = target.name
             return metadata
         }
diff --git a/Sources/PackageModel/Package.swift b/Sources/PackageModel/Package.swift
@@ -8,12 +8,12 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
+import Basics
+import struct Foundation.URL
 import TSCBasic
 import TSCUtility
-
 // Re-export Version from PackageModel, since it is a key part of the model.
 @_exported import struct TSCUtility.Version
-import Basics
 
 /// The basic package representation.
 ///
@@ -115,7 +115,7 @@ extension Package {
 
 extension Package {
     public var diagnosticsMetadata: ObservabilityMetadata {
-        return .packageMetadata(identity: self.identity, location: self.manifest.packageLocation)
+        return .packageMetadata(identity: self.identity, location: self.manifest.packageLocation, path: self.path)
     }
 }
 
@@ -139,12 +139,12 @@ extension Package.Error: CustomStringConvertible {
 }
 
 extension ObservabilityMetadata {
-    public static func packageMetadata(identity: PackageIdentity, location: String) -> Self {
+    public static func packageMetadata(identity: PackageIdentity, location: String, path: AbsolutePath) -> Self {
         var metadata = ObservabilityMetadata()
         metadata.packageIdentity = identity
         metadata.packageLocation = location
         // FIXME: (diagnostics) remove once transition to Observability API is complete
-        metadata.legacyLocation = "'\(identity)' \(location)"
+        metadata.legacyDiagnosticLocation = .init(PackageLocation.Local(name: identity.description, packagePath: path))
         return metadata
     }
 }
diff --git a/Tests/PackageGraphTests/PackageGraphTests.swift b/Tests/PackageGraphTests/PackageGraphTests.swift
@@ -514,12 +514,12 @@ class PackageGraphTests: XCTestCase {
             result.check(
                 diagnostic: "Source files for target Bar should be located under /Bar/Sources/Bar",
                 severity: .warning,
-                metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar")
+                metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar", path: .init("/Bar"))
             )
             result.check(
                 diagnostic: "target 'Bar' referenced in product 'Bar' is empty",
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar")
+                metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar", path: .init("/Bar"))
             )
         }
     }
@@ -547,7 +547,7 @@ class PackageGraphTests: XCTestCase {
             result.check(
                 diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found.",
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -580,7 +580,7 @@ class PackageGraphTests: XCTestCase {
             result.check(
                 diagnostic: "product 'Foo' is declared in the same package 'foo' and can't be used as a dependency for target 'FooTests'.",
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -659,7 +659,7 @@ class PackageGraphTests: XCTestCase {
             result.check(
                 diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found in package 'Bar'.",
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -689,7 +689,7 @@ class PackageGraphTests: XCTestCase {
             result.check(
                 diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found.",
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -757,21 +757,21 @@ class PackageGraphTests: XCTestCase {
                 dependency 'BarLib' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "BarLib", package: "Bar")'
                 """,
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
             result.checkUnordered(
                 diagnostic: """
                 dependency 'Biz' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "Biz", package: "BizPath")'
                 """,
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
             result.checkUnordered(
                 diagnostic: """
                 dependency 'FizLib' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "FizLib", package: "FizPath")'
                 """,
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -1354,7 +1354,7 @@ class PackageGraphTests: XCTestCase {
                     product 'Unknown' required by package 'foo' target 'Foo' not found.
                     """,
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -1436,7 +1436,7 @@ class PackageGraphTests: XCTestCase {
                     product 'Unknown' required by package 'foo' target 'Foo' not found.
                     """,
                 severity: .error,
-                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
             )
         }
     }
@@ -1479,7 +1479,7 @@ class PackageGraphTests: XCTestCase {
                         dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'
                         """,
                     severity: .error,
-                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
                 )
             }
         }
@@ -1540,7 +1540,7 @@ class PackageGraphTests: XCTestCase {
                         dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'
                         """,
                     severity: .error,
-                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
                 )
             }
         }
@@ -1600,7 +1600,7 @@ class PackageGraphTests: XCTestCase {
                         dependency 'Bar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "Bar", package: "Some-Bar")'
                         """,
                     severity: .error,
-                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
                 )
             }
         }
@@ -1659,7 +1659,7 @@ class PackageGraphTests: XCTestCase {
                         dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Some-Bar")'
                         """,
                     severity: .error,
-                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
                 )
             }
         }
@@ -1756,7 +1756,7 @@ class PackageGraphTests: XCTestCase {
                         dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'
                         """,
                     severity: .error,
-                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")
+                    metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))
                 )
             }
         }
diff --git a/Tests/PackageLoadingTests/PackageBuilderTests.swift b/Tests/PackageLoadingTests/PackageBuilderTests.swift
diff --git a/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift b/Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift
diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ extension PackageGraph {`
`97`	`97`	`for node in allNodes {`
`98`	`98`	`let nodeObservabilityScope = observabilityScope.makeChildScope(`
`99`	`99`	`description: "loading package \(node.identity)",`
`100`		`- metadata: .packageMetadata(identity: node.identity, location: node.manifest.packageLocation)`
	`100`	`+ metadata: .packageMetadata(identity: node.identity, location: node.manifest.packageLocation, path: node.manifest.path.parentDirectory)`
`101`	`101`	`)`
`102`	`102`
`103`	`103`	`let manifest = node.manifest`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public final class PackageBuilder {`
`283`	`283`	`self.warnAboutImplicitExecutableTargets = warnAboutImplicitExecutableTargets`
`284`	`284`	`self.observabilityScope = observabilityScope.makeChildScope(`
`285`	`285`	`description: "PackageBuilder",`
`286`		`- metadata: .packageMetadata(identity: self.identity, location: self.manifest.packageLocation)`
	`286`	`+ metadata: .packageMetadata(identity: self.identity, location: self.manifest.packageLocation, path: self.packagePath)`
`287`	`287`	`)`
`288`	`288`	`self.fileSystem = fileSystem`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public struct TargetSourcesBuilder {`
`80`	`80`	`self.fileSystem = fileSystem`
`81`	`81`
`82`	`82`	`self.observabilityScope = observabilityScope.makeChildScope(description: "TargetSourcesBuilder") {`
`83`		`- var metadata = ObservabilityMetadata.packageMetadata(identity: packageIdentity, location: packageLocation)`
	`83`	`+ var metadata = ObservabilityMetadata.packageMetadata(identity: packageIdentity, location: packageLocation, path: packagePath)`
`84`	`84`	`metadata.targetName = target.name`
`85`	`85`	`return metadata`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -514,12 +514,12 @@ class PackageGraphTests: XCTestCase {`
`514`	`514`	`result.check(`
`515`	`515`	`diagnostic: "Source files for target Bar should be located under /Bar/Sources/Bar",`
`516`	`516`	`severity: .warning,`
`517`		`- metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar")`
	`517`	`+ metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar", path: .init("/Bar"))`
`518`	`518`	`)`
`519`	`519`	`result.check(`
`520`	`520`	`diagnostic: "target 'Bar' referenced in product 'Bar' is empty",`
`521`	`521`	`severity: .error,`
`522`		`- metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar")`
	`522`	`+ metadata: .packageMetadata(identity: .plain("bar"), location: "/Bar", path: .init("/Bar"))`
`523`	`523`	`)`
`524`	`524`	`}`
`525`	`525`	`}`
`@@ -547,7 +547,7 @@ class PackageGraphTests: XCTestCase {`
`547`	`547`	`result.check(`
`548`	`548`	`diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found.",`
`549`	`549`	`severity: .error,`
`550`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`550`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`551`	`551`	`)`
`552`	`552`	`}`
`553`	`553`	`}`
`@@ -580,7 +580,7 @@ class PackageGraphTests: XCTestCase {`
`580`	`580`	`result.check(`
`581`	`581`	`diagnostic: "product 'Foo' is declared in the same package 'foo' and can't be used as a dependency for target 'FooTests'.",`
`582`	`582`	`severity: .error,`
`583`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`583`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`584`	`584`	`)`
`585`	`585`	`}`
`586`	`586`	`}`
`@@ -659,7 +659,7 @@ class PackageGraphTests: XCTestCase {`
`659`	`659`	`result.check(`
`660`	`660`	`diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found in package 'Bar'.",`
`661`	`661`	`severity: .error,`
`662`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`662`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`663`	`663`	`)`
`664`	`664`	`}`
`665`	`665`	`}`
`@@ -689,7 +689,7 @@ class PackageGraphTests: XCTestCase {`
`689`	`689`	`result.check(`
`690`	`690`	`diagnostic: "product 'Barx' required by package 'foo' target 'FooTarget' not found.",`
`691`	`691`	`severity: .error,`
`692`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`692`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`693`	`693`	`)`
`694`	`694`	`}`
`695`	`695`	`}`
`@@ -757,21 +757,21 @@ class PackageGraphTests: XCTestCase {`
`757`	`757`	`dependency 'BarLib' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "BarLib", package: "Bar")'`
`758`	`758`	`""",`
`759`	`759`	`severity: .error,`
`760`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`760`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`761`	`761`	`)`
`762`	`762`	`result.checkUnordered(`
`763`	`763`	`diagnostic: """`
`764`	`764`	`dependency 'Biz' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "Biz", package: "BizPath")'`
`765`	`765`	`""",`
`766`	`766`	`severity: .error,`
`767`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`767`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`768`	`768`	`)`
`769`	`769`	`result.checkUnordered(`
`770`	`770`	`diagnostic: """`
`771`	`771`	`dependency 'FizLib' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "FizLib", package: "FizPath")'`
`772`	`772`	`""",`
`773`	`773`	`severity: .error,`
`774`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`774`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`775`	`775`	`)`
`776`	`776`	`}`
`777`	`777`	`}`
`@@ -1354,7 +1354,7 @@ class PackageGraphTests: XCTestCase {`
`1354`	`1354`	`product 'Unknown' required by package 'foo' target 'Foo' not found.`
`1355`	`1355`	`""",`
`1356`	`1356`	`severity: .error,`
`1357`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1357`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1358`	`1358`	`)`
`1359`	`1359`	`}`
`1360`	`1360`	`}`
`@@ -1436,7 +1436,7 @@ class PackageGraphTests: XCTestCase {`
`1436`	`1436`	`product 'Unknown' required by package 'foo' target 'Foo' not found.`
`1437`	`1437`	`""",`
`1438`	`1438`	`severity: .error,`
`1439`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1439`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1440`	`1440`	`)`
`1441`	`1441`	`}`
`1442`	`1442`	`}`
`@@ -1479,7 +1479,7 @@ class PackageGraphTests: XCTestCase {`
`1479`	`1479`	`dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'`
`1480`	`1480`	`""",`
`1481`	`1481`	`severity: .error,`
`1482`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1482`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1483`	`1483`	`)`
`1484`	`1484`	`}`
`1485`	`1485`	`}`
`@@ -1540,7 +1540,7 @@ class PackageGraphTests: XCTestCase {`
`1540`	`1540`	`dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'`
`1541`	`1541`	`""",`
`1542`	`1542`	`severity: .error,`
`1543`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1543`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1544`	`1544`	`)`
`1545`	`1545`	`}`
`1546`	`1546`	`}`
`@@ -1600,7 +1600,7 @@ class PackageGraphTests: XCTestCase {`
`1600`	`1600`	`dependency 'Bar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "Bar", package: "Some-Bar")'`
`1601`	`1601`	`""",`
`1602`	`1602`	`severity: .error,`
`1603`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1603`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1604`	`1604`	`)`
`1605`	`1605`	`}`
`1606`	`1606`	`}`
`@@ -1659,7 +1659,7 @@ class PackageGraphTests: XCTestCase {`
`1659`	`1659`	`dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Some-Bar")'`
`1660`	`1660`	`""",`
`1661`	`1661`	`severity: .error,`
`1662`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1662`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1663`	`1663`	`)`
`1664`	`1664`	`}`
`1665`	`1665`	`}`
`@@ -1756,7 +1756,7 @@ class PackageGraphTests: XCTestCase {`
`1756`	`1756`	`dependency 'ProductBar' in target 'Foo' requires explicit declaration; reference the package in the target dependency with '.product(name: "ProductBar", package: "Bar")'`
`1757`	`1757`	`""",`
`1758`	`1758`	`severity: .error,`
`1759`		`- metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo")`
	`1759`	`+ metadata: .packageMetadata(identity: .plain("foo"), location: "/Foo", path: .init("/Foo"))`
`1760`	`1760`	`)`
`1761`	`1761`	`}`
`1762`	`1762`	`}`