refactor(06/2015): simplify parsing

Author: manhunto

src/solutions/year2015/day06.rs

@@ -31,29 +31,23 @@ impl Day06 {
         input
             .lines()
             .map(|line| -> Box<dyn Instruction> {
-                if line.starts_with("turn on ") {
-                    let trimmed = line.trim_start_matches("turn on ");
-
-                    Box::new(TurnOn::from(self.parse_points(trimmed)))
-                } else if line.starts_with("turn off ") {
-                    let trimmed = line.trim_start_matches("turn off ");
-
-                    Box::new(TurnOff::from(self.parse_points(trimmed)))
-                } else if line.starts_with("toggle ") {
-                    let trimmed = line.trim_start_matches("toggle ");
-
-                    Box::new(Toggle::from(self.parse_points(trimmed)))
+                let parts = line.split_whitespace().collect::<Vec<_>>();
+
+                if parts[0] == "turn" && parts[1] == "on" {
+                    Box::new(TurnOn::from(self.parse_points(parts[2], parts[4])))
+                } else if parts[0] == "turn" && parts[1] == "off" {
+                    Box::new(TurnOff::from(self.parse_points(parts[2], parts[4])))
+                } else if parts[0] == "toggle" {
+                    Box::new(Toggle::from(self.parse_points(parts[1], parts[3])))
                 } else {
                     unreachable!()
                 }
             })
             .collect()
     }
 
-    fn parse_points(&self, points_str: &str) -> (Point, Point) {
-        let p = points_str.split_once(" through ").unwrap();
-
-        (p.0.parse().unwrap(), p.1.parse().unwrap())
+    fn parse_points(&self, from_str: &str, to_str: &str) -> (Point, Point) {
+        (from_str.parse().unwrap(), to_str.parse().unwrap())
     }
 }
 

src/utils/grid.rs

@@ -6,7 +6,7 @@ use crate::utils::surface_range::SurfaceRange;
 use itertools::Itertools;
 use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
 use std::fmt;
-use std::fmt::Display;
+use std::fmt::{Debug, Display};
 use std::hash::Hash;
 
 #[derive(Debug, Clone)]