Compare commits

..

No commits in common. "05c89e5f1154c76823863c4ad5d7a19a9defa446" and "0ffbddb7db10561b52efb23740222f80662272ad" have entirely different histories.

4 changed files with 90 additions and 95 deletions

View file

@ -1,5 +1,6 @@
use aoc_runner_derive::{aoc, aoc_generator}; use aoc_runner_derive::{aoc, aoc_generator};
#[aoc_generator(day1)] #[aoc_generator(day1)]
pub fn input_generator(input: &str) -> Vec<usize> { pub fn input_generator(input: &str) -> Vec<usize> {
input input

View file

@ -54,10 +54,10 @@ pub fn input_generator(input: &str) -> Vec<Rule> {
#[aoc(day2, part1)] #[aoc(day2, part1)]
pub fn solve_part1(input: &Vec<Rule>) -> usize { pub fn solve_part1(input: &Vec<Rule>) -> usize {
return input.iter().filter(|v| v.is_valid_part1()).count(); return input.iter().filter(|v| v.is_valid_part1()).count()
} }
#[aoc(day2, part2)] #[aoc(day2, part2)]
pub fn solve_part2(input: &Vec<Rule>) -> usize { pub fn solve_part2(input: &Vec<Rule>) -> usize {
return input.iter().filter(|v| v.is_valid_part2()).count(); return input.iter().filter(|v| v.is_valid_part2()).count()
} }

View file

@ -76,9 +76,6 @@ impl Creds {
} }
fn validate_hcl(val: &str) -> bool { fn validate_hcl(val: &str) -> bool {
if val.len() != 7 {
return false;
}
let mut ch = val.chars(); let mut ch = val.chars();
if ch.next() != Some('#') { if ch.next() != Some('#') {
return false; return false;

View file

@ -5,25 +5,22 @@ pub enum Direction {
Front, Front,
Back, Back,
Left, Left,
Right, Right
} }
#[aoc_generator(day5)] #[aoc_generator(day5)]
pub fn input_generator(input: &str) -> Vec<Vec<Direction>> { pub fn input_generator(input: &str) -> Vec<Vec<Direction>> {
input input.lines().map(|line| {
.lines() line.chars().map(|c| {
.map(|line| { match c {
line.chars()
.map(|c| match c {
'L' => Direction::Left, 'L' => Direction::Left,
'R' => Direction::Right, 'R' => Direction::Right,
'F' => Direction::Front, 'F' => Direction::Front,
'B' => Direction::Back, 'B' => Direction::Back,
other => panic!("Invalid direction: {}", other), other => panic!("Invalid direction: {}",other)
}) }
.collect() }).collect()
}) }).collect()
.collect()
} }
pub fn seat_to_pos(seat: &Vec<Direction>) -> (usize,usize) { pub fn seat_to_pos(seat: &Vec<Direction>) -> (usize,usize) {
@ -35,16 +32,16 @@ pub fn seat_to_pos(seat: &Vec<Direction>) -> (usize, usize) {
match inst { match inst {
Direction::Back => { Direction::Back => {
row_range.0+=delta_row; row_range.0+=delta_row;
} },
Direction::Front => { Direction::Front => {
row_range.1-=delta_row; row_range.1-=delta_row;
} },
Direction::Left => { Direction::Left => {
col_range.1-=delta_col; col_range.1-=delta_col;
} },
Direction::Right => { Direction::Right => {
col_range.0+=delta_col; col_range.0+=delta_col;
} },
} }
} }
if row_range.1-row_range.0 != 1 { if row_range.1-row_range.0 != 1 {