Improve performance by making parameter rhs of optional logical ope…

…rators `Bool` a autoclosure
F1248 · Jan 6, 2025 · 836d04b · 836d04b
1 parent dc18771
commit 836d04b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Genius/Extensions/Swift/Bool.swift b/Genius/Extensions/Swift/Bool.swift
@@ -46,19 +46,19 @@ extension Bool? {
 		bool.map(!)
 	}
 
-	static func &&? (lhs: Self, rhs: Self) -> Self {
-		if let lhs, let rhs {
-			lhs && rhs
-		} else if [lhs, rhs].contains(false) {
-			false
-		} else { nil }
+	static func &&? (lhs: Self, rhs: @autoclosure () -> Self) -> Self {
+		switch lhs {
+			case true: rhs()
+			case false: false
+			default: rhs() == false ? false : nil
+		}
 	}
 
-	static func ||? (lhs: Self, rhs: Self) -> Self {
-		if let lhs, let rhs {
-			lhs || rhs
-		} else if [lhs, rhs].contains(true) {
-			true
-		} else { nil }
+	static func ||? (lhs: Self, rhs: @autoclosure () -> Self) -> Self {
+		switch lhs {
+			case true: true
+			case false: rhs()
+			default: rhs() == true ? true : nil
+		}
 	}
 }