Removed Redundant returns

yakovmanshin · May 17, 2024 · f0fd45f · f0fd45f
1 parent 6aba5f1
commit f0fd45f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 30 deletions.
diff --git a/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift b/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift
@@ -81,23 +81,16 @@ final class FeatureFlagValueTransformerTests: XCTestCase {
     func test_valueFromRawValue_enumFromInt() {
         let transformer = FeatureFlagValueTransformer { (age: Int) -> AgeGroup in
             switch age {
-            case ..<13:
-                return .under13
-            case 13...17:
-                return .between13And17
-            case 18...:
-                return .over17
-            default:
-                return .under13
+            case ..<13: .under13
+            case 13...17: .between13And17
+            case 18...: .over17
+            default: .under13
             }
         } rawValueFromValue: { group in
             switch group {
-            case .under13:
-                return 13
-            case .between13And17:
-                return 17
-            case .over17:
-                return 18
+            case .under13: 13
+            case .between13And17: 17
+            case .over17: 18
             }
         }
 

diff --git a/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift
@@ -29,14 +29,14 @@ extension FeatureFlagStoreMock: FeatureFlagStore {
     func value<Value>(for key: FeatureFlagKey) async -> Result<Value, FeatureFlagStoreError> {
         value_invocationCount += 1
         value_keys.append(key)
-        switch value_result! {
+        return switch value_result! {
         case .success(let anyValue):
             if let value = anyValue as? Value {
-                return .success(value)
+                .success(value)
             } else {
-                return .failure(.typeMismatch)
+                .failure(.typeMismatch)
             }
-        case .failure(let error): return .failure(error)
+        case .failure(let error): .failure(error)
         }
     }
 

diff --git a/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift
@@ -37,14 +37,14 @@ extension MutableFeatureFlagStoreMock: MutableFeatureFlagStore {
     func value<Value>(for key: FeatureFlagKey) async -> Result<Value, FeatureFlagStoreError> {
         value_invocationCount += 1
         value_keys.append(key)
-        switch value_result! {
+        return switch value_result! {
         case .success(let anyValue):
             if let value = anyValue as? Value {
-                return .success(value)
+                .success(value)
             } else {
-                return .failure(.typeMismatch)
+                .failure(.typeMismatch)
             }
-        case .failure(let error): return .failure(error)
+        case .failure(let error): .failure(error)
         }
     }
 

diff --git a/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift
@@ -29,14 +29,14 @@ extension SynchronousFeatureFlagStoreMock: SynchronousFeatureFlagStore {
     func valueSync<Value>(for key: FeatureFlagKey) -> Result<Value, FeatureFlagStoreError> {
         valueSync_invocationCount += 1
         valueSync_keys.append(key)
-        switch valueSync_result! {
+        return switch valueSync_result! {
         case .success(let anyValue):
             if let value = anyValue as? Value {
-                return .success(value)
+                .success(value)
             } else {
-                return .failure(.typeMismatch)
+                .failure(.typeMismatch)
             }
-        case .failure(let error): return .failure(error)
+        case .failure(let error): .failure(error)
         }
     }
 

diff --git a/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift
@@ -37,14 +37,14 @@ extension SynchronousMutableFeatureFlagStoreMock: SynchronousMutableFeatureFlagS
     func valueSync<Value>(for key: FeatureFlagKey) -> Result<Value, FeatureFlagStoreError> {
         valueSync_invocationCount += 1
         valueSync_keys.append(key)
-        switch valueSync_result! {
+        return switch valueSync_result! {
         case .success(let anyValue):
             if let value = anyValue as? Value {
-                return .success(value)
+                .success(value)
             } else {
-                return .failure(.typeMismatch)
+                .failure(.typeMismatch)
             }
-        case .failure(let error): return .failure(error)
+        case .failure(let error): .failure(error)
         }
     }