Skip to content

Commit 368120b

Browse files
committed
finish day17 and clean up warnings
1 parent 2572482 commit 368120b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+70
-83
lines changed

benches/day_01.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_01, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("day 01: Calorie Counting");

benches/day_02.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_02, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("day 02: Rock Paper Scissors");

benches/day_03.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_03, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("day 03: Rucksack Reorganization");

benches/day_04.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_04, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("Day 4: Camp Cleanup");

benches/day_05.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_05, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("Day 5: Supply Stacks");

benches/day_06.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_06, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("Day 6: Tuning Trouble");

benches/day_07.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_07, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("Day 7: No Space Left On Device");

benches/day_09.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use criterion::{black_box, Criterion, criterion_group};
2+
13
use aoc_2022::{day_09, utils};
2-
use criterion::{black_box, criterion_group, Criterion};
34

45
fn benchmark(c: &mut Criterion) {
56
let mut group = c.benchmark_group("Day 9: Rope Bridge");

examples/day_01.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use aoc_2022::utils;
21
use aoc_2022::day_01::{part_1, part_2};
3-
2+
use aoc_2022::utils;
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_01").unwrap();

examples/day_02.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use aoc_2022::utils;
21
use aoc_2022::day_02::{part_1, part_2};
3-
2+
use aoc_2022::utils;
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_02").unwrap();

examples/day_03.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use aoc_2022::utils;
21
use aoc_2022::day_03::{part_1, part_2};
3-
2+
use aoc_2022::utils;
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_03").unwrap();

examples/day_04.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use aoc_2022::utils;
21
use aoc_2022::day_04::{part_1, part_2};
3-
2+
use aoc_2022::utils;
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_04").unwrap();

examples/day_05.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_05::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_05::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_05").unwrap();

examples/day_06.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use aoc_2022::utils;
21
use aoc_2022::day_06::{part_1, part_2};
3-
2+
use aoc_2022::utils;
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_06").unwrap();

examples/day_07.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_07::{get_directory_layout, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_07::{part_1, part_2, get_directory_layout};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_07").unwrap();

examples/day_08.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_08::{get_cumulative_maxes, parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_08::{part_1, part_2, parsing, get_cumulative_maxes};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_08").unwrap();

examples/day_09.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_09::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_09::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_09").unwrap();

examples/day_10.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_10::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_10::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_10").unwrap();

examples/day_11.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_11::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_11::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_11").unwrap();

examples/day_12.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_12::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_12::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_12").unwrap();

examples/day_13.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_13::{parsing_packets, parsing_pairs, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_13::{part_1, part_2, parsing_pairs, parsing_packets};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_13").unwrap();

examples/day_14.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_14::{parsing_pairs, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_14::{part_1, part_2, parsing_pairs};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_14").unwrap();

examples/day_15.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_15::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_15::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_15").unwrap();

examples/day_16.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
use aoc_2022::day_16::{parsing, part_1, part_2};
12
use aoc_2022::utils;
2-
use aoc_2022::day_16::{part_1, part_2, parsing};
3-
43

54
fn main() {
65
let lines = utils::read_lines("inputs/day_16").unwrap();

src/day_01.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::str::FromStr;
22

3-
43
pub fn part_1(lines: &Vec<String>) -> i32 {
54
let mut maximum_calories = 0;
65
let mut calories = 0;

src/day_02.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::str::FromStr;
2-
use anyhow::{anyhow, Result, Error};
2+
3+
use anyhow::{anyhow, Error, Result};
34

45
#[derive(Debug, PartialEq)]
56
enum Shape {

src/day_03.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
use std::str::FromStr;
2-
use anyhow::{anyhow, Result, Error};
1+
use anyhow::{anyhow, Result};
32

43
#[derive(Debug, PartialEq)]
54
struct Bitmask(u64);
65

76
impl Bitmask {
87
fn new(num: u8)-> Result<Self> {
9-
let mut num_shifts;
8+
let num_shifts;
109
let num_a = u8::try_from('a').unwrap();
1110
let num_z: u8 = num_a + 25;
12-
let num_A = u8::try_from('A').unwrap();
13-
let num_Z: u8 = num_A + 25;
11+
let num_cap_a = u8::try_from('A').unwrap();
12+
let num_cap_z: u8 = num_cap_a + 25;
1413
if num >= num_a && num <= num_z {
1514
num_shifts = num - num_a;
1615
}
17-
else if num >= num_A && num <= num_Z {
18-
num_shifts = num - num_A + 26;
16+
else if num >= num_cap_a && num <= num_cap_z {
17+
num_shifts = num - num_cap_a + 26;
1918
}
2019
else {
2120
return Err(anyhow!("{} is out of range", num));

src/day_04.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::str::FromStr;
2-
use anyhow::{anyhow, Result, Error};
2+
3+
use anyhow::{Error, Result};
34

45
#[derive(Debug, PartialEq)]
56
struct IDRange(u64, u64);

src/day_05.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::str::FromStr;
2-
use anyhow::{anyhow, Result, Error};
2+
3+
use anyhow::{Error, Result};
34

45
#[derive(Debug, PartialEq)]
56
pub struct Command {

src/day_07.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use std::cell::Cell;
22
use std::collections::HashMap;
3-
use std::path::{Path, PathBuf};
3+
use std::path::PathBuf;
44
use std::str::FromStr;
5-
use anyhow::{anyhow, Result, Error};
65

76
#[derive(Debug, Default)]
87
pub struct Node where {
@@ -34,7 +33,7 @@ impl Node {
3433

3534
pub fn get_directory_layout(lines: &Vec<String>) -> HashMap<PathBuf, Node> {
3635
let mut path_node_map = HashMap::new();
37-
let mut root: Node = Node {
36+
let root: Node = Node {
3837
size: Cell::new(None),
3938
is_directory: true,
4039
path: PathBuf::from("/"),

src/day_08.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std::convert::From;
2-
use anyhow::{anyhow, Result, Error};
31

42

53

src/day_09.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use std::str::FromStr;
21
use std::collections::HashSet;
3-
use anyhow::{anyhow, Result, Error};
2+
use std::str::FromStr;
3+
4+
use anyhow::{anyhow, Error, Result};
45

56
#[derive(Debug, PartialEq)]
67
enum Direction {

src/day_10.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::str::FromStr;
2-
use std::collections::HashSet;
3-
use anyhow::{anyhow, Result, Error};
2+
3+
use anyhow::{anyhow, Error, Result};
44

55
#[derive(Debug)]
66
pub enum Instruction {
@@ -30,13 +30,12 @@ pub fn parsing(lines: &Vec<String>) -> Vec<Instruction> {
3030

3131
pub fn part_1(instructions: & Vec<Instruction>) -> i32 {
3232
let mut cycle = 0;
33-
let mut prev_cycle = 0;
3433
let mut x = 1;
3534
let targets = [20, 60, 100, 140, 180, 220];
3635
let mut sum_signals = 0;
3736
for instruction in instructions {
3837
let mut change = 0;
39-
prev_cycle = cycle;
38+
let prev_cycle = cycle;
4039
match instruction {
4140
Instruction::Noop => {
4241
cycle += 1

src/day_11.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
use std::arch::x86_64::_mm_test_all_ones;
21
use std::cell::{Cell, RefCell};
32
use std::collections::VecDeque;
43
use std::str::FromStr;
5-
use anyhow::{anyhow, Result, Error};
64

75
#[derive(Debug, PartialEq, Clone)]
86
pub struct Monkey {
@@ -24,16 +22,16 @@ impl Monkey {
2422
let num = usize::from_str(&monkey_num[0..(monkey_num.len() - 1)]).unwrap();
2523
// parsing starting items
2624
let mut starting_items = VecDeque::new();
27-
let (_, mut items_str) = lines_iter.next().unwrap().split_once(":").unwrap();
25+
let (_, items_str) = lines_iter.next().unwrap().split_once(":").unwrap();
2826
let items_str = items_str.trim();
2927
for item in items_str.split(", ") {
3028
starting_items.push_back(usize::from_str(item).unwrap());
3129
}
3230
// parsing operation and operator
3331
let operator;
3432
let operation;
35-
let (_, mut statement) = lines_iter.next().unwrap().split_once(":").unwrap();
36-
let (_, mut expression) = statement.split_once(" = ").unwrap();
33+
let (_, statement) = lines_iter.next().unwrap().split_once(":").unwrap();
34+
let (_, expression) = statement.split_once(" = ").unwrap();
3735
if expression == "old * old" {
3836
operation = "^".to_string();
3937
operator = 2;

src/day_12.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
use std::collections::{HashSet, VecDeque};
2-
use std::convert::From;
3-
use anyhow::{anyhow, Result, Error};
42

53
const NUM_START: u8 = 83;
64
const ELEVATION_START: u8 = 97;
@@ -33,7 +31,7 @@ pub fn part_1(grid: &Vec<Vec<u8>>) -> usize {
3331
queue.push_back((start_loc, 0));
3432
visited.insert(start_loc);
3533
loop {
36-
let (curr, mut step) = queue.pop_front().unwrap();
34+
let (curr, step) = queue.pop_front().unwrap();
3735
if curr == end_loc {
3836
return step;
3937
}
@@ -88,7 +86,7 @@ pub fn part_2(grid: &Vec<Vec<u8>>) -> u32 {
8886
queue.push_back((start_loc, 0));
8987
visited.insert(start_loc);
9088
loop {
91-
let (curr, mut step) = queue.pop_front().unwrap();
89+
let (curr, step) = queue.pop_front().unwrap();
9290
if grid[curr.0 as usize][curr.1 as usize] == NUM_START || grid[curr.0 as usize][curr.1 as usize] == ELEVATION_START {
9391
return step;
9492
}

src/day_13.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::cmp::{min, Ordering};
2-
use anyhow::{anyhow, Result, Error};
2+
33
use serde::Deserialize;
44

55
#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
@@ -49,11 +49,11 @@ impl Ord for PacketData {
4949
return nums_left.len().cmp(&nums_right.len());
5050
}
5151
}
52-
(&PacketData::List(ref nums_left), &PacketData::Integer(ref num_right)) => {
52+
(&PacketData::List(_), &PacketData::Integer(ref num_right)) => {
5353
let right = PacketData::List(vec![PacketData::Integer(*num_right)]);
5454
return self.cmp(&right);
5555
}
56-
(&PacketData::Integer(ref num_left), &PacketData::List(ref nums_right)) => {
56+
(&PacketData::Integer(ref num_left), &PacketData::List(_)) => {
5757
let left = PacketData::List(vec![PacketData::Integer(*num_left)]);
5858
return left.cmp(other);
5959
}

src/day_14.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::cmp::{max, min};
22
use std::str::FromStr;
3-
use anyhow::{anyhow, Result, Error};
3+
44
const BORDER:i32 = -1;
55
const EMPTY:i32 = 0;
66
const ROCK:i32 = 1;

0 commit comments

Comments
 (0)