remove dead code

4 files changed, 3 insertions, 68 deletions

diff --git a/src/2021/3/mod.rs b/src/2021/3/mod.rs
index 220ce33..11b9c8d 100644
--- a/src/2021/3/mod.rs
+++ b/src/2021/3/mod.rs
@@ -19,6 +19,8 @@ pub fn part1(lines: impl Iterator<Item = String>) -> anyhow::Result<i64> {
 
 pub fn part2(lines: impl Iterator<Item = String>) -> anyhow::Result<i64> {
     let mut oxygen: Vec<_> = lines.collect();
+    let mut co2 = oxygen.clone();
+
     for i in 0..oxygen[0].len() {
         if oxygen.len() == 1 {
             break;
@@ -37,7 +39,6 @@ pub fn part2(lines: impl Iterator<Item = String>) -> anyhow::Result<i64> {
         oxygen = new_oxygen;
     }
 
-    let mut co2: Vec<_> = data_lines!()?.collect();
     for i in 0..co2[0].len() {
         if co2.len() == 1 {
             break;
diff --git a/src/main.rs b/src/main.rs
index 46ba414..406d78a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::collapsible_if)]
 
-#[macro_use]
 mod util;
 
 #[path = "2020/mod.rs"]
diff --git a/src/util.rs b/src/util.rs
index 0bd31e5..e5316bf 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,10 +1,5 @@
-#![allow(unused_macros)]
-#![allow(dead_code)]
-
-#[macro_use]
-pub mod parse;
-
 pub mod grid;
+pub mod parse;
 
 pub fn data(year: u16, day: u16) -> anyhow::Result<std::fs::File> {
     std::fs::File::open(format!("data/{}/{}.txt", year, day))
diff --git a/src/util/parse.rs b/src/util/parse.rs
index 5f42565..054952a 100644
--- a/src/util/parse.rs
+++ b/src/util/parse.rs
@@ -1,65 +1,5 @@
 use std::io::{BufRead as _, Read as _};
 
-macro_rules! data {
-    () => {{
-        use anyhow::Context as _;
-        let file = crate::util::parse::src_file_to_data_file(&std::file!());
-        std::fs::File::open(file.clone())
-            .with_context(|| format!("couldn't find data file {}", file))
-    }};
-}
-
-macro_rules! data_lines {
-    () => {
-        data!().map(|fh| crate::util::parse::lines(fh))
-    };
-}
-
-macro_rules! data_ints {
-    () => {
-        data!()
-            .map(|fh| crate::util::parse::ints(crate::util::parse::lines(fh)))
-    };
-    ($sep:expr) => {
-        data!().map(|fh| {
-            crate::util::parse::ints(crate::util::parse::split(fh, $sep))
-        })
-    };
-}
-
-macro_rules! data_bytes {
-    () => {
-        data!().map(|fh| crate::util::parse::bytes(fh))
-    };
-}
-
-macro_rules! data_str {
-    () => {{
-        data!().map(|fh| crate::util::parse::string(fh))
-    }};
-}
-
-macro_rules! data_bool_grid {
-    ($t:expr, $f:expr) => {{
-        crate::util::parse::bool_grid(data_lines!().unwrap(), $t, $f)
-    }};
-}
-
-macro_rules! data_digit_grid {
-    () => {{
-        crate::util::parse::digit_grid(data_lines!().unwrap())
-    }};
-}
-
-pub fn src_file_to_data_file(file: &str) -> String {
-    let parts: Vec<_> = file.split('/').collect();
-    format!(
-        "data/{}/{}.txt",
-        parts[parts.len() - 3],
-        parts[parts.len() - 2]
-    )
-}
-
 pub fn lines(fh: std::fs::File) -> impl Iterator<Item = String> {
     let fh = std::io::BufReader::new(fh);
     fh.lines().map(|res| res.unwrap())