jdkaplan/advent-of-code
Watch
1
0
Fork
You've already forked advent-of-code
 0
Code Issues Activity

Cleanup

Browse source
This commit is contained in:
Jeremy Kaplan 2022-12-12 23:12:57 -08:00
commit d8ca7344fa
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
2022/src/bin/day13.rs
View file

@ -119,7 +119,7 @@ impl Data {
} }
impl Data { impl Data {
fn lift(&self) -> Self { fn to_list(&self) -> Self {
match self { match self {
Data::List(_) => self.clone(), Data::List(_) => self.clone(),
Data::Value(_) => Data::List(vec![self.clone()]), Data::Value(_) => Data::List(vec![self.clone()]),
@ -166,8 +166,8 @@ impl Ord for Data {
(Data::Value(l), Data::Value(r)) => l.cmp(r), (Data::Value(l), Data::Value(r)) => l.cmp(r),
(Data::List(l), Data::List(r)) => Data::zip_cmp(l, r), (Data::List(l), Data::List(r)) => Data::zip_cmp(l, r),
(Data::Value(_), Data::List(_)) => self.lift().cmp(other), (Data::Value(_), Data::List(_)) => self.to_list().cmp(other),
(Data::List(_), Data::Value(_)) => self.cmp(&other.lift()), (Data::List(_), Data::Value(_)) => self.cmp(&other.to_list()),
} }
} }
} }
@ -195,17 +195,12 @@ mod tests {
#[test] #[test]
fn test1() { fn test1() {
// let line = "[[[[2],9,1,[2,2,4,8]],[1,8,8],9,[7,2,[7,0,1],0,[10,9,10,3]]]]";
// let line = "[[[2],9,1,[2,2,4,8]],[1,8,8],9,[7,2,[7,0,1],0,[10,9,10,3]]]";
// let line = "[[2],9,1,[2,2,4,8]],[1,8,8],9,[7,2,[7,0,1],0,[10,9,10,3]]";
// let line = "[[2],9,1,[2,2,4,8]]";
let line = "[[2],9]"; let line = "[[2],9]";
let data = Data::parse(line); let data = Data::parse(line);
assert_eq!(data.to_string(), line); assert_eq!(data.to_string(), line);
use Data::{List, Value}; use Data::{List, Value};
assert_eq!(data, List(vec![List(vec![Value(2)]), Value(9)])) assert_eq!(data, List(vec![List(vec![Value(2)]), Value(9)]))
} }