minor improvements

src/common/mod.rs

@@ -3,6 +3,7 @@ pub mod direction;
 pub mod file;
 pub mod helper;
 pub mod math;
+pub mod name;
 pub mod parser;
 pub mod pos;
 pub mod turn;

src/common/name.rs

@@ -0,0 +1,30 @@
+use std::{fmt::Display, ops::Deref, rc::Rc};
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Name(Rc<str>);
+
+impl Name {
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl Deref for Name {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl From<&str> for Name {
+    fn from(value: &str) -> Self {
+        Self(Rc::from(value))
+    }
+}
+
+impl Display for Name {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}

src/days/day01/mod.rs

@@ -1,12 +1,9 @@
+use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
 use std::num::ParseIntError;
-
 use thiserror::Error;
 
-use crate::common::file::split_lines;
-
-use super::template::{DayTrait, ResultType};
-
 pub struct Day;
 const DAY_NUMBER: usize = 1;
 

src/days/day02/mod.rs

@@ -1,8 +1,6 @@
-use std::cmp::Ordering;
-
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
+use std::{cmp::Ordering, str::FromStr};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 2;
@@ -60,9 +58,7 @@ impl Rps {
             Err(RPSError::IllegalLine(line.to_owned()))?
         };
 
-        let first = Rps::try_from(first)?;
+        Ok((first.parse()?, second.parse()?))
-        let second = Rps::try_from(second)?;
-        Ok((first, second))
     }
 
     pub fn value(&self) -> i64 {
@@ -98,10 +94,10 @@ impl PartialOrd for Rps {
     }
 }
 
-impl TryFrom<&str> for Rps {
+impl FromStr for Rps {
-    type Error = RPSError;
+    type Err = RPSError;
 
-    fn try_from(value: &str) -> std::result::Result<Self, Self::Error> {
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "A" | "X" => Ok(Rps::Rock),
             "B" | "Y" => Ok(Rps::Paper),
@@ -110,6 +106,7 @@ impl TryFrom<&str> for Rps {
         }
     }
 }
+
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
 enum Strategy {
     Loose,
@@ -124,9 +121,7 @@ impl Strategy {
             Err(RPSError::IllegalLine(line.to_owned()))?
         };
 
-        let first = Rps::try_from(first)?;
+        Ok((first.parse()?, second.parse()?))
-        let second = Strategy::try_from(second)?;
-        Ok((first, second))
     }
 
     pub fn fullfill(&self, other: &Rps) -> Rps {
@@ -139,10 +134,10 @@ impl Strategy {
     }
 }
 
-impl TryFrom<&str> for Strategy {
+impl FromStr for Strategy {
-    type Error = RPSError;
+    type Err = RPSError;
 
-    fn try_from(value: &str) -> std::result::Result<Self, Self::Error> {
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "X" => Ok(Strategy::Loose),
             "Y" => Ok(Strategy::Draw),

src/days/day03/mod.rs

@@ -1,6 +1,5 @@
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
 use thiserror::Error;
 

src/days/day04/mod.rs

@@ -1,6 +1,5 @@
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
 use std::num::ParseIntError;
 use thiserror::Error;

src/days/day05/mod.rs

@@ -1,6 +1,5 @@
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
 use std::num::ParseIntError;
 use thiserror::Error;

src/days/day07/mod.rs

@@ -1,12 +1,10 @@
+use super::template::{DayTrait, ResultType};
+use crate::common::{file::split_lines, name::Name};
 use std::{
     cell::{Cell, RefCell},
     num::ParseIntError,
     rc::{Rc, Weak},
 };
-
-use crate::common::file::split_lines;
-
-use super::template::{DayTrait, ResultType};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 7;
@@ -75,7 +73,7 @@ enum DirectoryError {
 #[derive(Debug)]
 struct Node {
     parent: Option<Weak<RefCell<Node>>>,
-    name: String,
+    name: Name,
     sub_dirs: Vec<Rc<RefCell<Node>>>,
     file_size: i64,
     size: Cell<Option<i64>>,
@@ -85,7 +83,7 @@ impl Node {
     fn root() -> Node {
         Node {
             parent: None,
-            name: "/".to_owned(),
+            name: "/".into(),
             sub_dirs: vec![],
             file_size: 0,
             size: Cell::new(None),
@@ -96,7 +94,7 @@ impl Node {
         self.sub_dirs.push(subdir);
     }
 
-    fn add_file(&mut self, _name: &str, size: i64) {
+    fn add_file<N: Into<Name>>(&mut self, _name: N, size: i64) {
         self.file_size += size;
     }
 
@@ -141,10 +139,10 @@ impl Directory {
         self.node.borrow().file_size
     }
 
-    pub fn add_subdir(&mut self, name: &str) {
+    pub fn add_subdir<N: Into<Name>>(&mut self, name: N) {
         let subdir = Rc::new(RefCell::new(Node {
             parent: Some(Rc::downgrade(&self.node)),
-            name: name.to_owned(),
+            name: name.into(),
             sub_dirs: vec![],
             file_size: 0,
             size: Cell::new(None),
@@ -152,7 +150,7 @@ impl Directory {
         self.node.borrow_mut().add_subdir(subdir);
     }
 
-    pub fn add_file(&mut self, name: &str, size: i64) {
+    pub fn add_file<N: Into<Name>>(&mut self, name: N, size: i64) {
         self.node.borrow_mut().add_file(name, size)
     }
 
@@ -165,8 +163,9 @@ impl Directory {
             .map(|node| Directory { node })
     }
 
-    pub fn get_subdir(&self, name: &str) -> Option<Directory> {
+    pub fn get_subdir<N: Into<Name>>(&self, name: N) -> Option<Directory> {
         let node = self.node.borrow();
+        let name = name.into();
         let sub_node = node.sub_dirs.iter().find(|node| node.borrow().name == name);
         sub_node.map(|node| Directory::create(node.clone()))
     }
@@ -187,7 +186,7 @@ impl Directory {
                         }
                         _ => {
                             let Some(next) = current.get_subdir(dir) else {
-                            return Err(DirectoryError::NoSuchDirectory(dir.to_owned()))
+                                return Err(DirectoryError::NoSuchDirectory(dir.to_owned()));
                             };
                             next
                         }

src/days/day08/mod.rs

@@ -1,9 +1,7 @@
-use std::str::FromStr;
-
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::{iproduct, FoldWhile, Itertools};
+use std::str::FromStr;
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 8;

src/days/day10/mod.rs

@@ -1,7 +1,7 @@
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
-use std::{num::ParseIntError, slice::Iter};
+use crate::common::file::split_lines;
+use itertools::Itertools;
+use std::{num::ParseIntError, slice::Iter, str::FromStr};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 10;
@@ -14,17 +14,13 @@ impl DayTrait for Day {
     }
 
     fn part1(&self, lines: &str) -> anyhow::Result<ResultType> {
-        let instructions = split_lines(lines)
+        let instructions: Vec<_> = split_lines(lines).map(|line| line.parse()).try_collect()?;
-            .map(|line| Instruction::parse(line))
-            .collect::<Result<Vec<_>, _>>()?;
         let result = CpuCycles::signal_strength(&instructions, &[20, 60, 100, 140, 180, 220]);
         Ok(ResultType::Integer(result as i64))
     }
 
     fn part2(&self, lines: &str) -> anyhow::Result<ResultType> {
-        let instructions = split_lines(lines)
+        let instructions: Vec<_> = split_lines(lines).map(|line| line.parse()).try_collect()?;
-            .map(|line| Instruction::parse(line))
-            .collect::<Result<Vec<_>, _>>()?;
         let result = CpuCycles::draw(&instructions);
         Ok(ResultType::Lines(result))
     }
@@ -39,18 +35,18 @@ enum CpuError {
     InvalidInteger(#[from] ParseIntError),
 }
 
-enum Instruction {
+#[derive(Debug, PartialEq, Eq)]
-    Add(i32),
+struct Instruction(Option<i32>);
-    Noop,
-}
 
-impl Instruction {
+impl FromStr for Instruction {
-    pub fn parse(line: &str) -> Result<Self, CpuError> {
+    type Err = CpuError;
+
+    fn from_str(line: &str) -> Result<Self, Self::Err> {
         if line == "noop" {
-            Ok(Instruction::Noop)
+            Ok(Instruction(None))
         } else if line.starts_with("addx") {
             let value = line[5..].parse()?;
-            Ok(Instruction::Add(value))
+            Ok(Instruction(Some(value)))
         } else {
             Err(CpuError::UnknownInstruction(line.to_owned()))
         }
@@ -114,10 +110,7 @@ impl<'a> Iterator for CpuCycles<'a> {
             self.current = None;
             Some(start_register)
         } else if let Some(instruction) = self.instructions.next() {
-            match instruction {
+            self.current = instruction.0;
-                Instruction::Add(value) => self.current = Some(*value),
-                Instruction::Noop => {}
-            }
             Some(self.register)
         } else {
             None
@@ -134,7 +127,11 @@ mod test {
 
     #[test]
     fn test_simple() -> Result<()> {
-        let instructions = vec![Instruction::Noop, Instruction::Add(3), Instruction::Add(-5)];
+        let instructions = vec![
+            Instruction(None),
+            Instruction(Some(3)),
+            Instruction(Some(-5)),
+        ];
         let expected = vec![1, 1, 1, 4, 4];
         let result = CpuCycles::create(&instructions).collect::<Vec<_>>();
         assert_eq!(result, expected);

src/days/day11/mod.rs

@@ -1,8 +1,7 @@
+use super::template::{DayTrait, ResultType};
 use crate::common::parser::{
     empty_lines, eol_terminated, extract_result, ignore, trim0, trim_left1, true_false,
 };
-
-use super::template::{DayTrait, ResultType};
 use nom::{
     branch::alt,
     bytes::complete::tag,

src/days/day12/mod.rs

@@ -1,8 +1,6 @@
-use std::collections::{BinaryHeap, HashSet};
-
-use crate::common::{file::split_lines, pos::Pos};
-
 use super::template::{DayTrait, ResultType};
+use crate::common::{file::split_lines, pos::Pos};
+use std::collections::{BinaryHeap, HashSet};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 12;

src/days/day13/mod.rs

@@ -1,9 +1,7 @@
-use std::cmp::Ordering;
-
-use crate::common::file::split_lines;
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
+use std::cmp::Ordering;
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 13;

src/days/day14/mod.rs

@@ -1,11 +1,9 @@
+use super::template::{DayTrait, ResultType};
+use crate::common::{file::split_lines, pos::Pos};
 use itertools::Itertools;
 use std::{collections::HashSet, num::ParseIntError};
 use thiserror::Error;
 
-use crate::common::{file::split_lines, pos::Pos};
-
-use super::template::{DayTrait, ResultType};
-
 const DAY_NUMBER: usize = 14;
 
 pub struct Day;

src/days/day16/mod.rs

@@ -1,5 +1,8 @@
 use super::template::{DayTrait, ResultType};
-use crate::common::parser::{eol_terminated, extract_result, ignore, trim0, trim1, trim_left1};
+use crate::common::{
+    name::Name,
+    parser::{eol_terminated, extract_result, ignore, trim0, trim1, trim_left1},
+};
 use itertools::Itertools;
 use nom::{
     branch::alt,
@@ -95,6 +98,7 @@ impl Mul<Flow> for Time {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 struct Flow(i64);
+
 impl Deref for Flow {
     type Target = i64;
 
@@ -208,7 +212,7 @@ impl<'a> TryFrom<&'a str> for RawValve<'a> {
 
 #[derive(Debug)]
 struct Valve {
-    id: String,
+    id: Name,
     idx: Index,
     flow: Flow,
     distances: Vec<Time>,
@@ -245,7 +249,7 @@ impl Valve {
         distances.sort_unstable_by_key(|(id, _)| *id);
 
         Ok(Valve {
-            id: valve.id.to_owned(),
+            id: valve.id.into(),
             idx,
             flow: valve.flow,
             distances: distances
@@ -257,7 +261,7 @@ impl Valve {
 
     fn zero_flow(valve: &RawValve, idx: Index) -> Valve {
         Valve {
-            id: valve.id.to_owned(),
+            id: valve.id.into(),
             idx,
             flow: valve.flow,
             distances: vec![],
@@ -309,11 +313,12 @@ impl ValveSystem {
     }
 
     #[allow(dead_code)]
-    fn get_valve_by_id(&self, id: &str) -> Result<&Valve, ValveError> {
+    fn get_valve_by_id<N: Into<Name>>(&self, id: N) -> Result<&Valve, ValveError> {
+        let id = id.into();
         self.valves
             .iter()
             .find(|valve| valve.id == id)
-            .ok_or(ValveError::ValveNotFound(id.to_owned()))
+            .ok_or(ValveError::ValveNotFound(id.to_string()))
     }
 
     fn get_valve(&self, idx: Index) -> &Valve {

src/days/day17/mod.rs

@@ -1,9 +1,7 @@
-use std::{cell::Cell, marker::PhantomData, ops::Index};
-
-use crate::common::file::{read_string, split_lines};
-
 use super::template::{DayTrait, ResultType};
+use crate::common::file::{read_string, split_lines};
 use itertools::Itertools;
+use std::{cell::Cell, marker::PhantomData, ops::Index};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 17;

src/days/day18/mod.rs

@@ -1,11 +1,9 @@
+use super::template::{DayTrait, ResultType};
+use crate::common::file::split_lines;
 use itertools::Itertools;
 use std::{collections::HashSet, num::ParseIntError};
 use thiserror::Error;
 
-use crate::common::file::split_lines;
-
-use super::template::{DayTrait, ResultType};
-
 const DAY_NUMBER: usize = 18;
 
 pub struct Day;

src/days/day21/mod.rs

@@ -1,7 +1,8 @@
-use std::{collections::HashMap, ops::Deref, rc::Rc, str::FromStr};
-
 use super::template::{DayTrait, ResultType};
-use crate::common::parser::{extract_result, ignore, trim0};
+use crate::common::{
+    name::Name,
+    parser::{extract_result, ignore, trim0},
+};
 use nom::{
     branch::alt,
     character::complete::{alpha1, char, i64, multispace0, one_of},
@@ -10,6 +11,7 @@ use nom::{
     sequence::{terminated, tuple},
     Err, IResult, Parser,
 };
+use std::{collections::HashMap, str::FromStr};
 use thiserror::Error;
 
 const DAY_NUMBER: usize = 21;
@@ -34,29 +36,6 @@ impl DayTrait for Day {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-struct Name(Rc<str>);
-
-impl Name {
-    fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl Deref for Name {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<&str> for Name {
-    fn from(value: &str) -> Self {
-        Self(Rc::from(value))
-    }
-}
-
 #[derive(Debug, Error)]
 enum MonkeyError {
     #[error("Not a valid description: {0}")]