Deprecate static method AbsolutePath.root

Author: stevapple

Sources/TSCBasic/FileSystem.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
@@ -981,11 +981,11 @@ public class RerootedFileSystemView: FileSystem {
 
     /// Adjust the input path for the underlying file system.
     private func formUnderlyingPath(_ path: AbsolutePath) -> AbsolutePath {
-        if path == AbsolutePath.root {
+        if path.isRoot {
             return root
         } else {
             // FIXME: Optimize?
-            return root.appending(RelativePath(String(path.pathString.dropFirst(1))))
+            return root.appending(RelativePath(path.filepath.removingRoot()))
         }
     }
 

Sources/TSCBasic/Path.swift

@@ -268,7 +268,14 @@ public struct AbsolutePath: Path {
     /// Root directory (whose string representation is just a path separator).
     ///
     /// FIXME: root is not a static value, we'd better remove this property.
-    public static let root = AbsolutePath(FilePath._root)
+    @available(*, deprecated, message: "root is not a static value, use the instance property instead")
+    public static var root: AbsolutePath {
+        if let rootPath = localFileSystem.currentWorkingDirectory?.root {
+            return AbsolutePath(rootPath)
+        } else {
+            return AbsolutePath(FilePath._root)
+        }
+    }
 }
 
 /// Represents a relative file system path.  A relative path never starts with

Sources/TSCUtility/Platform.swift

@@ -105,8 +105,8 @@ public enum Platform: Equatable {
         defer { tmp.deallocate() }
         guard confstr(name, tmp.baseAddress, len) == len else { return nil }
         let value = String(cString: tmp.baseAddress!)
-        guard value.hasSuffix(AbsolutePath.root.pathString) else { return nil }
-        return resolveSymlinks(AbsolutePath(value))
+        guard let path = try? AbsolutePath(validating: value) else { return nil }
+        return resolveSymlinks(path)
     }
     #endif
 }

Tests/TSCBasicPerformanceTests/SynchronizedQueuePerfTests.swift

@@ -14,7 +14,7 @@ import TSCBasic
 import TSCTestSupport
 
 class SynchronizedQueuePerfTests: XCTestCasePerf {
-    
+
     // Mock the UnitTest struct in SwiftPM/SwiftTestTool.swift
     struct Item {
         let productPath: AbsolutePath
@@ -28,7 +28,6 @@ class SynchronizedQueuePerfTests: XCTestCasePerf {
         }
     }
 
-    
     func testEnqueueDequeue_10000() {
         let queue = SynchronizedQueue<Item>()
         let test = Item(productPath: AbsolutePath.root, name: "TestName", testCase: "TestCaseName")
@@ -42,7 +41,7 @@ class SynchronizedQueuePerfTests: XCTestCasePerf {
             }
         }
     }
-    
+
     func testEnqueueDequeue_1000() {
         let queue = SynchronizedQueue<Item>()
         let test = Item(productPath: AbsolutePath.root, name: "TestName", testCase: "TestCaseName")
@@ -56,7 +55,7 @@ class SynchronizedQueuePerfTests: XCTestCasePerf {
             }
         }
     }
-    
+
     func testEnqueueDequeue_100() {
         let queue = SynchronizedQueue<Item>()
         let test = Item(productPath: AbsolutePath.root, name: "TestName", testCase: "TestCaseName")