fix linting issues

Author: skhamis

automation/run_ios_tests.sh

@@ -21,7 +21,8 @@ for arg in "$@"; do
 done
 
 
-export SOURCE_ROOT=$(pwd)
+SOURCE_ROOT=$(pwd)
+export SOURCE_ROOT
 export PROJECT=MozillaRustComponentsWrapper
 
 # Conditionally generate the UniFFi bindings with rust binaries and bundle it into an XCFramework
@@ -31,9 +32,9 @@ if [ "$SKIP_BUILDING" != true ]; then
   ./components/external/glean/glean-core/ios/sdk_generator.sh \
       -g Glean \
       -o ./megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Generated/Glean \
-    ${SOURCE_ROOT}/components/nimbus/metrics.yaml \
-    ${SOURCE_ROOT}/components/sync_manager/metrics.yaml \
-    ${SOURCE_ROOT}/components/sync_manager/pings.yaml
+    "${SOURCE_ROOT}"/components/nimbus/metrics.yaml \
+    "${SOURCE_ROOT}"/components/sync_manager/metrics.yaml \
+    "${SOURCE_ROOT}"/components/sync_manager/pings.yaml
 
   # Build the XCFramework
   ./megazords/ios-rust/build-xcframework.sh --build-profile release
@@ -51,7 +52,7 @@ set -o pipefail
 xcodebuild \
   -scheme MozillaRustComponents \
   -sdk iphonesimulator \
-  -destination 'platform=iOS Simulator,name=iPhone 16e' \
+  -destination 'platform=iOS Simulator,name=iPhone 15' \
   test | tee raw_xcodetest.log | xcpretty
 result=${PIPESTATUS[0]}
 set -e
@@ -60,7 +61,7 @@ set -e
 popd > /dev/null
 
 # Provide clear messaging based on test results
-if [ $result -eq 0 ]; then
+if [ "$result" -eq 0 ]; then
   echo "✅ Swift tests pass!"
 else
   echo "❌ Swift tests failed!"

megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Sync15/RustSyncTelemetryPing.swift

@@ -10,7 +10,7 @@ public class RustSyncTelemetryPing {
     public let events: [EventInfo]
     public let syncs: [SyncInfo]
 
-    private static let EMPTY_UID = String(repeating: "0", count: 32)
+    private static let EMPTYUID = String(repeating: "0", count: 32)
 
     init(version: Int, uid: String, events: [EventInfo], syncs: [SyncInfo]) {
         self.version = version
@@ -21,7 +21,7 @@ public class RustSyncTelemetryPing {
 
     static func empty() -> RustSyncTelemetryPing {
         return RustSyncTelemetryPing(version: 1,
-                                     uid: EMPTY_UID,
+                                     uid: EMPTYUID,
                                      events: [EventInfo](),
                                      syncs: [SyncInfo]())
     }
@@ -44,7 +44,7 @@ public class RustSyncTelemetryPing {
 
         return try RustSyncTelemetryPing(version: version,
                                          uid: stringOrNull(jsonObject: jsonObject,
-                                                           key: "uid") ?? EMPTY_UID,
+                                                           key: "uid") ?? EMPTYUID,
                                          events: events, syncs: syncs)
     }
 
@@ -224,7 +224,7 @@ public class OutgoingInfo {
     static func fromJSONArray(jsonArray: [[String: Any]]) -> [OutgoingInfo] {
         var result = [OutgoingInfo]()
 
-        for (_, item) in jsonArray.enumerated() {
+        for item in jsonArray {
             result.append(fromJSON(jsonObject: item))
         }
 
@@ -288,7 +288,7 @@ public class ProblemInfo {
     static func fromJSONArray(jsonArray: [[String: Any]]) throws -> [ProblemInfo] {
         var result = [ProblemInfo]()
 
-        for (_, item) in jsonArray.enumerated() {
+        for item in jsonArray {
             try result.append(fromJSON(jsonObject: item))
         }
 
@@ -379,7 +379,7 @@ public class EventInfo {
     static func fromJSONArray(jsonArray: [[String: Any]]) throws -> [EventInfo] {
         var result = [EventInfo]()
 
-        for (_, item) in jsonArray.enumerated() {
+        for item in jsonArray {
             try result.append(fromJSON(jsonObject: item))
         }
 

megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Sync15/SyncUnlockInfo.swift

@@ -14,7 +14,14 @@ open class SyncUnlockInfo {
     public var loginEncryptionKey: String
     public var tabsLocalId: String?
 
-    public init(kid: String, fxaAccessToken: String, syncKey: String, tokenserverURL: String, loginEncryptionKey: String, tabsLocalId: String? = nil) {
+    public init(
+        kid: String,
+        fxaAccessToken: String,
+        syncKey: String,
+        tokenserverURL: String,
+        loginEncryptionKey: String,
+        tabsLocalId: String? = nil
+    ) {
         self.kid = kid
         self.fxaAccessToken = fxaAccessToken
         self.syncKey = syncKey

taskcluster/scripts/build-and-test-swift.py

@@ -12,7 +12,7 @@
 # Repository root dir
 ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
 
-WRAPPER_DIR = "megazords/ios-rust/Sources/MozillaRustComponentsWrapper/"
+WRAPPER_DIR = pathlib.Path("megazords/ios-rust/Sources/MozillaRustComponentsWrapper/")
 # List of globs to copy the sources from
 SOURCE_TO_COPY = [
     WRAPPER_DIR / "ASOhttpClient",