From 898f8dce2598d322e36d735a3149af01ca35d6a5 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 25 Dec 2023 00:23:43 +0100 Subject: [PATCH] Placate clippy --- 2023/src/day09.rs | 4 +++- 2023/src/day12.rs | 4 +++- 2023/src/day19.rs | 4 +++- 2023/src/day23.rs | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/2023/src/day09.rs b/2023/src/day09.rs index 70a1360..1f47362 100644 --- a/2023/src/day09.rs +++ b/2023/src/day09.rs @@ -5,7 +5,9 @@ use nom::IResult; use crate::common::parse_input; -fn parse_reports(mut i: &[u8]) -> IResult<&[u8], (Vec>, Vec)> { +type Input = (Vec>, Vec); + +fn parse_reports(mut i: &[u8]) -> IResult<&[u8], Input> { let mut begin = 0; let mut numbers = Vec::new(); let mut ranges = Vec::new(); diff --git a/2023/src/day12.rs b/2023/src/day12.rs index 32e4cf0..93bc2a5 100644 --- a/2023/src/day12.rs +++ b/2023/src/day12.rs @@ -53,7 +53,9 @@ fn number_ways(line: &[u8], groups: &[u8]) -> u64 { + cur[(groups.len() - 1) * group_stride + groups[groups.len() - 1] as usize] } -fn parse_lines(i: &[u8]) -> IResult<&[u8], Vec<(&[u8], Vec)>> { +type LineAndGroups<'a> = Vec<(&'a [u8], Vec)>; + +fn parse_lines(i: &[u8]) -> IResult<&[u8], LineAndGroups> { many1(terminated( separated_pair( take_until(" "), diff --git a/2023/src/day19.rs b/2023/src/day19.rs index f74d736..425b9f1 100644 --- a/2023/src/day19.rs +++ b/2023/src/day19.rs @@ -159,7 +159,9 @@ fn parse_rule(i: &[u8]) -> IResult<&[u8], (u16, Rule)> { Ok((&i[2..], (name, Rule { checks, end }))) } -fn parse_text(i: &[u8]) -> IResult<&[u8], (Box<[Rule]>, Vec)> { +type RulesAndItems = (Box<[Rule]>, Vec); + +fn parse_text(i: &[u8]) -> IResult<&[u8], RulesAndItems> { separated_pair( fold_many1( parse_rule, diff --git a/2023/src/day23.rs b/2023/src/day23.rs index 1a14652..1f9dfc8 100644 --- a/2023/src/day23.rs +++ b/2023/src/day23.rs @@ -77,7 +77,6 @@ fn simplify_graph(input: &[u8]) -> anyhow::Result>> while let Some((dist, slope, x, y)) = todo_positions.pop() { let mut enqueue = |x: usize, y: usize, up, down| { if map[(y, x)] == b'#' { - return; } else if let Some(&other) = nodes.get(&(x, y)) { if other == id { return;