From 443e03c16fee9d15c66107401529c2ce9d495757 Mon Sep 17 00:00:00 2001 From: Jonathan Flat Date: Wed, 4 Nov 2026 14:25:26 -0700 Subject: [PATCH] Update StatFS availability to 1.9.0 --- Package.swift | 2 + Proposals/0009-system-statfs.md | 2 +- Sources/System/CMakeLists.txt | 2 +- Sources/System/FileSystem/MountFlags.swift | 4 +- Sources/System/FileSystem/StatFS.swift | 28 ++--- Sources/System/Internals/CInterop.swift | 2 +- Sources/System/Internals/Constants.swift | 120 ++++++++++----------- Sources/System/Internals/Exports.swift | 4 +- Tests/SystemTests/StatFSTests.swift | 42 ++++---- 9 files changed, 104 insertions(+), 102 deletions(-) diff --git a/Package.swift b/Package.swift index 8398c20..7b988e0 100644 --- a/Package.swift +++ b/Package.swift @@ -61,6 +61,8 @@ let availability: [Available] = [ Available("1.7.0", "macOS 27.0, iOS 27.0, watchOS 27.0, tvOS 27.0, visionOS 27.0"), + Available("1.9.0", "macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999"), + Available("199", "macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999"), ] diff --git a/Proposals/0009-system-statfs.md b/Proposals/0009-system-statfs.md index 508b586..6ac1963 100644 --- a/Proposals/0009-system-statfs.md +++ b/Proposals/0009-system-statfs.md @@ -3,7 +3,7 @@ * Proposal: [SYS-0009](0009-system-statfs.md) * Authors: [Jonathan Flat](https://github.com/jrflat) * Review Manager: TBD -* Status: **Awaiting review** +* Status: **Implemented** * Implementation: [apple/swift-system#361](https://github.com/apple/swift-system/pull/361) * Review: ([pitch](https://forums.swift.org/t/pitch-statfs-and-supporting-types/88151)) diff --git a/Sources/System/CMakeLists.txt b/Sources/System/CMakeLists.txt index d254354..2372e72 100644 --- a/Sources/System/CMakeLists.txt +++ b/Sources/System/CMakeLists.txt @@ -31,7 +31,7 @@ set_target_properties(SystemPackage PROPERTIES set(SWIFT_SYSTEM_AVAILABILITY_VERSIONS 0.0.1 0.0.2 0.0.3 1.1.0 1.1.1 1.2.0 1.2.1 1.3.0 1.3.1 1.3.2 1.4.0 - 1.7.0 + 1.7.0 1.9.0 199) set(SWIFT_SYSTEM_SOURCE_AVAILABILITY "macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, visionOS 1.0") diff --git a/Sources/System/FileSystem/MountFlags.swift b/Sources/System/FileSystem/MountFlags.swift index 5053130..07b8ac9 100644 --- a/Sources/System/FileSystem/MountFlags.swift +++ b/Sources/System/FileSystem/MountFlags.swift @@ -73,7 +73,7 @@ /// | `noPermissionChecks` | N/A | N/A | `MNT_NOPERM` | N/A | N/A | /// | `writeExecuteAllowed` | N/A | N/A | `MNT_WXALLOWED` | N/A | N/A | @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct MountFlags: OptionSet, Sendable, Hashable, Codable { /// The raw C flags. @@ -532,7 +532,7 @@ public struct MountFlags: OptionSet, Sendable, Hashable, Codable { #endif } -@available(System 199, *) +@available(System 1.9.0, *) extension MountFlags : CustomStringConvertible, CustomDebugStringConvertible { diff --git a/Sources/System/FileSystem/StatFS.swift b/Sources/System/FileSystem/StatFS.swift index f3c3deb..5b5f793 100644 --- a/Sources/System/FileSystem/StatFS.swift +++ b/Sources/System/FileSystem/StatFS.swift @@ -98,7 +98,7 @@ import Android /// /// - Note: Not available on Windows or WASI. @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct FileSystemID: RawRepresentable, Sendable { /// The raw C file system ID. @@ -116,7 +116,7 @@ public struct FileSystemID: RawRepresentable, Sendable { // `CInterop.FileSystemID` is the C `fsid_t` struct (a fixed two-element // `int32_t` array), which provides no synthesized conformances. -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemID { @_alwaysEmitIntoClient internal var _words: (Int32, Int32) { @@ -137,7 +137,7 @@ extension FileSystemID { } } -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemID: Equatable { @_alwaysEmitIntoClient public static func == (lhs: Self, rhs: Self) -> Bool { @@ -145,7 +145,7 @@ extension FileSystemID: Equatable { } } -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemID: Hashable { @_alwaysEmitIntoClient public func hash(into hasher: inout Hasher) { @@ -154,7 +154,7 @@ extension FileSystemID: Hashable { } } -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemID: Codable { @_alwaysEmitIntoClient public func encode(to encoder: any Encoder) throws { @@ -172,7 +172,7 @@ extension FileSystemID: Codable { } } -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemID: CustomStringConvertible, CustomDebugStringConvertible { /// A textual representation of the file system ID. @inline(never) @@ -192,7 +192,7 @@ extension FileSystemID: CustomStringConvertible, CustomDebugStringConvertible { /// /// - Note: Only available on Linux and Android. @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct FileSystemType: RawRepresentable, Sendable, Hashable, Codable { /// The raw C file system type. @@ -217,7 +217,7 @@ public struct FileSystemType: RawRepresentable, Sendable, Hashable, Codable { /// /// - Note: Only available on Darwin. @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct FileSystemSubtype: RawRepresentable, Sendable, Hashable, Codable { /// The raw C file system subtype. @@ -242,7 +242,7 @@ public struct FileSystemSubtype: RawRepresentable, Sendable, Hashable, Codable { /// /// - Note: Only available on Darwin and BSD. @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct FileSystemTypeName : RawRepresentable, Sendable, Hashable, Codable, ExpressibleByStringLiteral { @@ -284,7 +284,7 @@ public struct FileSystemTypeName #endif } -@available(System 199, *) +@available(System 1.9.0, *) extension FileSystemTypeName: CustomStringConvertible, CustomDebugStringConvertible { /// The file system type name, such as `apfs`. @inline(never) @@ -301,7 +301,7 @@ extension FileSystemTypeName: CustomStringConvertible, CustomDebugStringConverti // Helpers for reading the fixed-size, NUL-terminated C character buffers // (`f_fstypename`, `f_mntonname`, `f_mntfromname`) in Darwin/BSD `statfs`. // If the buffer has no NUL (malformed), the entire buffer is used. -@available(System 199, *) +@available(System 1.9.0, *) extension String { @usableFromInline internal init(_nullTerminatedBytes buffer: UnsafeRawBufferPointer) { @@ -310,7 +310,7 @@ extension String { } } -@available(System 199, *) +@available(System 1.9.0, *) extension FilePath { @usableFromInline internal init(_nullTerminatedBytes buffer: UnsafeRawBufferPointer) { @@ -341,7 +341,7 @@ extension FilePath { /// - Note: The numeric properties clamp when converting to or from the /// underlying C field. Use `rawValue` for exact, unclamped access. @frozen -@available(System 199, *) +@available(System 1.9.0, *) public struct StatFS: RawRepresentable, Sendable, Hashable { /// The raw C `statfs` struct. @@ -716,7 +716,7 @@ public struct StatFS: RawRepresentable, Sendable, Hashable { // MARK: - StatFS Equatable & Hashable -@available(System 199, *) +@available(System 1.9.0, *) extension StatFS { /// Compares the file system metadata fields of two `StatFS` values, /// including fields not exposed as properties, such as `f_flags_ext` on diff --git a/Sources/System/Internals/CInterop.swift b/Sources/System/Internals/CInterop.swift index e5da683..5b01597 100644 --- a/Sources/System/Internals/CInterop.swift +++ b/Sources/System/Internals/CInterop.swift @@ -119,7 +119,7 @@ extension CInterop { } #if !os(WASI) -@available(System 199, *) +@available(System 1.9.0, *) extension CInterop { /// The C `statfs` struct. public typealias StatFS = statfs diff --git a/Sources/System/Internals/Constants.swift b/Sources/System/Internals/Constants.swift index 4db4aea..87789fb 100644 --- a/Sources/System/Internals/Constants.swift +++ b/Sources/System/Internals/Constants.swift @@ -814,54 +814,54 @@ internal var _SF_SNAPSHOT: UInt32 { UInt32(bitPattern: SF_SNAPSHOT) } // client, block constant folding, and require a public `import CSystem`. // `StatFSTests.mountFlagBitsMatchLibc` checks the literals against libc. #if os(Linux) || os(Android) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_RDONLY_BIT: CInterop.MountFlags { 0x0001 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NOSUID_BIT: CInterop.MountFlags { 0x0002 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NODEV_BIT: CInterop.MountFlags { 0x0004 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NOEXEC_BIT: CInterop.MountFlags { 0x0008 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_SYNCHRONOUS_BIT: CInterop.MountFlags { 0x0010 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_MANDLOCK_BIT: CInterop.MountFlags { 0x0040 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NOATIME_BIT: CInterop.MountFlags { 0x0400 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NODIRATIME_BIT: CInterop.MountFlags { 0x0800 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_RELATIME_BIT: CInterop.MountFlags { 0x1000 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NOSYMFOLLOW_BIT: CInterop.MountFlags { 0x2000 } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_VALID_BIT: CInterop.MountFlags { 0x0020 } #endif // MARK: Flags Available on All Platforms -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_RDONLY: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -871,7 +871,7 @@ internal var _MOUNT_RDONLY: CInterop.MountFlags { #endif } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_SYNCHRONOUS: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -881,7 +881,7 @@ internal var _MOUNT_SYNCHRONOUS: CInterop.MountFlags { #endif } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_NOEXEC: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -891,7 +891,7 @@ internal var _MOUNT_NOEXEC: CInterop.MountFlags { #endif } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_NOSUID: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -901,7 +901,7 @@ internal var _MOUNT_NOSUID: CInterop.MountFlags { #endif } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_NOATIME: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -914,7 +914,7 @@ internal var _MOUNT_NOATIME: CInterop.MountFlags { // MARK: Flags Available on All Platforms Except FreeBSD #if !os(FreeBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_NODEV: CInterop.MountFlags { #if SYSTEM_PACKAGE_DARWIN || os(OpenBSD) @@ -928,15 +928,15 @@ internal var _MOUNT_NODEV: CInterop.MountFlags { // MARK: Flags Available on Linux and Android #if os(Linux) || os(Android) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_MANDLOCK: CInterop.MountFlags { _ST_MANDLOCK_BIT } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_NODIRATIME: CInterop.MountFlags { _ST_NODIRATIME_BIT } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _ST_RELATIME: CInterop.MountFlags { _ST_RELATIME_BIT } #endif @@ -944,7 +944,7 @@ internal var _ST_RELATIME: CInterop.MountFlags { _ST_RELATIME_BIT } // MARK: Flags Available on Linux, Android, and FreeBSD #if os(Linux) || os(Android) || os(FreeBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MOUNT_NOSYMFOLLOW: CInterop.MountFlags { #if os(FreeBSD) @@ -958,23 +958,23 @@ internal var _MOUNT_NOSYMFOLLOW: CInterop.MountFlags { // MARK: Flags Available on Darwin, FreeBSD, and OpenBSD #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_ASYNC: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_ASYNC) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_EXPORTED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_EXPORTED) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_LOCAL: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_LOCAL) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_QUOTA: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_QUOTA) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_ROOTFS: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_ROOTFS) } #endif @@ -982,15 +982,15 @@ internal var _MNT_ROOTFS: CInterop.MountFlags { CInterop.MountFlags(truncatingIf // MARK: Flags Available on Darwin and FreeBSD #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_UNION: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_UNION) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_AUTOMOUNTED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_AUTOMOUNTED) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_MULTILABEL: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_MULTILABEL) } #endif @@ -998,19 +998,19 @@ internal var _MNT_MULTILABEL: CInterop.MountFlags { CInterop.MountFlags(truncati // MARK: Flags Available on FreeBSD and OpenBSD #if os(FreeBSD) || os(OpenBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_EXRDONLY: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_EXRDONLY) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_DEFEXPORTED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_DEFEXPORTED) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_EXPORTANON: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_EXPORTANON) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_SOFTDEP: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_SOFTDEP) } #endif @@ -1018,51 +1018,51 @@ internal var _MNT_SOFTDEP: CInterop.MountFlags { CInterop.MountFlags(truncatingI // MARK: Flags Available on Darwin Only #if SYSTEM_PACKAGE_DARWIN -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_CPROTECT: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_CPROTECT) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_REMOVABLE: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_REMOVABLE) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_QUARANTINE: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_QUARANTINE) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_DOVOLFS: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_DOVOLFS) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_DONTBROWSE: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_DONTBROWSE) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_IGNORE_OWNERSHIP: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_IGNORE_OWNERSHIP) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_JOURNALED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_JOURNALED) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NOUSERXATTR: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NOUSERXATTR) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_DEFWRITE: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_DEFWRITE) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NOFOLLOW: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NOFOLLOW) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_SNAPSHOT: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_SNAPSHOT) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_STRICTATIME: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_STRICTATIME) } #endif @@ -1070,55 +1070,55 @@ internal var _MNT_STRICTATIME: CInterop.MountFlags { CInterop.MountFlags(truncat // MARK: Flags Available on FreeBSD Only #if os(FreeBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_EXKERB: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_EXKERB) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_EXPUBLIC: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_EXPUBLIC) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_ACLS: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_ACLS) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_GJOURNAL: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_GJOURNAL) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_IGNORE: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_IGNORE) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NFS4ACLS: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NFS4ACLS) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NOCLUSTERR: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NOCLUSTERR) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NOCLUSTERW: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NOCLUSTERW) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_SUIDDIR: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_SUIDDIR) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_SUJ: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_SUJ) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_UNTRUSTED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_UNTRUSTED) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_USER: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_USER) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_VERIFIED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_VERIFIED) } #endif @@ -1126,11 +1126,11 @@ internal var _MNT_VERIFIED: CInterop.MountFlags { CInterop.MountFlags(truncating // MARK: Flags Available on OpenBSD Only #if os(OpenBSD) -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_NOPERM: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_NOPERM) } -@available(System 199, *) +@available(System 1.9.0, *) @_alwaysEmitIntoClient internal var _MNT_WXALLOWED: CInterop.MountFlags { CInterop.MountFlags(truncatingIfNeeded: MNT_WXALLOWED) } #endif diff --git a/Sources/System/Internals/Exports.swift b/Sources/System/Internals/Exports.swift index ac464f0..3793f0a 100644 --- a/Sources/System/Internals/Exports.swift +++ b/Sources/System/Internals/Exports.swift @@ -108,11 +108,11 @@ internal func system_fstatat(_ fd: CInt, _ p: UnsafePointer, _ s: inout C } #if !os(WASI) -@available(System 199, *) +@available(System 1.9.0, *) internal func system_statfs(_ p: UnsafePointer, _ s: inout CInterop.StatFS) -> Int32 { statfs(p, &s) } -@available(System 199, *) +@available(System 1.9.0, *) internal func system_fstatfs(_ fd: CInt, _ s: inout CInterop.StatFS) -> Int32 { fstatfs(fd, &s) } diff --git a/Tests/SystemTests/StatFSTests.swift b/Tests/SystemTests/StatFSTests.swift index e07f15d..e0c7c19 100644 --- a/Tests/SystemTests/StatFSTests.swift +++ b/Tests/SystemTests/StatFSTests.swift @@ -41,7 +41,7 @@ import Android @Suite("StatFS") private struct StatFSTests { - @available(System 199, *) + @available(System 1.9.0, *) @Test func initializersAgree() async throws { try withTemporaryFilePath(basename: "StatFS_initializersAgree") { tempDir in let fromFilePath = try StatFS(tempDir) @@ -60,7 +60,7 @@ private struct StatFSTests { } } - @available(System 199, *) + @available(System 1.9.0, *) @Test func spaceAndBlocks() async throws { try withTemporaryFilePath(basename: "StatFS_spaceAndBlocks") { tempDir in let statfs = try StatFS(tempDir) @@ -72,7 +72,7 @@ private struct StatFSTests { } } - @available(System 199, *) + @available(System 1.9.0, *) @Test func readOnlyFlagReflectsWritableFileSystem() async throws { try withTemporaryFilePath(basename: "StatFS_readOnly") { tempDir in let statfs = try StatFS(tempDir) @@ -81,7 +81,7 @@ private struct StatFSTests { } #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) - @available(System 199, *) + @available(System 1.9.0, *) @Test func darwinAndBSDFields() async throws { try withTemporaryFilePath(basename: "StatFS_darwinBSD") { tempDir in let statfs = try StatFS(tempDir) @@ -97,7 +97,7 @@ private struct StatFSTests { } #endif - @available(System 199, *) + @available(System 1.9.0, *) @Test func nonexistentPathThrows() async throws { #expect(throws: Errno.noSuchFileOrDirectory) { _ = try StatFS("/var/empty/definitely/does/not/exist") @@ -107,7 +107,7 @@ private struct StatFSTests { } } - @available(System 199, *) + @available(System 1.9.0, *) @Test func badFileDescriptorThrows() async throws { let badFD = FileDescriptor(rawValue: -1) #expect(throws: Errno.badFileDescriptor) { @@ -115,7 +115,7 @@ private struct StatFSTests { } } - @available(System 199, *) + @available(System 1.9.0, *) @Test func propertiesMatchRawFields() async throws { try withTemporaryFilePath(basename: "StatFS_diff") { tempDir in var raw = CInterop.StatFS() @@ -163,7 +163,7 @@ private struct StatFSTests { } // Each setter writes its own field, and clamps instead of trapping. - @available(System 199, *) + @available(System 1.9.0, *) @Test func settersWriteRawFields() throws { var s = StatFS(rawValue: CInterop.StatFS()) s.blockSize = 1 @@ -190,7 +190,7 @@ private struct StatFSTests { #expect(s.blockSize == Int(clamping: type(of: s.rawValue.f_bsize).max)) } - @available(System 199, *) + @available(System 1.9.0, *) @Test func craftedStructComputesSpace() throws { var raw = CInterop.StatFS() // The block-count unit is f_bsize on Darwin/BSD, f_frsize elsewhere. @@ -210,7 +210,7 @@ private struct StatFSTests { #expect(s.availableSpace == 100 * 512) } - @available(System 199, *) + @available(System 1.9.0, *) @Test func spaceSaturatesOnOverflow() throws { var raw = CInterop.StatFS() #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) @@ -229,7 +229,7 @@ private struct StatFSTests { } #if os(FreeBSD) || os(OpenBSD) - @available(System 199, *) + @available(System 1.9.0, *) @Test func negativeCountsClampToZero() throws { var raw = CInterop.StatFS() raw.f_bsize = 512 @@ -274,7 +274,7 @@ private struct StatFSTests { return String(decoding: result, as: UTF8.self) } - @available(System 199, *) + @available(System 1.9.0, *) @Test func mountFlagsMatchProcMounts() throws { let contents = try _readEntireFile("/proc/self/mounts") @@ -319,7 +319,7 @@ private struct StatFSTests { #endif #if os(Linux) || os(Android) - @available(System 199, *) + @available(System 1.9.0, *) @Test func typeIsMagicNumber() throws { // PROC_SUPER_MAGIC from . #expect(try StatFS("/proc").type == FileSystemType(0x9FA0)) @@ -333,7 +333,7 @@ private struct StatFSTests { // The kernel sets ST_VALID (0x20) in every `f_flags` to mark the field as // filled in, though Bionic's `statfs()` clears it. - @available(System 199, *) + @available(System 1.9.0, *) @Test func mountFlagsOmitValidBit() throws { var raw = CInterop.StatFS() raw.f_flags = 0x20 | 0x01 // ST_VALID | ST_RDONLY @@ -352,7 +352,7 @@ private struct StatFSTests { #endif #if os(Linux) || os(Android) - @available(System 199, *) + @available(System 1.9.0, *) @Test func mountFlagBitsMatchLibc() throws { let expected: [(name: String, literal: CInterop.MountFlags, libc: UInt64)] = [ ("ST_RDONLY", _ST_RDONLY_BIT, _system_get_ST_RDONLY()), @@ -376,7 +376,7 @@ private struct StatFSTests { } #endif - @available(System 199, *) + @available(System 1.9.0, *) @Test func fileSystemIDConformances() throws { let id = FileSystemID(_words: (1, 2)) #expect(id == FileSystemID(_words: (1, 2))) @@ -392,7 +392,7 @@ private struct StatFSTests { } #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) - @available(System 199, *) + @available(System 1.9.0, *) @Test func fileSystemTypeNameConformances() throws { let name: FileSystemTypeName = "apfs" #expect(name == FileSystemTypeName(rawValue: "apfs")) @@ -411,7 +411,7 @@ private struct StatFSTests { #endif #if SYSTEM_PACKAGE_DARWIN - @available(System 199, *) + @available(System 1.9.0, *) @Test func fileSystemTypeNameConstants() throws { #expect(FileSystemTypeName.apfs.rawValue == "apfs") #expect(FileSystemTypeName.hfs.rawValue == "hfs") @@ -420,7 +420,7 @@ private struct StatFSTests { } #endif - @available(System 199, *) + @available(System 1.9.0, *) @Test func descriptions() throws { #expect(MountFlags.readOnly.description == "[.readOnly]") let flags: MountFlags = [.readOnly, .noExecution] @@ -433,7 +433,7 @@ private struct StatFSTests { #if SYSTEM_PACKAGE_DARWIN || os(FreeBSD) || os(OpenBSD) // A name buffer with no NUL terminator (malformed) is read in full. - @available(System 199, *) + @available(System 1.9.0, *) @Test func unterminatedNameBuffers() throws { var raw = CInterop.StatFS() withUnsafeMutableBytes(of: &raw.f_fstypename) { buffer in @@ -451,7 +451,7 @@ private struct StatFSTests { } #endif - @available(System 199, *) + @available(System 1.9.0, *) @Test func equalityAndHashing() throws { try withTemporaryFilePath(basename: "StatFS_equality") { tempDir in let statfs = try StatFS(tempDir)