minor optimization

Author: majcn

src/bin/24.rs

@@ -132,40 +132,36 @@ pub fn part_two(input: &str) -> Option<String> {
                 return false;
             }
 
-            if operator == Operator::Xor {
-                if input.starts_with("x") || input.starts_with("y") {
-                    if !input_with_operator.contains(&(res, Operator::Xor)) {
+            match operator {
+                Operator::Xor => {
+                    if input.starts_with("x") || input.starts_with("y") {
+                        if !input_with_operator.contains(&(res, Operator::Xor)) {
+                            return true;
+                        }
+
+                        if !input_with_operator.contains(&(res, Operator::And)) {
+                            return true;
+                        }
+                    } else if !res.starts_with("z") {
                         return true;
                     }
-
-                    if !input_with_operator.contains(&(res, Operator::And)) {
+                }
+                Operator::And => {
+                    if !input_with_operator.contains(&(res, Operator::Or)) {
                         return true;
                     }
-
-                    if res.starts_with("z") {
+                }
+                Operator::Or => {
+                    if res.starts_with("z") && res != max_z_name {
                         return true;
                     }
-                } else if !res.starts_with("z") {
-                    return true;
-                }
-            }
 
-            if operator == Operator::And {
-                if res.starts_with("z") {
-                    return true;
-                }
-
-                if (input.starts_with("x") || input.starts_with("y"))
-                    && !input_with_operator.contains(&(res, Operator::Or))
-                {
-                    return true;
+                    if input_with_operator.contains(&(res, Operator::Or)) {
+                        return true;
+                    }
                 }
             }
 
-            if operator == Operator::Or && res.starts_with("z") && res != max_z_name {
-                return true;
-            }
-
             false
         })
         .map(|(_, _, _, res)| res)