Deal with CRLF on windows

caass · Oct 29, 2024 · c9a33c7 · c9a33c7
1 parent 752b17b
commit c9a33c7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,6 +30,7 @@ memchr = "2.7.4"
 clap = { version = "4.5.20", features = ["derive"] }
 clap-stdin = "0.5.1"
 pathsep = "0.1.1"
+newline-converter = "0.3.0"
 
 [target.'cfg(windows)'.dependencies]
 md-5 = "0.10.6"

diff --git a/src/2016/08.rs b/src/2016/08.rs
@@ -1,9 +1,8 @@
-use std::{
-    fmt::{self, Display, Formatter, Write},
-    str::FromStr,
-};
+use std::fmt::{self, Display, Formatter, Write};
+use std::str::FromStr;
 
 use eyre::{bail, eyre, Report, Result};
+use newline_converter::AsRefStrExt;
 use rayon::prelude::*;
 use winnow::{
     ascii::dec_uint,
@@ -159,24 +158,26 @@ impl<const W: usize> Screen<W, 6> {
 impl Screen<5, 6> {
     fn letter(&self) -> Result<char> {
         macro_rules! LETTERS {
-            ($($letter:ident),+) => {$(
-                const $letter: &str = include_str!(concat!(
-                    env!("CARGO_MANIFEST_DIR"),
-                    ::pathsep::path_separator!(),
-                    "fixtures",
-                    ::pathsep::path_separator!(),
-                    "2016",
-                    ::pathsep::path_separator!(),
-                    "08",
-                    ::pathsep::path_separator!(),
-                    stringify!($letter)
-                ));
-            )+};
+            ($($letter:ident),+) => {
+                $(
+                    const $letter: &str = include_str!(concat!(
+                        env!("CARGO_MANIFEST_DIR"),
+                        ::pathsep::path_separator!(),
+                        "fixtures",
+                        ::pathsep::path_separator!(),
+                        "2016",
+                        ::pathsep::path_separator!(),
+                        "08",
+                        ::pathsep::path_separator!(),
+                        stringify!($letter)
+                    ));
+                )+
+            };
         }
 
         LETTERS!(A, B, C, D, E, F, I, J, K, L, O, P, R, S, U, Y, Z);
 
-        match self.to_string().as_str() {
+        match self.to_string().to_unix().as_ref() {
             A => Ok('A'),
             B => Ok('B'),
             C => Ok('C'),