Split FileManager into Platform Dependent Files #2057
Conversation
gmittert
force-pushed
the
split
branch
3 times, most recently
from
b7d5af6 to
695f666
Compare
|
Might be worth moving |
|
@swift-ci test |
Foundation/FileManager+POSIX.swift
Outdated
| #endif | ||
| return urls | ||
| } | ||
| internal func _urls(for directory: SearchPathDirectory, in domainMask: SearchPathDomainMask) -> [URL] { |
There was a problem hiding this comment.
I think the per-OS helper functions should be private instead of internal where possible`. These are probably a holdover from when they were first written but may as well fix them now.
There was a problem hiding this comment.
I believe most of these need to be internal instead of private since they are used in a file they aren't defined in.
Foundation/FileManager+POSIX.swift
Outdated
|
|
||
| return urls | ||
| } | ||
| internal func _createDirectory(atPath path: String, withIntermediateDirectories createIntermediates: Bool, attributes: [FileAttributeKey : Any]? = [:]) throws { |
There was a problem hiding this comment.
Add a separating blank line between functions
Foundation/FileManager+POSIX.swift
Outdated
| throw _NSErrorWithErrno(errno, reading: false, path: path) | ||
| } | ||
| }) | ||
| } |
Foundation/FileManager+POSIX.swift
Outdated
| return | ||
| } | ||
|
|
||
| if rmdir(path) == 0 { |
There was a problem hiding this comment.
This seems to have lost its _fileSystemRepresentation wrapper from #1994. Did you base this split on the latest version from master?
|
|
@swift-ci test |
|
I think the following can be moved into and wrapped inside a |
Moved, though not in an |
|
@swift-ci please test |
|
@jmittert I'm okay taking this if you fix the conflicts with the things that are landing. |
|
Alright, rebased! |
|
@swift-ci test |
|
@swift-ci please test |
|
These both failed on the Swift test suite These don't somehow rely on foundation at all do they? |
|
@jmittert The tests have been failing for most of the PRs for unrelated reasons |
|
@swift-ci please test |
Splits the Windows and POSIX specific File Manager implementations into their own files. See #2002 (comment)
Not sure if there's a way to make the diff more readable, but in general, what I've done is copy over the function to win32/POSIX, prefixed the name with an underscore, removed the non applicable #if branch, and have the FileManager version pass through to it.