Merge pull request #141 from glessard/requirement-update

Author: glessard

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 /*

Sources/System/FileDescriptor.swift

@@ -45,7 +45,8 @@ extension FileDescriptor {
 extension FileDescriptor {
   /// The desired read and write access for a newly opened file.
   @frozen
-  public struct AccessMode: RawRepresentable, Hashable, Codable {
+  @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
+  public struct AccessMode: RawRepresentable, Sendable, Hashable, Codable {
     /// The raw C access mode.
     @_alwaysEmitIntoClient
     public var rawValue: CInt
@@ -87,7 +88,8 @@ extension FileDescriptor {
 
   /// Options that specify behavior for a newly-opened file.
   @frozen
-  public struct OpenOptions: OptionSet, Hashable, Codable {
+  @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
+  public struct OpenOptions: OptionSet, Sendable, Hashable, Codable {
     /// The raw C options.
     @_alwaysEmitIntoClient
     public var rawValue: CInt
@@ -311,7 +313,8 @@ extension FileDescriptor {
 
   /// Options for specifying what a file descriptor's offset is relative to.
   @frozen
-  public struct SeekOrigin: RawRepresentable, Hashable, Codable {
+  @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
+  public struct SeekOrigin: RawRepresentable, Sendable, Hashable, Codable {
     /// The raw C value.
     @_alwaysEmitIntoClient
     public var rawValue: CInt
@@ -475,18 +478,7 @@ extension FileDescriptor.OpenOptions
   public var debugDescription: String { self.description }
 }
 
-#if compiler(>=5.5) && canImport(_Concurrency)
 // The decision on whether to make FileDescriptor Sendable or not
 // is currently being discussed in https://github.com/apple/swift-system/pull/112
 //@available(*, unavailable, message: "File descriptors are not completely thread-safe.")
 //extension FileDescriptor: Sendable {}
-
-@available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-extension FileDescriptor.AccessMode: Sendable {}
-
-@available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-extension FileDescriptor.OpenOptions: Sendable {}
-
-@available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-extension FileDescriptor.SeekOrigin: Sendable {}
-#endif

Sources/System/FilePath/FilePath.swift

@@ -38,7 +38,7 @@
 /// are file-system–specific and have additional considerations
 /// like case insensitivity, Unicode normalization, and symbolic links.
 @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-public struct FilePath {
+public struct FilePath: Sendable {
   // TODO(docs): Section on all the new syntactic operations, lexical normalization, decomposition,
   // components, etc.
   internal var _storage: SystemString
@@ -67,8 +67,3 @@ extension FilePath {
 
 @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
 extension FilePath: Hashable, Codable {}
-
-#if compiler(>=5.5) && canImport(_Concurrency)
-@available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-extension FilePath: Sendable {}
-#endif

Sources/System/FilePath/FilePathComponentView.swift

@@ -28,7 +28,8 @@ extension FilePath {
   ///
   ///     path.components.removeAll { $0.kind == .currentDirectory }
   ///     // path is "/home/username/bin/scripts/tree"
-  public struct ComponentView {
+  @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
+  public struct ComponentView: Sendable {
     internal var _path: FilePath
     internal var _start: SystemString.Index
 
@@ -39,30 +40,6 @@ extension FilePath {
     }
   }
 
-  #if SYSTEM_PACKAGE // Workaround for a __consuming getter bug in Swift 5.3.3
-  /// View the non-root components that make up this path.
-  public var components: ComponentView {
-    get { ComponentView(self) }
-    _modify {
-      // RRC's empty init means that we can't guarantee that the yielded
-      // view will restore our root. So copy it out first.
-      //
-      // TODO(perf): Small-form root (especially on Unix). Have Root
-      // always copy out (not worth ref counting). Make sure that we're
-      // not needlessly sliding values around or triggering a COW
-      let rootStr = self.root?._systemString ?? SystemString()
-      var comp = ComponentView(self)
-      self = FilePath()
-      defer {
-        self = comp._path
-        if root?._slice.elementsEqual(rootStr) != true {
-          self.root = Root(rootStr)
-        }
-      }
-      yield &comp
-    }
-  }
-  #else
   /// View the non-root components that make up this path.
   public var components: ComponentView {
     __consuming get { ComponentView(self) }
@@ -85,13 +62,14 @@ extension FilePath {
       yield &comp
     }
   }
-  #endif
 }
 
 @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
 extension FilePath.ComponentView: BidirectionalCollection {
   public typealias Element = FilePath.Component
-  public struct Index: Comparable, Hashable {
+
+  @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
+  public struct Index: Sendable, Comparable, Hashable {
     internal typealias Storage = SystemString.Index
 
     internal var _storage: Storage
@@ -239,11 +217,3 @@ extension FilePath.ComponentView {
     #endif // DEBUG
   }
 }
-
-#if compiler(>=5.5) && canImport(_Concurrency)
-@available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
-extension FilePath.ComponentView: Sendable {}
-
-@available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
-extension FilePath.ComponentView.Index: Sendable {}
-#endif

Sources/System/FilePath/FilePathComponents.swift

@@ -28,7 +28,8 @@ extension FilePath {
   ///   * `\\server\share\`
   ///   * `\\?\UNC\server\share\`
   ///   * `\\?\Volume{12345678-abcd-1111-2222-123445789abc}\`
-  public struct Root {
+  @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
+  public struct Root: Sendable {
     internal var _path: FilePath
     internal var _rootEnd: SystemString.Index
 
@@ -54,7 +55,8 @@ extension FilePath {
   ///     file.kind == .regular           // true
   ///     file.extension                  // "txt"
   ///     path.append(file)               // path is "/tmp/foo.txt"
-  public struct Component {
+  @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
+  public struct Component: Sendable {
     internal var _path: FilePath
     internal var _range: Range<SystemString.Index>
 
@@ -78,7 +80,8 @@ extension FilePath.Component {
   /// Whether a component is a regular file or directory name, or a special
   /// directory `.` or `..`
   @frozen
-  public enum Kind {
+  @available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
+  public enum Kind: Sendable {
     /// The special directory `.`, representing the current directory.
     case currentDirectory
 
@@ -285,14 +288,3 @@ extension FilePath.Root {
     #endif
   }
 }
-
-#if compiler(>=5.5) && canImport(_Concurrency)
-@available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
-extension FilePath.Root: Sendable {}
-
-@available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
-extension FilePath.Component: Sendable {}
-
-@available(/*System 0.0.2: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0*/iOS 8, *)
-extension FilePath.Component.Kind: Sendable {}
-#endif

