simplify

ChrisDavison · Jan 31, 2024 · 075fd8f · 075fd8f
1 parent 4fae7f6
commit 075fd8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -130,16 +130,17 @@ fn get_dirs_from_config() -> Result<(Vec<PathBuf>, Vec<PathBuf>)> {
         return Err(anyhow!("No ~/.repoutilrc, or passed dirs"));
     } 
 
-    let contents = std::fs::read_to_string(p)?;
-    let (inc, exc): (Vec<_>, Vec<_>) = contents.lines().partition(|p| !p.starts_with('!'));
-    Ok((
-        inc.iter()
-            .map(|x| PathBuf::from(tilde(x).to_string()))
-            .collect(),
-        exc.iter()
-            .map(|x| PathBuf::from(tilde(&x[1..]).to_string()))
-            .collect(),
-    ))
+    let mut includes = Vec::new();
+    let mut excludes = Vec::new();
+    for line in std::fs::read_to_string(p)?.lines() {
+        if line.starts_with('!') {
+            // Strip 'exclusion-marking' ! from start of path, and add to excludes list
+            excludes.push(PathBuf::from(tilde(&line[1..]).to_string()));
+        } else {
+            includes.push(PathBuf::from(tilde(&line).to_string()));
+        }
+    }
+    Ok((includes, excludes))
 }
 
 // Get every repo from subdirs of `dir`