Merge pull request Quick#417 from ysk-tngc/issue_370/fix_unused_optio…

…nal_binding_violation [SwiftLint] fix unused optional binding vaiolation
Megal · Apr 18, 2017 · 9ba8bfe · 9ba8bfe
2 parents abc2c86 + 84877c9
commit 9ba8bfe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Sources/Nimble/Matchers/BeginWith.swift b/Sources/Nimble/Matchers/BeginWith.swift
@@ -50,7 +50,7 @@ extension NMBObjCMatcher {
     public class func beginWithMatcher(_ expected: Any) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let actual = try! actualExpression.evaluate()
-            if let _ = actual as? String {
+            if (actual as? String) != nil {
                 let expr = actualExpression.cast { $0 as? String }
                 return try! beginWith(expected as! String).matches(expr, failureMessage: failureMessage)
             } else {

diff --git a/Sources/Nimble/Matchers/EndWith.swift b/Sources/Nimble/Matchers/EndWith.swift
@@ -59,7 +59,7 @@ extension NMBObjCMatcher {
     public class func endWithMatcher(_ expected: Any) -> NMBObjCMatcher {
         return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in
             let actual = try! actualExpression.evaluate()
-            if let _ = actual as? String {
+            if (actual as? String) != nil {
                 let expr = actualExpression.cast { $0 as? String }
                 return try! endWith(expected as! String).matches(expr, failureMessage: failureMessage)
             } else {

diff --git a/Sources/Nimble/Matchers/RaisesException.swift b/Sources/Nimble/Matchers/RaisesException.swift
@@ -52,7 +52,7 @@ internal func setFailureMessageForException(
         if let userInfo = userInfo {
             failureMessage.postfixMessage += " with userInfo <\(userInfo)>"
         }
-        if let _ = closure {
+        if closure != nil {
             failureMessage.postfixMessage += " that satisfies block"
         }
         if named == nil && reason == nil && userInfo == nil && closure == nil {

diff --git a/Sources/Nimble/Utils/Errors.swift b/Sources/Nimble/Utils/Errors.swift
@@ -16,7 +16,7 @@ internal func setFailureMessageForError<T: Error>(
     } else if errorType != nil || closure != nil {
         failureMessage.postfixMessage += " from type <\(T.self)>"
     }
-    if let _ = closure {
+    if closure != nil {
         failureMessage.postfixMessage += " that satisfies block"
     }
     if error == nil && errorType == nil && closure == nil {
@@ -101,7 +101,7 @@ internal func setFailureMessageForError(
     closure: ((Error) -> Void)?) {
     failureMessage.postfixMessage = "throw error"
 
-    if let _ = closure {
+    if closure != nil {
         failureMessage.postfixMessage += " that satisfies block"
     } else {
         failureMessage.postfixMessage = "throw any error"