From ced53632258000febd58a693e25b435f8c66423b Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 21 Apr 2023 13:40:11 +0100 Subject: [PATCH] Fix warnings for use of `try` in non-throwing context --- Sources/SKCore/XCToolchainPlist.swift | 4 ++-- Sources/SKSupport/FileSystem.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/SKCore/XCToolchainPlist.swift b/Sources/SKCore/XCToolchainPlist.swift index 133b2f72e..1df041898 100644 --- a/Sources/SKCore/XCToolchainPlist.swift +++ b/Sources/SKCore/XCToolchainPlist.swift @@ -49,8 +49,8 @@ extension XCToolchainPlist { init(fromDirectory path: AbsolutePath, _ fileSystem: FileSystem = localFileSystem) throws { #if os(macOS) let plistNames = [ - RelativePath("ToolchainInfo.plist"), // Xcode - RelativePath("Info.plist"), // Swift.org + try RelativePath(validating: "ToolchainInfo.plist"), // Xcode + try RelativePath(validating: "Info.plist"), // Swift.org ] var missingPlistPath: AbsolutePath? diff --git a/Sources/SKSupport/FileSystem.swift b/Sources/SKSupport/FileSystem.swift index 7f1e4c272..e78820154 100644 --- a/Sources/SKSupport/FileSystem.swift +++ b/Sources/SKSupport/FileSystem.swift @@ -24,7 +24,7 @@ extension AbsolutePath { /// Inititializes an absolute path from a string, expanding a leading `~` to `homeDirectoryForCurrentUser` first. public init(expandingTilde path: String) throws { if path.first == "~" { - try self.init(homeDirectoryForCurrentUser, String(path.dropFirst(2))) + try self.init(homeDirectoryForCurrentUser, validating: String(path.dropFirst(2))) } else { try self.init(validating: path) }