summaryrefslogtreecommitdiffhomepage
path: root/ios/Operations
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2023-06-21 16:20:05 +0200
committerBug Magnet <marco.nikic@mullvad.net>2023-06-27 15:54:20 +0200
commit7e8e9d306d56e4534c95ed07a796aa0475ff0721 (patch)
tree76537805fc481f828728a4d67eee39a287dc26e0 /ios/Operations
parent28b3234f329d715c8dc8a11da97ee6fa9bf19b2f (diff)
downloadmullvadvpn-7e8e9d306d56e4534c95ed07a796aa0475ff0721.tar.xz
mullvadvpn-7e8e9d306d56e4534c95ed07a796aa0475ff0721.zip
New swiftformat rule, enable google swift guidelines
Diffstat (limited to 'ios/Operations')
-rw-r--r--ios/Operations/AsyncOperation.swift18
-rw-r--r--ios/Operations/AsyncOperationQueue.swift4
-rw-r--r--ios/Operations/BlockCondition.swift4
-rw-r--r--ios/Operations/MutuallyExclusive.swift2
-rw-r--r--ios/Operations/NoCancelledDependenciesCondition.swift6
-rw-r--r--ios/Operations/NoFailedDependenciesCondition.swift4
-rw-r--r--ios/Operations/OperationError.swift2
7 files changed, 20 insertions, 20 deletions
diff --git a/ios/Operations/AsyncOperation.swift b/ios/Operations/AsyncOperation.swift
index ca11e86d7e..7ae6eea6d2 100644
--- a/ios/Operations/AsyncOperation.swift
+++ b/ios/Operations/AsyncOperation.swift
@@ -17,7 +17,7 @@ import Foundation
case finished
static func < (lhs: State, rhs: State) -> Bool {
- return lhs.rawValue < rhs.rawValue
+ lhs.rawValue < rhs.rawValue
}
var description: String {
@@ -114,7 +114,7 @@ open class AsyncOperation: Operation {
}
public var error: Error? {
- return _error
+ _error
}
override public final var isReady: Bool {
@@ -141,19 +141,19 @@ open class AsyncOperation: Operation {
}
override public final var isExecuting: Bool {
- return state == .executing
+ state == .executing
}
override public final var isFinished: Bool {
- return state == .finished
+ state == .finished
}
override public final var isCancelled: Bool {
- return _isCancelled
+ _isCancelled
}
override public final var isAsynchronous: Bool {
- return true
+ true
}
// MARK: - Observers
@@ -278,15 +278,15 @@ open class AsyncOperation: Operation {
}
@objc class func keyPathsForValuesAffectingIsReady() -> Set<String> {
- return [#keyPath(state)]
+ [#keyPath(state)]
}
@objc class func keyPathsForValuesAffectingIsExecuting() -> Set<String> {
- return [#keyPath(state)]
+ [#keyPath(state)]
}
@objc class func keyPathsForValuesAffectingIsFinished() -> Set<String> {
- return [#keyPath(state)]
+ [#keyPath(state)]
}
// MARK: - Lifecycle
diff --git a/ios/Operations/AsyncOperationQueue.swift b/ios/Operations/AsyncOperationQueue.swift
index d1269a8175..1944dccf25 100644
--- a/ios/Operations/AsyncOperationQueue.swift
+++ b/ios/Operations/AsyncOperationQueue.swift
@@ -13,10 +13,10 @@ public final class AsyncOperationQueue: OperationQueue {
if let operation = operation as? AsyncOperation {
let categories = operation.conditions
.filter { condition in
- return condition.isMutuallyExclusive
+ condition.isMutuallyExclusive
}
.map { condition in
- return condition.name
+ condition.name
}
if !categories.isEmpty {
diff --git a/ios/Operations/BlockCondition.swift b/ios/Operations/BlockCondition.swift
index e6aafa1e2d..79cf14079f 100644
--- a/ios/Operations/BlockCondition.swift
+++ b/ios/Operations/BlockCondition.swift
@@ -12,11 +12,11 @@ public final class BlockCondition: OperationCondition {
public typealias HandlerBlock = (Operation, @escaping (Bool) -> Void) -> Void
public var name: String {
- return "BlockCondition"
+ "BlockCondition"
}
public var isMutuallyExclusive: Bool {
- return false
+ false
}
public let block: HandlerBlock
diff --git a/ios/Operations/MutuallyExclusive.swift b/ios/Operations/MutuallyExclusive.swift
index b9097d3420..8fe4595a92 100644
--- a/ios/Operations/MutuallyExclusive.swift
+++ b/ios/Operations/MutuallyExclusive.swift
@@ -12,7 +12,7 @@ public final class MutuallyExclusive: OperationCondition {
public let name: String
public var isMutuallyExclusive: Bool {
- return true
+ true
}
public init(category: String) {
diff --git a/ios/Operations/NoCancelledDependenciesCondition.swift b/ios/Operations/NoCancelledDependenciesCondition.swift
index da562153ce..40175bd84a 100644
--- a/ios/Operations/NoCancelledDependenciesCondition.swift
+++ b/ios/Operations/NoCancelledDependenciesCondition.swift
@@ -10,18 +10,18 @@ import Foundation
public final class NoCancelledDependenciesCondition: OperationCondition {
public var name: String {
- return "NoCancelledDependenciesCondition"
+ "NoCancelledDependenciesCondition"
}
public var isMutuallyExclusive: Bool {
- return false
+ false
}
public init() {}
public func evaluate(for operation: Operation, completion: @escaping (Bool) -> Void) {
let satisfy = operation.dependencies.allSatisfy { operation in
- return !operation.isCancelled
+ !operation.isCancelled
}
completion(satisfy)
diff --git a/ios/Operations/NoFailedDependenciesCondition.swift b/ios/Operations/NoFailedDependenciesCondition.swift
index 81523e511d..1ca5500ed0 100644
--- a/ios/Operations/NoFailedDependenciesCondition.swift
+++ b/ios/Operations/NoFailedDependenciesCondition.swift
@@ -10,11 +10,11 @@ import Foundation
public final class NoFailedDependenciesCondition: OperationCondition {
public var name: String {
- return "NoFailedDependenciesCondition"
+ "NoFailedDependenciesCondition"
}
public var isMutuallyExclusive: Bool {
- return false
+ false
}
public let ignoreCancellations: Bool
diff --git a/ios/Operations/OperationError.swift b/ios/Operations/OperationError.swift
index 3b96cf6c82..665f1e801c 100644
--- a/ios/Operations/OperationError.swift
+++ b/ios/Operations/OperationError.swift
@@ -27,6 +27,6 @@ public enum OperationError: LocalizedError, Equatable {
extension Error {
public var isOperationCancellationError: Bool {
- return (self as? OperationError) == .cancelled
+ (self as? OperationError) == .cancelled
}
}