From 3d80103536ccba2d959762ecbd37fdc1740d52e4 Mon Sep 17 00:00:00 2001 From: Jonathan Flueren Date: Tue, 13 Dec 2022 12:35:04 +0100 Subject: [PATCH] Day 13 - task 1 --- src/days/d13.rs | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/days/d13.rs b/src/days/d13.rs index 2bd3270..bfe58a0 100644 --- a/src/days/d13.rs +++ b/src/days/d13.rs @@ -1,4 +1,4 @@ -use std::fs; +use std::{fs, cmp::Ordering}; use serde_json::Value; pub fn solve() { @@ -94,28 +94,11 @@ fn is_right_order(values: (&Value, &Value)) -> Ordered { let left = left.unwrap(); let right = right.unwrap(); - return is_right_order((&left, &right)); + let res = is_right_order((&left, &right)); + if res != Ordered::Maybe { + return res + } } - - let mut current_order = Ordered::Maybe; - a0.iter() - .enumerate() - .for_each(|(i, _)| { - if current_order == Ordered::No - || current_order == Ordered::Yes { - return - } - if a1.len() < i+1 { - current_order = Ordered::No; - println!("2nd arr too short"); - return - } - current_order = is_right_order((&a0[i], &a1[i])); - }); - if a0.len() > a1.len() && current_order != Ordered::No { - return Ordered::Yes - } - return current_order; } Ordered::Yes