Deprecate stand-alone currentWorkingDirectory #1588
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aciidgh
approved these changes
Jun 1, 2018
Sources/Commands/SwiftTool.swift
Outdated
| @@ -735,9 +735,12 @@ extension BuildSubset { | |||
| /// Returns path of the nearest directory containing the manifest file w.r.t | |||
| /// current working directory. | |||
| private func findPackageRoot() -> AbsolutePath? { | |||
| guard let cwd = localFileSystem.currentWorkingDirectory else { | |||
There was a problem hiding this comment.
This can just be guard var root = ...
Sources/Basic/misc.swift
Outdated
| guard value.hasPrefix("/") else { | ||
| return nil | ||
| } | ||
| path = AbsolutePath(value) |
There was a problem hiding this comment.
This might be more clear:
if let cwd = currentWorkingDirectory {
path = AbsolutePath(value, relativeTo: cwd)
} else if let absPath = try? AbsolutePath(validating: value) {
path = absPath
} else {
return nil
}
vlm
force-pushed
the
deprecate-standalone-currentWorkingDirectory
branch
from
2d7692d to
241d43d
Compare
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
When a directory gets removed from under the running SwiftPM-based application, an irrecoverable error is generated. We'd like to be able to catch the error earlier.
Changes
currentWorkingDirectoryFileSystemcurrentWorkingDirectorywhich returns an optionalAbsolutePathresult.