Remove filemodeother

Author: rauhul

Sources/System/FileStatus/FileFlags.swift

@@ -12,7 +12,7 @@
 // FIXME: Document
 @frozen
 // @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
-public struct FileFlags: OptionSet {
+public struct FileFlags: OptionSet, Hashable, Codable {
   /// The raw C file flags.
   @_alwaysEmitIntoClient
   public let rawValue: CInterop.FileFlags
@@ -64,17 +64,17 @@ public struct FileFlags: OptionSet {
   @available(*, unavailable, renamed: "opaque")
   public static var UF_OPAQUE: FileFlags { opaque }
 
-#if os(FreeBSD)
-  /// The file may not be removed or renamed. Modifiable by file owner or super-user.
-  ///
-  /// The corresponding C constant is `UF_NOUNLINK`
-  @_alwaysEmitIntoClient
-  public static var noUnlink: FileFlags { FileFlags(_UF_NOUNLINK) }
-
-  @_alwaysEmitIntoClient
-  @available(*, unavailable, renamed: "noUnlink")
-  public static var UF_NOUNLINK: FileFlags { noUnlink }
-#endif
+// #if os(FreeBSD)
+//   /// The file may not be removed or renamed. Modifiable by file owner or super-user.
+//   ///
+//   /// The corresponding C constant is `UF_NOUNLINK`
+//   @_alwaysEmitIntoClient
+//   public static var noUnlink: FileFlags { FileFlags(_UF_NOUNLINK) }
+//
+//   @_alwaysEmitIntoClient
+//   @available(*, unavailable, renamed: "noUnlink")
+//   public static var UF_NOUNLINK: FileFlags { noUnlink }
+// #endif
 
   /// The file is compressed (some file-systems). Modifiable by file owner or super-user.
   ///
@@ -166,17 +166,17 @@ public struct FileFlags: OptionSet {
   @available(*, unavailable, renamed: "superUserNoUnlink")
   public static var SF_NOUNLINK: FileFlags { superUserNoUnlink }
 
-#if os(FreeBSD)
-  /// The file is a snapshot file. Only modifiable by the super-user.
-  ///
-  /// The corresponding C constant is `SF_SNAPSHOT`
-  @_alwaysEmitIntoClient
-  public static var superUserSnapshot: FileFlags { FileFlags(_SF_SNAPSHOT) }
-
-  @_alwaysEmitIntoClient
-  @available(*, unavailable, renamed: "superUserSnapshot")
-  public static var SF_SNAPSHOT: FileFlags { superUserSnapshot }
-#endif
+// #if os(FreeBSD)
+//   /// The file is a snapshot file. Only modifiable by the super-user.
+//   ///
+//   /// The corresponding C constant is `SF_SNAPSHOT`
+//   @_alwaysEmitIntoClient
+//   public static var superUserSnapshot: FileFlags { FileFlags(_SF_SNAPSHOT) }
+//
+//   @_alwaysEmitIntoClient
+//   @available(*, unavailable, renamed: "superUserSnapshot")
+//   public static var SF_SNAPSHOT: FileFlags { superUserSnapshot }
+// #endif
 
   /// The file is a firmlink. Only modifiable by the super-user.
   ///
@@ -199,4 +199,36 @@ public struct FileFlags: OptionSet {
   public static var SF_DATALESS: FileFlags { kernelDataless }
 }
 
+// @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+extension FileFlags
+  : CustomStringConvertible, CustomDebugStringConvertible
+{
+  /// A textual representation of the file permissions.
+  @inline(never)
+  public var description: String {
+    let descriptions: [(Element, StaticString)] = [
+      (.noDump, ".noDump"),
+      (.immutable, ".immutable"),
+      (.appendOnly, ".appendOnly"),
+      (.opaque, ".opaque"),
+      (.compressed, ".compressed"),
+      (.tracked, ".tracked"),
+      (.dataVault, ".dataVault"),
+      (.hidden, ".hidden"),
+      (.superUserArchived, ".superUserArchived"),
+      (.superUserImmutable, ".superUserImmutable"),
+      (.superUserAppend, ".superUserAppend"),
+      (.superUserRestricted, ".superUserRestricted"),
+      (.superUserNoUnlink, ".superUserNoUnlink"),
+      (.superUserFirmlink, ".superUserFirmlink"),
+      (.kernelDataless, ".kernelDataless"),
+    ]
+
+    return _buildDescription(descriptions)
+  }
+
+  /// A textual representation of the file permissions, suitable for debugging.
+  public var debugDescription: String { self.description }
+}
+
 #endif

Sources/System/FileStatus/FileMode/FileMode.swift

@@ -30,13 +30,6 @@ public struct FileMode: RawRepresentable {
     set { rawValue = (rawValue & ~_MODE_PERMISSIONS) | (newValue.rawValue & _MODE_PERMISSIONS ) }
   }
 
-  /// Subset of mode for accessing and modifying file mode other.
-  @_alwaysEmitIntoClient
-  public var other: FileModeOther {
-    get { FileModeOther(rawValue: rawValue & _MODE_OTHER) }
-    set { rawValue = (rawValue & ~_MODE_OTHER) | (newValue.rawValue & _MODE_OTHER ) }
-  }
-
   /// Subset of mode for accessing and modifying file type.
   @_alwaysEmitIntoClient
   public var type: FileType {

Sources/System/FileStatus/FileMode/FileModeOther.swift

@@ -118,14 +118,12 @@ public struct FilePermissions: OptionSet, Hashable, Codable {
   ///
   /// For more information, see the `setuid(2)` man page.
   @_alwaysEmitIntoClient
-  @available(*, deprecated, renamed: "FileModeOther.setUserID")
   public static var setUserID: FilePermissions { FilePermissions(0o4000) }
 
   /// Indicates that the file is executed as the group.
   ///
   /// For more information, see the `setgid(2)` man page.
   @_alwaysEmitIntoClient
-  @available(*, deprecated, renamed: "FileModeOther.setGroupID")
   public static var setGroupID: FilePermissions { FilePermissions(0o2000) }
 
   /// Indicates that executable's text segment
@@ -134,7 +132,6 @@ public struct FilePermissions: OptionSet, Hashable, Codable {
   /// For more information, see the `chmod(2)` man page's
   /// discussion of `S_ISVTX` (the sticky bit).
   @_alwaysEmitIntoClient
-  @available(*, deprecated, renamed: "FileModeOther.saveText")
   public static var saveText: FilePermissions { FilePermissions(0o1000) }
 }
 

Sources/System/FileStatus/FileMode/FilePermissions.swift

@@ -23,6 +23,7 @@ public struct FileStatus: RawRepresentable {
   public init(rawValue: CInterop.Stat) { self.rawValue = rawValue }
 
   // FIXME: replace with swift type DeviceId that splits out major/minor
+  // FIXME: whats the difference between this and rDeviceId?
   /// ID of device containing file.
   @_alwaysEmitIntoClient
   public var deviceId: CInterop.DeviceId { rawValue.st_dev }
@@ -50,7 +51,7 @@ public struct FileStatus: RawRepresentable {
   // FIXME: whats the difference between this and deviceId?
   /// Device ID.
   @_alwaysEmitIntoClient
-  public var rDeviceID: CInterop.DeviceId { rawValue.st_rdev }
+  public var rDeviceId: CInterop.DeviceId { rawValue.st_rdev }
 
   /// Time of last access.
   @_alwaysEmitIntoClient
@@ -76,7 +77,7 @@ public struct FileStatus: RawRepresentable {
   @_alwaysEmitIntoClient
   public var blockCount: CInterop.BlockCount { rawValue.st_blocks }
 
-  /// Optimal blocksize for I/O.
+  /// Optimal block size for I/O.
   @_alwaysEmitIntoClient
   public var blockSize: CInterop.BlockSize { rawValue.st_blksize }