diff options
author | Jesse Luehrs <doy@tozt.net> | 2021-12-16 17:56:27 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2021-12-16 17:56:27 -0500 |
commit | 2fb401764b5eed391be2006263bba126b76f0499 (patch) | |
tree | f5cdf8d2f9d4003d20602d9b5d406ab70522bcf6 /src/2020 | |
parent | 016954ce5dc4a52d6f138477d82597e14ff7c4b1 (diff) | |
download | advent-of-code-2fb401764b5eed391be2006263bba126b76f0499.tar.gz advent-of-code-2fb401764b5eed391be2006263bba126b76f0499.zip |
simplify data utils a bit
Diffstat (limited to 'src/2020')
-rw-r--r-- | src/2020/1/mod.rs | 4 | ||||
-rw-r--r-- | src/2020/3/mod.rs | 4 | ||||
-rw-r--r-- | src/2020/9/mod.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/2020/1/mod.rs b/src/2020/1/mod.rs index 40c9c0f..8ac5e14 100644 --- a/src/2020/1/mod.rs +++ b/src/2020/1/mod.rs @@ -1,5 +1,5 @@ pub fn part1() -> anyhow::Result<i64> { - let ints = data_ints!()?; + let ints: Vec<_> = data_ints!()?.collect(); for i in &ints { for j in &ints { if i + j == 2020 { @@ -11,7 +11,7 @@ pub fn part1() -> anyhow::Result<i64> { } pub fn part2() -> anyhow::Result<i64> { - let ints = data_ints!()?; + let ints: Vec<_> = data_ints!()?.collect(); for i in &ints { for j in &ints { for k in &ints { diff --git a/src/2020/3/mod.rs b/src/2020/3/mod.rs index f80bd43..4676a45 100644 --- a/src/2020/3/mod.rs +++ b/src/2020/3/mod.rs @@ -5,7 +5,7 @@ struct Map { } impl Map { - fn parse(s: &[u8]) -> anyhow::Result<Self> { + fn parse(s: impl Iterator<Item = u8>) -> anyhow::Result<Self> { let mut grid = vec![]; let mut current_row = vec![]; for c in s { @@ -79,7 +79,7 @@ pub fn part2() -> anyhow::Result<i64> { } fn read_map() -> anyhow::Result<Map> { - Map::parse(&data_bytes!()?) + Map::parse(data_bytes!()?) } #[test] diff --git a/src/2020/9/mod.rs b/src/2020/9/mod.rs index 3b4dd36..9d1bc9f 100644 --- a/src/2020/9/mod.rs +++ b/src/2020/9/mod.rs @@ -1,7 +1,7 @@ pub fn part1() -> anyhow::Result<i64> { const WINDOW: usize = 25; - let list = data_ints!()?; + let list: Vec<_> = data_ints!()?.collect(); for i in 0..(list.len() - WINDOW) { let set = &list[i..i + WINDOW]; let n = list[i + WINDOW]; @@ -16,7 +16,7 @@ pub fn part1() -> anyhow::Result<i64> { pub fn part2() -> anyhow::Result<i64> { const WINDOW: usize = 25; - let list = data_ints!()?; + let list: Vec<_> = data_ints!()?.collect(); let mut invalid = None; for i in 0..(list.len() - WINDOW) { let set = &list[i..i + WINDOW]; |