Mhd Hejazi 5 years ago
parent
commit
045f6ccd86
3 changed files with 9 additions and 6 deletions
  1. 1 0
      .swiftlint.yml
  2. 5 3
      Sources/Dynamic/Dynamic.swift
  3. 3 3
      Sources/Dynamic/Logger.swift

+ 1 - 0
.swiftlint.yml

@@ -2,6 +2,7 @@ disabled_rules:
   - type_body_length
   - file_length
   - function_body_length
+  - orphaned_doc_comment
   - vertical_parameter_alignment # Many false positives because of tabs
 
 opt_in_rules:

+ 5 - 3
Sources/Dynamic/Dynamic.swift

@@ -55,7 +55,7 @@ public class Dynamic: CustomDebugStringConvertible, Loggable {
 
     public subscript(dynamicMember member: String) -> Dynamic {
         get {
-            return getProperty(member)
+            getProperty(member)
         }
         set {
             self[dynamicMember: member] = newValue.resolve()
@@ -64,7 +64,7 @@ public class Dynamic: CustomDebugStringConvertible, Loggable {
 
     public subscript<T>(dynamicMember member: String) -> T? {
         get {
-            return self[dynamicMember: member].unwrap()
+            self[dynamicMember: member].unwrap()
         }
         set {
             setProperty(member, value: newValue)
@@ -88,6 +88,7 @@ public class Dynamic: CustomDebugStringConvertible, Loggable {
         return result.unwrap()
     }
 
+    @discardableResult
     public func dynamicallyCall(withKeywordArguments pairs: KeyValuePairs<String, Any?>) -> Dynamic {
         guard let name = memberName else { return self }
 
@@ -102,6 +103,7 @@ public class Dynamic: CustomDebugStringConvertible, Loggable {
         return self
     }
 
+    @discardableResult
     public func dynamicallyCall<T>(withKeywordArguments pairs: KeyValuePairs<String, Any?>) -> T? {
         let result: Dynamic = dynamicallyCall(withKeywordArguments: pairs)
         return result.unwrap()
@@ -123,7 +125,7 @@ public class Dynamic: CustomDebugStringConvertible, Loggable {
         log(.end)
 
         let setter = "set" + (name.first?.uppercased() ?? "") + name.dropFirst()
-        _ = Dynamic(resolved, memberName: setter).dynamicallyCall(withArguments: [value])
+        Dynamic(resolved, memberName: setter)(value)
     }
 
     private func callMethod(_ selector: String, with arguments: [Any?] = []) {

+ 3 - 3
Sources/Dynamic/Logger.swift

@@ -69,7 +69,7 @@ class Logger {
 
     @discardableResult
     func log(_ items: Any..., withBullet: Bool = true) -> Logger {
-        return log(items, withBullet: withBullet)
+        log(items, withBullet: withBullet)
     }
 
     @discardableResult
@@ -107,11 +107,11 @@ class Logger {
 class DummyLogger: Logger {
     @discardableResult
     override func log(_ items: [Any], withBullet: Bool = true) -> Logger {
-        return self
+        self
     }
 
     @discardableResult
     override func log(_ group: Group) -> Logger {
-        return self
+        self
     }
 }