Replace ProcessEnv.vars with block w/o API breakage (#7390)

This fixes some `ProcessEnv.vars` warnings without more intrusive
breaking changes for SwiftPM clients, as previously attempted in
#7364.

Also fixed some formatting inconsistencies.

Sources/Basics/Concurrency/ConcurrencyHelpers.swift

@@ -20,7 +20,7 @@ import func TSCBasic.tsc_await
 
 public enum Concurrency {
  public static var maxOperations: Int {
- ProcessEnv.vars["SWIFTPM_MAX_CONCURRENT_OPERATIONS"].flatMap(Int.init) ?? ProcessInfo.processInfo
+ ProcessEnv.block["SWIFTPM_MAX_CONCURRENT_OPERATIONS"].flatMap(Int.init) ?? ProcessInfo.processInfo
  .activeProcessorCount
  }
 }

Sources/Build/BuildPlan/BuildPlan.swift

@@ -95,7 +95,7 @@ extension BuildParameters {
  get throws {
  // FIXME: We use this hack to let swiftpm's functional test use shared
  // cache so it doesn't become painfully slow.
- if let path = ProcessEnv.vars["SWIFTPM_TESTS_MODULECACHE"] {
+ if let path = ProcessEnv.block["SWIFTPM_TESTS_MODULECACHE"] {
  return try AbsolutePath(validating: path)
  }
  return buildPath.appending("ModuleCache")
@@ -158,7 +158,7 @@ extension BuildParameters {
 
  /// Returns the scoped view of build settings for a given target.
  func createScope(for target: ResolvedTarget) -> BuildSettings.Scope {
- return BuildSettings.Scope(target.underlying.buildSettings, environment: buildEnvironment)
+ BuildSettings.Scope(target.underlying.buildSettings, environment: buildEnvironment)
  }
 }
 
@@ -446,7 +446,8 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
  for item in derivedTestTargets {
  var derivedTestTargets = [item.entryPointTargetBuildDescription.target]
 
- targetMap[item.entryPointTargetBuildDescription.target.id] = .swift(item.entryPointTargetBuildDescription)
+ targetMap[item.entryPointTargetBuildDescription.target.id] = 
+ .swift(item.entryPointTargetBuildDescription)
 
  if let discoveryTargetBuildDescription = item.discoveryTargetBuildDescription {
  targetMap[discoveryTargetBuildDescription.target.id] = .swift(discoveryTargetBuildDescription)
@@ -552,9 +553,9 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
  }
 
  // Add search paths from the system library targets.
- for target in graph.reachableTargets {
+ for target in self.graph.reachableTargets {
  if let systemLib = target.underlying as? SystemLibraryTarget {
- arguments.append(contentsOf: try self.pkgConfig(for: systemLib).cFlags)
+ try arguments.append(contentsOf: self.pkgConfig(for: systemLib).cFlags)
  // Add the path to the module map.
  arguments += ["-I", systemLib.moduleMapPath.parentDirectory.pathString]
  }
@@ -589,7 +590,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
  }
 
  // Add search paths from the system library targets.
- for target in graph.reachableTargets {
+ for target in self.graph.reachableTargets {
  if let systemLib = target.underlying as? SystemLibraryTarget {
  arguments += try self.pkgConfig(for: systemLib).cFlags
  }
@@ -645,7 +646,12 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
 extension Basics.Diagnostic {
  static var swiftBackDeployError: Self {
  .warning(
- "Swift compiler no longer supports statically linking the Swift libraries. They're included in the OS by default starting with macOS Mojave 10.14.4 beta 3. For macOS Mojave 10.14.3 and earlier, there's an optional Swift library package that can be downloaded from \"More Downloads\" for Apple Developers at https://developer.apple.com/download/more/"
+ """
+ Swift compiler no longer supports statically linking the Swift libraries. They're included in the OS by \
+ default starting with macOS Mojave 10.14.4 beta 3. For macOS Mojave 10.14.3 and earlier, there's an \
+ optional Swift library package that can be downloaded from \"More Downloads\" for Apple Developers at \
+ https://developer.apple.com/download/more/
+ """
  )
  }
 
@@ -728,7 +734,7 @@ extension ResolvedProduct {
  }
 
  private var isBinaryOnly: Bool {
- return self.targets.filter({ !($0.underlying is BinaryTarget) }).isEmpty
+ self.targets.filter { !($0.underlying is BinaryTarget) }.isEmpty
  }
 
  private var isPlugin: Bool {

Sources/Commands/PackageCommands/Format.swift

@@ -37,7 +37,7 @@ extension SwiftPackageCommand {
  func run(_ swiftCommandState: SwiftCommandState) async throws {
  // Look for swift-format binary.
  // FIXME: This should be moved to user toolchain.
- let swiftFormatInEnv = lookupExecutablePath(filename: ProcessEnv.vars["SWIFT_FORMAT"])
+ let swiftFormatInEnv = lookupExecutablePath(filename: ProcessEnv.block["SWIFT_FORMAT"])
  guard let swiftFormat = swiftFormatInEnv ?? Process.findExecutable("swift-format").flatMap(AbsolutePath.init) else {
  swiftCommandState.observabilityScope.emit(error: "Could not find swift-format in PATH or SWIFT_FORMAT")
  throw TSCUtility.Diagnostics.fatalError

Sources/Commands/SwiftTestCommand.swift

@@ -933,7 +933,7 @@ final class ParallelTestRunner {
 
  // command's result output goes on stdout
  // ie "swift test" should output to stdout
- if ProcessEnv.vars["SWIFTPM_TEST_RUNNER_PROGRESS_BAR"] == "lit" {
+ if ProcessEnv.block["SWIFTPM_TEST_RUNNER_PROGRESS_BAR"] == "lit" {
  self.progressAnimation = ProgressAnimation.percent(
  stream: TSCBasic.stdoutStream,
  verbose: false,
@@ -1292,7 +1292,7 @@ extension TestCommandOptions {
 
  /// Returns the test case specifier if overridden in the env.
  private func skippedTestsOverride(fileSystem: FileSystem) -> TestCaseSpecifier? {
- guard let override = ProcessEnv.vars["_SWIFTPM_SKIP_TESTS_LIST"] else {
+ guard let override = ProcessEnv.block["_SWIFTPM_SKIP_TESTS_LIST"] else {
  return nil
  }
 

Sources/PackageLoading/ManifestLoader.swift

@@ -857,7 +857,9 @@ public final class ManifestLoader: ManifestLoaderProtocol {
 
  // FIXME: Workaround for the module cache bug that's been haunting Swift CI
  // <rdar://problem/48443680>
- let moduleCachePath = try (ProcessEnv.vars["SWIFTPM_MODULECACHE_OVERRIDE"] ?? ProcessEnv.vars["SWIFTPM_TESTS_MODULECACHE"]).flatMap{ try AbsolutePath(validating: $0) }
+ let moduleCachePath = try (
+ ProcessEnv.block["SWIFTPM_MODULECACHE_OVERRIDE"] ??
+ ProcessEnv.block["SWIFTPM_TESTS_MODULECACHE"]).flatMap { try AbsolutePath(validating: $0) }
 
  var cmd: [String] = []
  cmd += [self.toolchain.swiftCompilerPathForManifests.pathString]
@@ -955,7 +957,11 @@ public final class ManifestLoader: ManifestLoaderProtocol {
  evaluationResult.compilerCommandLine = cmd
 
  // Compile the manifest.
- TSCBasic.Process.popen(arguments: cmd, environment: self.toolchain.swiftCompilerEnvironment, queue: callbackQueue) { result in
+ TSCBasic.Process.popen(
+ arguments: cmd,
+ environment: self.toolchain.swiftCompilerEnvironment,
+ queue: callbackQueue
+ ) { result in
  dispatchPrecondition(condition: .onQueue(callbackQueue))
 
  var cleanupIfError = DelayableAction(target: tmpDir, action: cleanupTmpDir)
@@ -1054,7 +1060,11 @@ public final class ManifestLoader: ManifestLoaderProtocol {
  #endif
 
  let cleanupAfterRunning = cleanupIfError.delay()
- TSCBasic.Process.popen(arguments: cmd, environment: environment, queue: callbackQueue) { result in
+ TSCBasic.Process.popen(
+ arguments: cmd,
+ environment: environment,
+ queue: callbackQueue
+ ) { result in
  dispatchPrecondition(condition: .onQueue(callbackQueue))
 
  defer { cleanupAfterRunning.perform() }

Sources/PackageLoading/PkgConfig.swift

@@ -126,7 +126,7 @@ public struct PkgConfig {
 
  private static var envSearchPaths: [AbsolutePath] {
  get throws {
- if let configPath = ProcessEnv.vars["PKG_CONFIG_PATH"] {
+ if let configPath = ProcessEnv.block["PKG_CONFIG_PATH"] {
  #if os(Windows)
  return try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })
  #else
@@ -183,7 +183,7 @@ internal struct PkgConfigParser {
  variables["pcfiledir"] = pcFile.parentDirectory.pathString
 
  // Add pc_sysrootdir variable. This is the path of the sysroot directory for pc files.
- variables["pc_sysrootdir"] = ProcessEnv.vars["PKG_CONFIG_SYSROOT_DIR"] ?? AbsolutePath.root.pathString
+ variables["pc_sysrootdir"] = ProcessEnv.block["PKG_CONFIG_SYSROOT_DIR"] ?? AbsolutePath.root.pathString
 
  let fileContents: String = try fileSystem.readFileContents(pcFile)
  for line in fileContents.components(separatedBy: "\n") {

Sources/PackageModel/SwiftSDKs/SwiftSDK.swift

@@ -465,10 +465,10 @@ public struct SwiftSDK: Equatable {
  ) throws -> SwiftSDK {
  let originalWorkingDirectory = originalWorkingDirectory ?? localFileSystem.currentWorkingDirectory
  // Select the correct binDir.
- if ProcessEnv.vars["SWIFTPM_CUSTOM_BINDIR"] != nil {
+ if ProcessEnv.block["SWIFTPM_CUSTOM_BINDIR"] != nil {
  print("SWIFTPM_CUSTOM_BINDIR was deprecated in favor of SWIFTPM_CUSTOM_BIN_DIR")
  }
- let customBinDir = (ProcessEnv.vars["SWIFTPM_CUSTOM_BIN_DIR"] ?? ProcessEnv.vars["SWIFTPM_CUSTOM_BINDIR"])
+ let customBinDir = (ProcessEnv.block["SWIFTPM_CUSTOM_BIN_DIR"] ?? ProcessEnv.block["SWIFTPM_CUSTOM_BINDIR"])
  .flatMap { try? AbsolutePath(validating: $0) }
  let binDir = try customBinDir ?? binDir ?? SwiftSDK.hostBinDir(
  fileSystem: localFileSystem,
@@ -478,7 +478,7 @@ public struct SwiftSDK: Equatable {
  let sdkPath: AbsolutePath?
  #if os(macOS)
  // Get the SDK.
- if let value = ProcessEnv.vars["SDKROOT"] {
+ if let value = ProcessEnv.block["SDKROOT"] {
  sdkPath = try AbsolutePath(validating: value)
  } else {
  // No value in env, so search for it.

Sources/SPMBuildCore/BuildSystem/BuildSystem.swift

@@ -175,8 +175,8 @@ package enum BuildSystemUtilities {
  /// Returns the build path from the environment, if present.
  public static func getEnvBuildPath(workingDir: AbsolutePath) throws -> AbsolutePath? {
  // Don't rely on build path from env for SwiftPM's own tests.
- guard ProcessEnv.vars["SWIFTPM_TESTS_MODULECACHE"] == nil else { return nil }
- guard let env = ProcessEnv.vars["SWIFTPM_BUILD_DIR"] else { return nil }
+ guard ProcessEnv.block["SWIFTPM_TESTS_MODULECACHE"] == nil else { return nil }
+ guard let env = ProcessEnv.block["SWIFTPM_BUILD_DIR"] else { return nil }
  return try AbsolutePath(validating: env, relativeTo: workingDir)
  }
 }

Sources/SourceControl/RepositoryManager.swift

@@ -331,7 +331,7 @@ public class RepositoryManager: Cancellable {
  }
 
  // We are expecting handle.repository.url to always be a resolved absolute path.
- let shouldCacheLocalPackages = ProcessEnv.vars["SWIFTPM_TESTS_PACKAGECACHE"] == "1" || cacheLocalPackages
+ let shouldCacheLocalPackages = ProcessEnv.block["SWIFTPM_TESTS_PACKAGECACHE"] == "1" || cacheLocalPackages
 
  if let cachePath, !(handle.repository.isLocal && !shouldCacheLocalPackages) {
  let cachedRepositoryPath = try cachePath.appending(handle.repository.storagePath())

Sources/Workspace/DefaultPluginScriptRunner.swift

@@ -209,7 +209,7 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
  #endif
 
  // Honor any module cache override that's set in the environment.
- let moduleCachePath = ProcessEnv.vars["SWIFTPM_MODULECACHE_OVERRIDE"] ?? ProcessEnv.vars["SWIFTPM_TESTS_MODULECACHE"]
+ let moduleCachePath = ProcessEnv.block["SWIFTPM_MODULECACHE_OVERRIDE"] ?? ProcessEnv.block["SWIFTPM_TESTS_MODULECACHE"]
  if let moduleCachePath {
  commandLine += ["-module-cache-path", moduleCachePath]
  }

Sources/Workspace/Workspace+Configuration.swift

@@ -89,7 +89,7 @@ extension Workspace {
  public var localMirrorsConfigurationFile: AbsolutePath {
  get throws {
  // backwards compatibility
- if let customPath = ProcessEnv.vars["SWIFTPM_MIRROR_CONFIG"] {
+ if let customPath = ProcessEnv.block["SWIFTPM_MIRROR_CONFIG"] {
  return try AbsolutePath(validating: customPath)
  }
  return DefaultLocations.mirrorsConfigurationFile(at: self.localConfigurationDirectory)

Sources/XCBuildSupport/XcodeBuildSystem.swift

@@ -90,7 +90,7 @@ package final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
  self.fileSystem = fileSystem
  self.observabilityScope = observabilityScope.makeChildScope(description: "Xcode Build System")
 
- if let xcbuildTool = ProcessEnv.vars["XCBUILD_TOOL"] {
+ if let xcbuildTool = ProcessEnv.block["XCBUILD_TOOL"] {
  xcbuildPath = try AbsolutePath(validating: xcbuildTool)
  } else {
  let xcodeSelectOutput = try TSCBasic.Process.popen(args: "xcode-select", "-p").utf8Output().spm_chomp()

Tests/CommandsTests/APIDiffTests.swift

@@ -42,7 +42,7 @@ final class APIDiffTests: CommandsTestCase {
  try skipIfApiDigesterUnsupported()
  // The following is added to separate out the integration point testing of the API
  // diff digester with SwiftPM from the functionality tests of the digester itself
- guard ProcessEnv.vars["SWIFTPM_TEST_API_DIFF_OUTPUT"] == "1" else {
+ guard ProcessEnv.block["SWIFTPM_TEST_API_DIFF_OUTPUT"] == "1" else {
  throw XCTSkip("Env var SWIFTPM_TEST_API_DIFF_OUTPUT must be set to test the output")
  }
  }

Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift

@@ -339,7 +339,7 @@ class GitHubPackageMetadataProviderTests: XCTestCase {
  httpClient.configuration.requestHeaders = .init()
  httpClient.configuration.requestHeaders!.add(name: "Cache-Control", value: "no-cache")
  var configuration = GitHubPackageMetadataProvider.Configuration(disableCache: true) // Disable cache so we hit the API
- if let token = ProcessEnv.vars["GITHUB_API_TOKEN"] {
+ if let token = ProcessEnv.block["GITHUB_API_TOKEN"] {
  configuration.authTokens = { [.github("github.com"): token] }
  }
  configuration.apiLimitWarningThreshold = 50