From 3eba1af8151c2a1e34c89f798492ad82ac1bb708 Mon Sep 17 00:00:00 2001 From: Paul LeMarquand Date: Fri, 25 Jul 2025 11:45:07 -0400 Subject: [PATCH] Use only enabled traits when loading package Both `loadPackage` and `loadRootPackage` specified all traits as enabled when loading a package. Narrow this to only the enabled traits so that the returned `Package` accurately reflects the enabled traits. --- Sources/Workspace/Workspace.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Sources/Workspace/Workspace.swift b/Sources/Workspace/Workspace.swift index 1551441771e..977a4a9af6c 100644 --- a/Sources/Workspace/Workspace.swift +++ b/Sources/Workspace/Workspace.swift @@ -1262,8 +1262,7 @@ extension Workspace { prebuilts: [:], fileSystem: self.fileSystem, observabilityScope: observabilityScope, - // For now we enable all traits - enabledTraits: Set(manifest.traits.map(\.name)) + enabledTraits: try manifest.enabledTraits(using: .default) ) return try builder.construct() } @@ -1330,8 +1329,7 @@ extension Workspace { createREPLProduct: self.configuration.createREPLProduct, fileSystem: self.fileSystem, observabilityScope: observabilityScope, - // For now we enable all traits - enabledTraits: Set(manifest.traits.map(\.name)) + enabledTraits: try manifest.enabledTraits(using: .default) ) return try builder.construct() }