no need to read line by line anymore

Uriopass · Jan 30, 2024 · 50d3f41 · 50d3f41
1 parent 5a8218b
commit 50d3f41
Showing 1 changed file with 19 additions and 25 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -214,33 +214,27 @@ mod itweak {
 
         f.values.clear();
 
-        for line in BufReader::new(File::open(filename).ok()?)
-            .lines()
-            .map_while(Result::ok)
-        {
-            let mut it = line.split("tweak!(");
-
-            if it.next().is_none() {
-                continue;
-            }
-
-            for val_str in it {
-                // Find end of tweak
-                let mut prec = 1;
-                let (end, _) = val_str.char_indices().find(|(_, c)| {
-                    match c {
-                        ';' | ')' if prec == 1 => {
-                            return true;
-                        }
-                        ')' => prec -= 1,
-                        '(' => prec += 1,
-                        _ => {}
+        let content = std::fs::read_to_string(filename).ok()?;
+        let mut it = content.split("tweak!(");
+
+        it.next(); // skip part before first tweak!
+
+        for val_str in it {
+            // Find end of tweak
+            let mut prec = 1;
+            let (end, _) = val_str.char_indices().find(|(_, c)| {
+                match c {
+                    ';' | ')' if prec == 1 => {
+                        return true;
                     }
-                    false
-                })?;
+                    ')' => prec -= 1,
+                    '(' => prec += 1,
+                    _ => {}
+                }
+                false
+            })?;
 
-                f.values.push(val_str[..end].to_string());
-            }
+            f.values.push(val_str[..end].to_string());
         }
 
         Some(())