Sources/System/FilePermissions.swift

@@ -18,7 +18,7 @@
 ///     perms == [.ownerReadWrite, .groupRead, .otherRead] // true
 @frozen
 @available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-public struct FilePermissions: OptionSet, Hashable, Codable {
+public struct FilePermissions: OptionSet, Sendable, Hashable, Codable {
   /// The raw C file permissions.
   @_alwaysEmitIntoClient
   public let rawValue: CModeT
@@ -175,8 +175,3 @@ extension FilePermissions
   /// A textual representation of the file permissions, suitable for debugging.
   public var debugDescription: String { self.description }
 }
-
-#if compiler(>=5.5) && canImport(_Concurrency)
-@available(/*System 0.0.1: macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0*/iOS 8, *)
-extension FilePermissions: Sendable {}
-#endif

Sources/System/SystemString.swift

@@ -8,7 +8,8 @@
 */
 
 // A platform-native character representation, currently used for file paths
-internal struct SystemChar: RawRepresentable, Comparable, Hashable, Codable {
+internal struct SystemChar:
+  RawRepresentable, Sendable, Comparable, Hashable, Codable {
   internal typealias RawValue = CInterop.PlatformChar
 
   internal var rawValue: RawValue
@@ -61,7 +62,7 @@ extension SystemChar {
 // A platform-native string representation, currently for file paths
 //
 // Always null-terminated.
-internal struct SystemString {
+internal struct SystemString: Sendable {
   internal typealias Storage = [SystemChar]
   internal var nullTerminatedStorage: Storage
 }
@@ -288,11 +289,6 @@ extension SystemString {
   }
 }
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-extension SystemChar: Sendable {}
-extension SystemString: Sendable {}
-#endif
-
 // TODO: SystemString should use a COW-interchangable storage form rather
 // than array, so you could "borrow" the storage from a non-bridged String
 // or Data or whatever