fix linting issues

Author: skhamis

Diff for: .swiftlint.yml

@@ -1,19 +1,18 @@
 included: # paths to include during linting. `--path` is ignored if present.
-  - megazords
-  - components/places/ios
-  - components/support/ios
-  - components/logins/ios
-  - components/fxa-client/ios
-  - components/nimbus/ios
+  - "megazords/ios-rust/Sources"
+
 excluded:
   # We no longer use carthage. However, some developers might still
   # have the Carthage directory in their local environment. It will
   # create linting noise if we don't exclude it.
   - Carthage
   - "**/*/ios/Generated"
-  - "megazords/ios/MozillaAppServicesTests"
-  - "megazords/ios-rust/MozillaTestServices/MozillaTestServicesTests"
-  - "megazords/ios-rust/MozillaTestServices/MozillaTestServices/Generated"
+  - "megazords/ios-rust/tests"
+  - "megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Generated"
+  # Sync manager wasn't added to the swiftlint checks before and didn't want to
+  # break APIs during the xcodeproj migration, so ignoring for now but we should
+  # eventually fix
+  - "megazords/ios-rust/Sources/MozillaRustComponentsWrapper/SyncManager"
 
 disabled_rules:
   - file_length
@@ -38,3 +37,5 @@ identifier_name:
   min_length:
     warning: 0
     error: 0
+  # Turn off complaining about having _ in variable names
+  allowed_symbols: "_"

Diff for: Cargo.lock

@@ -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!"

Diff for: automation/run_ios_tests.sh

@@ -445,11 +445,10 @@ def cargo_fmt(package=None, fix_issues=False):
 def swift_format():
     swift_format_args = [
         "megazords",
-        "components/*/ios",
         "--exclude",
         "**/Generated",
         "--exclude",
-        "components/nimbus/ios/Nimbus/Utils",
+        "megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Nimbus/Utils",
         "--lint",
         "--swiftversion",
         "5",

Diff for: automation/tests.py

@@ -8,7 +8,7 @@ let package = Package(
         .library(name: "MozillaRustComponents", targets: ["MozillaRustComponentsWrapper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/mozilla/glean-swift", from: "64.0.0")
+        .package(url: "https://github.com/mozilla/glean-swift", from: "64.0.0"),
     ],
     targets: [
         // Binary target XCFramework, contains our rust binaries and headers
@@ -30,4 +30,4 @@ let package = Package(
             dependencies: ["MozillaRustComponentsWrapper"]
         ),
     ]
-)
+)

Diff for: megazords/ios-rust/Package.swift

@@ -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))
         }
 

Diff for: megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Sync15/RustSyncTelemetryPing.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

Diff for: megazords/ios-rust/Sources/MozillaRustComponentsWrapper/Sync15/SyncUnlockInfo.swift

@@ -28,9 +28,12 @@ enum TelemetryReportingError: Error {
 func processSyncTelemetry(syncTelemetry: RustSyncTelemetryPing,
                           submitGlobalPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.sync.submit,
                           submitHistoryPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.historySync.submit,
-                          submitBookmarksPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.bookmarksSync.submit,
-                          submitLoginsPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.loginsSync.submit,
-                          submitCreditCardsPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.creditcardsSync.submit,
+                          submitBookmarksPing: (NoReasonCodes?) -> Void
+                              = GleanMetrics.Pings.shared.bookmarksSync.submit,
+                          submitLoginsPing: (NoReasonCodes?) -> Void
+                              = GleanMetrics.Pings.shared.loginsSync.submit,
+                          submitCreditCardsPing: (NoReasonCodes?) -> Void
+                              = GleanMetrics.Pings.shared.creditcardsSync.submit,
                           submitTabsPing: (NoReasonCodes?) -> Void = GleanMetrics.Pings.shared.tabsSync.submit) throws
 {
     for syncInfo in syncTelemetry.syncs {

Diff for: megazords/ios-rust/Sources/MozillaRustComponentsWrapper/SyncManager/SyncManagerTelemetry.swift

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@testable import MozillaRustComponentsWrapper
 import Foundation
+@testable import MozillaRustComponentsWrapper
 
 // Arrays are not thread-safe in Swift.
 let queue = DispatchQueue(label: "InvocationsArrayQueue")

Diff for: megazords/ios-rust/tests/MozillaRustComponentsTests/FxAccountMocks.swift

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@testable import MozillaRustComponentsWrapper
 import Glean
+@testable import MozillaRustComponentsWrapper
 import UIKit
 import XCTest
 

Diff for: megazords/ios-rust/tests/MozillaRustComponentsTests/NimbusTests.swift

@@ -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",
@@ -191,7 +191,7 @@ def copy_sources(out_dir, sources):
     ensure_dir(out_dir)
     for source in sources:
         log(f"copying {source}")
-        for path in ROOT_DIR.glob(source):
+        for path in ROOT_DIR.glob(str(source)):
             subprocess.check_call(["cp", "-r", path, out_dir])