Move environment into Basics

Author: rauhul

Package.swift

@@ -184,14 +184,9 @@ let package = Package(
 
         .systemLibrary(name: "SPMSQLite3", pkgConfig: systemSQLitePkgConfig),
 
-        .target(
-            name: "Environment",
-            exclude: ["CMakeLists.txt"]),
-
         .target(
             name: "Basics",
             dependencies: [
-                "Environment",
                 "SPMSQLite3",
                 .product(name: "DequeModule", package: "swift-collections"),
                 .product(name: "OrderedCollections", package: "swift-collections"),
@@ -627,10 +622,6 @@ let package = Package(
             ]
         ),
 
-        .testTarget(
-            name: "EnvironmentTests",
-            dependencies: ["Environment"]),
-
         .testTarget(
             name: "BasicsTests",
             dependencies: ["Basics", "SPMTestSupport", "tsan_utils"],

Sources/Basics/CMakeLists.txt

@@ -25,7 +25,9 @@ add_library(Basics
   Concurrency/ThreadSafeKeyValueStore.swift
   Concurrency/TokenBucket.swift
   DispatchTimeInterval+Extensions.swift
-  EnvironmentVariables.swift
+  Environment/Environment.swift
+  Environment/EnvironmentKey.swift
+  Environment/EnvironmentShims.swift
   Errors.swift
   FileSystem/AbsolutePath.swift
   FileSystem/FileSystem+Extensions.swift
@@ -73,7 +75,6 @@ add_library(Basics
   Vendor/Triple.swift
   Vendor/Triple+Platforms.swift)
 target_link_libraries(Basics PUBLIC
-  Environment
   SwiftCollections::DequeModule
   SwiftCollections::OrderedCollections
   SwiftSystem::SystemPackage

Sources/Environment/Environment.swift renamed to Sources/Basics/Environment/Environment.swift

@@ -10,22 +10,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-internal import Foundation
-internal import Synchronization
-
-#if canImport(Glibc)
-import Glibc
-#elseif canImport(Musl)
-import Musl
-#elseif os(Windows)
-import CRT
-import WinSDK
+import Foundation
+
+#if USE_IMPL_ONLY_IMPORTS
+@_implementationOnly import TSCclibc
 #else
-import Darwin.C
+import TSCclibc
 #endif
 
 // FIXME: Use Synchronization.Mutex when available
-struct Mutex<T>: @unchecked Sendable {
+class Mutex<T>: @unchecked Sendable {
     var lock: NSLock
     var value: T
 
@@ -34,7 +28,7 @@ struct Mutex<T>: @unchecked Sendable {
         self.value = value
     }
 
-    mutating func withLock<U>(_ body: (inout T) -> U) -> U {
+    func withLock<U>(_ body: (inout T) -> U) -> U {
         self.lock.lock()
         defer { self.lock.unlock() }
         return body(&self.value)
@@ -111,7 +105,7 @@ extension Environment {
 
 // MARK: - Global Environment
 extension Environment {
-    static var _cachedCurrent = Mutex<Self?>(value: nil)
+    static let _cachedCurrent = Mutex<Self?>(value: nil)
 
     /// Vends a copy of the current process's environment variables.
     ///

Sources/Environment/EnvironmentKey.swift renamed to Sources/Basics/Environment/EnvironmentKey.swift

@@ -10,15 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-internal import Foundation
-
 /// A key used to access values in an ``Environment``.
 ///
 /// This type respects the compiled platform's case sensitivity requirements.
 public struct EnvironmentKey {
     public var rawValue: String
 
-    public init(_ rawValue: String) {
+    package init(_ rawValue: String) {
         self.rawValue = rawValue
     }
 }

Sources/Basics/EnvironmentVariables.swift renamed to Sources/Basics/Environment/EnvironmentShims.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_exported import Environment
 import struct TSCBasic.ProcessEnvironmentBlock
 
 import class TSCBasic.Process

Sources/Build/LLBuildCommands.swift

@@ -17,7 +17,6 @@ import SPMBuildCore
 import SPMLLBuild
 
 import class TSCBasic.LocalFileOutputByteStream
-import enum TSCBasic.ProcessEnv
 
 import class TSCUtility.IndexStore
 

Sources/CMakeLists.txt

@@ -15,7 +15,6 @@ add_subdirectory(Commands)
 add_subdirectory(CompilerPluginSupport)
 add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
-add_subdirectory(Environment)
 add_subdirectory(LLBuildManifest)
 add_subdirectory(PackageDescription)
 add_subdirectory(PackageFingerprint)

Sources/Environment/CMakeLists.txt

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Environment
+@testable import Basics
 import XCTest
 
 final class EnvironmentKeyTests: XCTestCase {

Tests/EnvironmentTests/EnvironmentKeyTests.swift renamed to Tests/BasicsTests/Environment/EnvironmentKeyTests.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import Environment
+@testable import Basics
 import XCTest
 
 final class EnvironmentTests: XCTestCase {

Tests/EnvironmentTests/EnvironmentTests.swift renamed to Tests/BasicsTests/Environment/EnvironmentTests.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_spi(ProcessEnvironmentBlockShim)
 import Basics
 @testable import SourceControl
 import SPMTestSupport
@@ -25,11 +26,11 @@ class GitRepositoryTests: XCTestCase {
 
     override func setUp() {
         // needed for submodule tests
-        Git.environment = ["GIT_ALLOW_PROTOCOL": "file"]
+        Git.environmentBlock = ["GIT_ALLOW_PROTOCOL": "file"]
     }
 
     override func tearDown() {
-        Git.environment = ProcessInfo.processInfo.environment
+        Git.environmentBlock = .init(Environment.current)
     }
 
     /// Test the basic provider functions.
@@ -197,7 +198,7 @@ class GitRepositoryTests: XCTestCase {
 
             try Process.checkNonZeroExit(
                 args: Git.tool, "-C", repoPath.pathString, "submodule", "add", testRepoPath.pathString,
-                environment: Git.environment
+                environment: .init(Git.environmentBlock)
             )
             let repo = GitRepository(path: repoPath)
             try repo.stageEverything()
@@ -613,7 +614,7 @@ class GitRepositoryTests: XCTestCase {
             try foo.checkout(newBranch: "submodule")
             try Process.checkNonZeroExit(
                 args: Git.tool, "-C", fooPath.pathString, "submodule", "add", barPath.pathString, "bar",
-                environment: Git.environment
+                environment: .init(Git.environmentBlock)
             )
 
             try foo.stageEverything()
@@ -635,7 +636,7 @@ class GitRepositoryTests: XCTestCase {
             // Add a submodule too to check for recursive submodules.
             try Process.checkNonZeroExit(
                 args: Git.tool, "-C", barPath.pathString, "submodule", "add", bazPath.pathString, "baz",
-                environment: Git.environment
+                environment: .init(Git.environmentBlock)
             )
 
             try bar.stageEverything()