From 9028834936d402d34ada2865f94d2183b6423027 Mon Sep 17 00:00:00 2001 From: Graeme Arthur Date: Fri, 29 Sep 2023 15:14:40 +0100 Subject: [PATCH] Fix linting issues after CI SwiftLint update (#2055) Co-authored-by: Chris Brind --- DuckDuckGo/AutofillListItemTableViewCell.swift | 4 ---- DuckDuckGo/DaxDialogs.swift | 2 +- DuckDuckGo/KeychainItemsDebugViewController.swift | 4 ---- DuckDuckGo/OnboardingDefaultBroswerViewController.swift | 3 --- DuckDuckGo/SaveLoginViewController.swift | 4 ---- DuckDuckGo/SettingsViewController.swift | 4 ---- DuckDuckGoTests/PrivacyIconLogicTests.swift | 8 -------- DuckDuckGoTests/TrackerAnimationLogicTests.swift | 8 -------- IntegrationTests/AtbServerTests.swift | 6 +----- 9 files changed, 2 insertions(+), 41 deletions(-) diff --git a/DuckDuckGo/AutofillListItemTableViewCell.swift b/DuckDuckGo/AutofillListItemTableViewCell.swift index f531ff4aa6..209ed903d8 100644 --- a/DuckDuckGo/AutofillListItemTableViewCell.swift +++ b/DuckDuckGo/AutofillListItemTableViewCell.swift @@ -118,10 +118,6 @@ class AutofillListItemTableViewCell: UITableViewCell { contentStackView.bottomAnchor.constraint(equalTo: margins.bottomAnchor) ]) } - - override func setSelected(_ selected: Bool, animated: Bool) { - super.setSelected(selected, animated: animated) - } private func setupContentView(with item: AutofillLoginListItemViewModel) { titleLabel.text = item.title diff --git a/DuckDuckGo/DaxDialogs.swift b/DuckDuckGo/DaxDialogs.swift index b26f149fc9..5e346d62c1 100644 --- a/DuckDuckGo/DaxDialogs.swift +++ b/DuckDuckGo/DaxDialogs.swift @@ -73,7 +73,7 @@ final class DaxDialogs { case .siteIsMajorTracker, .siteOwnedByMajorTracker: settings.browsingMajorTrackingSiteShown = flag settings.browsingWithoutTrackersShown = flag - } + } } struct BrowsingSpec: Equatable { diff --git a/DuckDuckGo/KeychainItemsDebugViewController.swift b/DuckDuckGo/KeychainItemsDebugViewController.swift index dc46a1cb80..8caa29ec13 100644 --- a/DuckDuckGo/KeychainItemsDebugViewController.swift +++ b/DuckDuckGo/KeychainItemsDebugViewController.swift @@ -115,10 +115,6 @@ private enum SecClass: CaseIterable { class KeychainItemsDebugViewController: UITableViewController { - override func viewDidLoad() { - super.viewDidLoad() - } - override func numberOfSections(in tableView: UITableView) -> Int { return SecClass.allCases.count } diff --git a/DuckDuckGo/OnboardingDefaultBroswerViewController.swift b/DuckDuckGo/OnboardingDefaultBroswerViewController.swift index addf162132..beb730753b 100644 --- a/DuckDuckGo/OnboardingDefaultBroswerViewController.swift +++ b/DuckDuckGo/OnboardingDefaultBroswerViewController.swift @@ -41,7 +41,4 @@ class OnboardingDefaultBroswerViewController: OnboardingContentViewController { super.onContinuePressed(navigationHandler: navigationHandler) } - override func onSkipPressed(navigationHandler: @escaping () -> Void) { - super.onSkipPressed(navigationHandler: navigationHandler) - } } diff --git a/DuckDuckGo/SaveLoginViewController.swift b/DuckDuckGo/SaveLoginViewController.swift index 7f1bcf98fe..fbd144e98b 100644 --- a/DuckDuckGo/SaveLoginViewController.swift +++ b/DuckDuckGo/SaveLoginViewController.swift @@ -61,10 +61,6 @@ class SaveLoginViewController: UIViewController { viewModel?.viewControllerDidAppear() } - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - } - override func viewDidDisappear(_ animated: Bool) { super.viewDidDisappear(animated) diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift index e184f748e7..bf847f37cc 100644 --- a/DuckDuckGo/SettingsViewController.swift +++ b/DuckDuckGo/SettingsViewController.swift @@ -544,10 +544,6 @@ class SettingsViewController: UITableViewController { } } - override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? { - return super.tableView(tableView, titleForFooterInSection: section) - } - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { let rows = super.tableView(tableView, numberOfRowsInSection: section) if section == appearanceSectionIndex && textSizeCell.isHidden { diff --git a/DuckDuckGoTests/PrivacyIconLogicTests.swift b/DuckDuckGoTests/PrivacyIconLogicTests.swift index ad8c995326..a14220bdc8 100644 --- a/DuckDuckGoTests/PrivacyIconLogicTests.swift +++ b/DuckDuckGoTests/PrivacyIconLogicTests.swift @@ -33,14 +33,6 @@ class PrivacyIconLogicTests: XCTestCase { static let ddgMainURL = URL(string: "https://duckduckgo.com")! static let ddgSupportURL = URL(string: "https://duckduckgo.com/email/settings/support")! - override func setUp() { - super.setUp() - } - - override func tearDown() { - super.tearDown() - } - func testPrivacyIconIsShieldForPageURL() { let url = PrivacyIconLogicTests.insecurePageURL let icon = PrivacyIconLogic.privacyIcon(for: url) diff --git a/DuckDuckGoTests/TrackerAnimationLogicTests.swift b/DuckDuckGoTests/TrackerAnimationLogicTests.swift index b94ce01f99..07302fc11f 100644 --- a/DuckDuckGoTests/TrackerAnimationLogicTests.swift +++ b/DuckDuckGoTests/TrackerAnimationLogicTests.swift @@ -30,14 +30,6 @@ class TrackerAnimationLogicTests: XCTestCase { static let pageURL = URL(string: "https://example.com")! - override func setUp() { - super.setUp() - } - - override func tearDown() { - super.tearDown() - } - func testAnimationLogicToAnimateTrackersIfAnyBlocked() { let trackerInfo = makeBlockedTrackerInfo(pageURL: Self.pageURL) XCTAssertTrue(TrackerAnimationLogic.shouldAnimateTrackers(for: trackerInfo)) diff --git a/IntegrationTests/AtbServerTests.swift b/IntegrationTests/AtbServerTests.swift index fe395bac42..8d7a50a7bc 100644 --- a/IntegrationTests/AtbServerTests.swift +++ b/IntegrationTests/AtbServerTests.swift @@ -37,11 +37,7 @@ class AtbServerTests: XCTestCase { loader = StatisticsLoader(statisticsStore: store) } - - override func tearDown() { - super.tearDown() - } - + func testExtiCall() { let waitForCompletion = expectation(description: "wait for completion")