fixup

Author: tomerd

Sources/Basics/FileSystem+Extensions.swift

@@ -11,7 +11,6 @@
 import class Foundation.FileManager
 import struct Foundation.Data
 import TSCBasic
-import PackageDescription
 
 // MARK: - user level
 
@@ -22,7 +21,6 @@ extension FileSystem {
     }
 }
 
-
 // MARK: - cache
 
 extension FileSystem {
@@ -119,18 +117,15 @@ extension FileSystem {
     public func readFileContents(_ path: AbsolutePath) throws -> Data {
         return try Data(self.readFileContents(path).contents)
     }
-    
+
     public func readFileContents(_ path: AbsolutePath) throws -> String {
-        guard let string = try String(data: self.readFileContents(path), encoding: .utf8) else {
-            throw StringError("invalid UTF8 string")
-        }
-        return string
+        return try String(decoding: self.readFileContents(path), as: UTF8.self)
     }
-    
+
     public func writeFileContents(_ path: AbsolutePath, data: Data) throws {
         return try self.writeFileContents(path, bytes: .init(data))
     }
-    
+
     public func writeFileContents(_ path: AbsolutePath, string: String) throws {
         return try self.writeFileContents(path, bytes: .init(encodingAsUTF8: string))
     }

Sources/PackageGraph/PinsStore.swift

@@ -139,7 +139,7 @@ fileprivate struct PinsStorage {
                     partial[iterator.packageRef.identity] = iterator
                 }
             default:
-                throw StringError("unknown '\(Self.self)' version '\(version.version)' at '\(self.path)'.")
+                throw StringError("unknown 'PinsStorage' version '\(version.version)' at '\(self.path)'.")
             }
         }
     }

Sources/SourceControl/RepositoryManager.swift

@@ -170,7 +170,7 @@ public class RepositoryManager {
                     // Make sure destination is free.
                     try? self.fileSystem.removeFileTree(repositoryPath)
                     let isCached = self.cachePath.map{ self.fileSystem.exists($0.appending(handle.subpath)) } ?? false
-                    
+
                     // Inform delegate.
                     queue.async {
                         let details = FetchDetails(fromCache: isCached, updatedCache: false)
@@ -469,7 +469,7 @@ fileprivate struct RepositoryManagerStorage {
                 let v1 = try self.decoder.decode(path: self.path, fileSystem: self.fileSystem, as: V1.self)
                 return try v1.object.repositories.mapValues{ try .init($0, manager: manager) }
             default:
-                throw StringError("unknown '\(Self.self)' version '\(version.version)' at '\(self.path)'")
+                throw StringError("unknown 'RepositoryManagerStorage' version '\(version.version)' at '\(self.path)'")
             }
         }
     }

Sources/Workspace/WorkspaceState.swift

@@ -98,7 +98,7 @@ fileprivate struct WorkspaceStateStorage {
                 let artifacts = v4.object.artifacts.map{ Workspace.ManagedArtifact($0) }
                 return (dependencies: .init(dependencyMap: dependencyMap), artifacts: .init(artifacts))
             default:
-                throw StringError("unknown '\(Self.self)' version '\(version.version)' at '\(self.path)'")
+                throw StringError("unknown 'WorkspaceStateStorage' version '\(version.version)' at '\(self.path)'")
             }
         }
     }