Cleanup

sersoft-gmbh · Feb 27, 2023 · 09fa41d · 09fa41d
1 parent 9bb082b
commit 09fa41d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/Sources/DeviceInformation/DeviceInfo.swift b/Sources/DeviceInformation/DeviceInfo.swift
@@ -64,7 +64,6 @@ public struct DeviceInfo: Equatable, Identifiable, Sendable {
     /// The operating system information.
     public let operatingSystem: OperatingSystem
 
-    /// See `Identifiable.id`.
     @inlinable
     public var id: String { identifier }
 

diff --git a/Sources/DeviceInformation/PlatformIdentifiers.swift b/Sources/DeviceInformation/PlatformIdentifiers.swift
@@ -1,5 +1,3 @@
-import Sysctl
-
 // Helpful pages:
 // - https://everymac.com/
 // - https://www.theiphonewiki.com/wiki/Main_Page
@@ -223,7 +221,6 @@ extension DeviceInfo {
         "AirTag1,1"        : "AirTags",
 
 
-        // TODO: Add (more / older) Macs
         // MARK: Macs
         "iMac21,1"         : "iMac 24\" M1",
         "iMac21,2"         : "iMac 24\" M1",

diff --git a/Tests/DeviceInformationTests/DeviceInfoTests.swift b/Tests/DeviceInformationTests/DeviceInfoTests.swift
@@ -11,11 +11,11 @@ import SwiftUI
 final class DeviceInfoTests: XCTestCase {
     func testCurrentDeviceInfo() {
         let deviceInfo = DeviceInfo.current
-        #if os(macOS) || targetEnvironment(macCatalyst)
+#if os(macOS) || targetEnvironment(macCatalyst)
         XCTAssertEqual(deviceInfo.identifier, SystemControl().hardware.model)
-        #else
+#else
         XCTAssertEqual(deviceInfo.identifier, SystemControl().hardware.machine)
-        #endif
+#endif
         XCTAssertEqual(deviceInfo.id, deviceInfo.identifier)
         XCTAssertEqual(deviceInfo.name,
                        DeviceInfo._deviceIdentifierToNameMapping[deviceInfo.identifier])
@@ -26,14 +26,13 @@ final class DeviceInfoTests: XCTestCase {
         XCTAssertEqual(deviceInfo.operatingSystem.build, SystemControl().kernel.osBuild)
     }
 
-    #if arch(arm64) || arch(x86_64)
-    #if canImport(Combine) && canImport(SwiftUI)
+#if arch(arm64) || arch(x86_64)
+#if canImport(Combine) && canImport(SwiftUI)
     func testSwiftUIEnvironment() throws {
-        guard #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) else {
-            throw XCTSkip()
-        }
+        guard #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+        else { throw XCTSkip() }
         XCTAssertEqual(EnvironmentValues().deviceInfo, .current)
     }
-    #endif
-    #endif
+#endif
+#endif
 }