Skip to content

Commit 512ec4b

Browse files
committed
chore: apply clippy and fmt
1 parent dc66eca commit 512ec4b

29 files changed

+33
-33
lines changed

src/day_number.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ impl TryFrom<String> for DayNumber {
1919
type Error = String;
2020

2121
fn try_from(value: String) -> Result<Self, Self::Error> {
22-
Self::new(value.trim_start_matches(|p| p == '0').parse().unwrap())
22+
Self::new(value.trim_start_matches('0').parse().unwrap())
2323
}
2424
}
2525

26-
impl Into<u8> for DayNumber {
27-
fn into(self) -> u8 {
28-
self.number
26+
impl From<DayNumber> for u8 {
27+
fn from(val: DayNumber) -> Self {
28+
val.number
2929
}
3030
}
3131

src/file_system.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
use crate::year::Year;
12
use std::fmt::{Display, Formatter};
23
use std::fs::read_to_string;
3-
use crate::year::Year;
44

55
enum ResourceType {
66
Inputs,
77
Outputs,
88
#[cfg(test)]
9-
Examples
9+
Examples,
1010
}
1111

1212
impl Display for ResourceType {

src/shoelace_formula.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::point::Point;
22
use std::ops::{Add, Div};
33

4-
pub fn shoelace_formula(points: &Vec<Point>) -> isize {
4+
pub fn shoelace_formula(points: &[Point]) -> isize {
55
let len = points.len();
66

77
let (area, perimeter) =

src/solutions/year2023/day01.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ fn recognize_number_in_words(words: &str) -> Option<u32> {
119119

120120
#[cfg(test)]
121121
mod tests {
122-
use crate::solutions::year2023::read_2023_example;
123122
use crate::solutions::year2023::day01::{
124123
calculate_line, calculate_line_with_numbers_in_words, Day01,
125124
};
125+
use crate::solutions::year2023::read_2023_example;
126126
use crate::solutions::Solution;
127127

128128
#[test]

src/solutions/year2023/day02.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ fn parse_line(input: &str) -> Game {
9999

100100
#[cfg(test)]
101101
mod tests {
102-
use crate::solutions::year2023::read_2023_example;
103102
use crate::solutions::year2023::day02::{parse_line, Day02, Game, Set};
103+
use crate::solutions::year2023::read_2023_example;
104104
use crate::solutions::Solution;
105105

106106
#[test]

src/solutions/year2023/day03.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ fn recognize_numbers(line: &str, y: i32) -> Vec<Number> {
140140

141141
#[cfg(test)]
142142
mod tests {
143-
use crate::solutions::year2023::read_2023_example;
144143
use crate::solutions::year2023::day03::{recognize_numbers, Day03, Number};
144+
use crate::solutions::year2023::read_2023_example;
145145
use crate::solutions::Solution;
146146

147147
#[test]

src/solutions/year2023/day04.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ impl Card {
9393

9494
#[cfg(test)]
9595
mod tests {
96-
use crate::solutions::year2023::read_2023_example;
9796
use crate::solutions::year2023::day04::{parse_line, Card, Day04};
97+
use crate::solutions::year2023::read_2023_example;
9898
use crate::solutions::Solution;
9999

100100
#[test]

src/solutions/year2023/day05.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ impl MapRange {
189189

190190
#[cfg(test)]
191191
mod tests {
192-
use crate::solutions::year2023::read_2023_example;
193192
use crate::range::Range;
194193
use crate::solutions::year2023::day05::{parse_input_part_one, Day05, Map, MapRange};
194+
use crate::solutions::year2023::read_2023_example;
195195
use crate::solutions::Solution;
196196
use std::vec;
197197

src/solutions/year2023/day06.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ impl RaceInfo {
108108

109109
#[cfg(test)]
110110
mod tests {
111-
use crate::solutions::year2023::read_2023_example;
112111
use crate::solutions::year2023::day06::{
113112
parse_input_part_one, parse_input_part_two, Day06, RaceInfo,
114113
};
114+
use crate::solutions::year2023::read_2023_example;
115115
use crate::solutions::Solution;
116116

117117
#[test]

src/solutions/year2023/day07.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ fn label_to_int(label: &char, joker_weight: i32) -> i32 {
216216

217217
#[cfg(test)]
218218
mod tests {
219-
use crate::solutions::year2023::read_2023_example;
220219
use crate::solutions::year2023::day07::{Day07, Hand, Type};
220+
use crate::solutions::year2023::read_2023_example;
221221
use crate::solutions::Solution;
222222
use std::cmp::Ordering;
223223

src/solutions/year2023/day08.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ impl Day08 {
110110

111111
#[cfg(test)]
112112
mod tests {
113-
use crate::solutions::year2023::read_2023_example;
114113
use crate::solutions::year2023::day08::Day08;
114+
use crate::solutions::year2023::read_2023_example;
115115
use crate::solutions::Solution;
116116
use std::collections::HashMap;
117117

src/solutions/year2023/day09.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ impl Day09 {
8686

8787
#[cfg(test)]
8888
mod tests {
89-
use crate::solutions::year2023::read_2023_example;
9089
use crate::solutions::year2023::day09::Day09;
90+
use crate::solutions::year2023::read_2023_example;
9191
use crate::solutions::Solution;
9292

9393
#[test]

src/solutions/year2023/day10.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ impl Display for Tile {
157157

158158
#[cfg(test)]
159159
mod tests {
160-
use crate::solutions::year2023::read_2023_example;
161160
use crate::point::Point;
162161
use crate::solutions::year2023::day10::{Day10, Tile};
162+
use crate::solutions::year2023::read_2023_example;
163163
use crate::solutions::Solution;
164164

165165
#[test]

src/solutions/year2023/day11.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ impl Day11 {
9595

9696
#[cfg(test)]
9797
mod tests {
98-
use crate::solutions::year2023::read_2023_example;
9998
use crate::solutions::year2023::day11::Day11;
99+
use crate::solutions::year2023::read_2023_example;
100100
use crate::solutions::Solution;
101101

102102
#[test]

src/solutions/year2023/day12.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ impl Display for Spring {
187187

188188
#[cfg(test)]
189189
mod tests {
190-
use crate::solutions::year2023::read_2023_example;
191190
use crate::solutions::year2023::day12::{ConditionRecord, Day12, Spring};
191+
use crate::solutions::year2023::read_2023_example;
192192
use crate::solutions::Solution;
193193
use std::collections::HashMap;
194194

src/solutions/year2023/day13.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ impl Display for Type {
171171

172172
#[cfg(test)]
173173
mod tests {
174-
use crate::solutions::year2023::read_2023_example;
175174
use crate::grid::Grid;
176175
use crate::solutions::year2023::day13::{Day13, Type};
176+
use crate::solutions::year2023::read_2023_example;
177177
use crate::solutions::Solution;
178178

179179
#[test]

src/solutions/year2023/day14.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ impl From<Vec<Point>> for Rocks {
244244

245245
#[cfg(test)]
246246
mod tests {
247-
use crate::solutions::year2023::read_2023_example;
248247
use crate::grid::Grid;
249248
use crate::solutions::year2023::day14::{Day14, Rocks};
249+
use crate::solutions::year2023::read_2023_example;
250250
use crate::solutions::Solution;
251251

252252
#[test]

src/solutions/year2023/day15.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ impl PartialEq<Self> for Lens {
105105

106106
#[cfg(test)]
107107
mod tests {
108-
use crate::solutions::year2023::read_2023_example;
109108
use crate::solutions::year2023::day15::Day15;
109+
use crate::solutions::year2023::read_2023_example;
110110
use crate::solutions::Solution;
111111

112112
#[test]

src/solutions/year2023/day16.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ impl From<char> for Tile {
102102

103103
#[cfg(test)]
104104
mod tests {
105-
use crate::solutions::year2023::read_2023_example;
106105
use crate::solutions::year2023::day16::Day16;
106+
use crate::solutions::year2023::read_2023_example;
107107
use crate::solutions::Solution;
108108

109109
#[test]

src/solutions/year2023/day17.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ impl Node {
118118

119119
#[cfg(test)]
120120
mod tests {
121-
use crate::solutions::year2023::read_2023_example;
122121
use crate::solutions::year2023::day17::Day17;
122+
use crate::solutions::year2023::read_2023_example;
123123
use crate::solutions::Solution;
124124

125125
#[test]

src/solutions/year2023/day18.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ impl Instruction {
9191

9292
#[cfg(test)]
9393
mod tests {
94-
use crate::solutions::year2023::read_2023_example;
9594
use crate::solutions::year2023::day18::Day18;
95+
use crate::solutions::year2023::read_2023_example;
9696
use crate::solutions::Solution;
9797

9898
#[test]

src/solutions/year2023/day19.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ impl From<&str> for Action {
361361

362362
#[cfg(test)]
363363
mod tests {
364-
use crate::solutions::year2023::read_2023_example;
365364
use crate::solutions::year2023::day19::{Day19, Workflow, Workflows};
365+
use crate::solutions::year2023::read_2023_example;
366366
use crate::solutions::Solution;
367367

368368
macro_rules! assert_combinations {

src/solutions/year2023/day20.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ enum Pulse {
277277

278278
#[cfg(test)]
279279
mod tests {
280-
use crate::solutions::year2023::read_2023_example;
281280
use crate::solutions::year2023::day20::Day20;
281+
use crate::solutions::year2023::read_2023_example;
282282
use crate::solutions::Solution;
283283

284284
#[test]

src/solutions/year2023/day21.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ impl Day21 {
4444

4545
#[cfg(test)]
4646
mod tests {
47-
use crate::solutions::year2023::read_2023_example;
4847
use crate::solutions::year2023::day21::Day21;
48+
use crate::solutions::year2023::read_2023_example;
4949

5050
#[test]
5151
fn part_one_example_test() {

src/solutions/year2023/day22.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ impl Bricks {
272272

273273
#[cfg(test)]
274274
mod tests {
275-
use crate::solutions::year2023::read_2023_example;
276275
use crate::solutions::year2023::day22::{Brick, Bricks, Day22};
276+
use crate::solutions::year2023::read_2023_example;
277277
use crate::solutions::Solution;
278278

279279
#[test]

src/solutions/year2023/day23.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ impl Day23 {
136136

137137
#[cfg(test)]
138138
mod tests {
139-
use crate::solutions::year2023::read_2023_example;
140139
use crate::solutions::year2023::day23::Day23;
140+
use crate::solutions::year2023::read_2023_example;
141141
use crate::solutions::Solution;
142142

143143
#[test]

src/solutions/year2023/day24.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ impl From<Hail> for Hail2D {
112112

113113
#[cfg(test)]
114114
mod tests {
115-
use crate::solutions::year2023::read_2023_example;
116115
use crate::solutions::year2023::day24::Day24;
116+
use crate::solutions::year2023::read_2023_example;
117117
use crate::solutions::Solution;
118118

119119
#[test]

src/solutions/year2023/day25.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ impl Graph {
117117

118118
#[cfg(test)]
119119
mod tests {
120-
use crate::solutions::year2023::read_2023_example;
121120
use crate::solutions::year2023::day25::Day25;
121+
use crate::solutions::year2023::read_2023_example;
122122
use crate::solutions::Solution;
123123

124124
#[ignore]

src/solutions/year2023/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ pub mod day25;
2727
#[cfg(test)]
2828
pub fn read_2023_example(day: &str) -> String {
2929
crate::file_system::read_example(day, crate::year::Year::Year2023)
30-
}
30+
}

0 commit comments

Comments
 (0)