From 29fadfaa4b08dc5c5f3f48bee0cd9a2828b6d8d4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 17 Mar 2018 13:25:06 -0400 Subject: [PATCH] Extract the file to lines function --- ofborg/src/nix.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ofborg/src/nix.rs b/ofborg/src/nix.rs index a163db7..32b7520 100644 --- a/ofborg/src/nix.rs +++ b/ofborg/src/nix.rs @@ -291,6 +291,15 @@ mod tests { Fail, } + fn lines_from_file(file: File) -> Vec { + BufReader::new(file) + .lines() + .into_iter() + .filter(|line| line.is_ok()) + .map(|line| line.unwrap()) + .collect() + } + fn assert_run(res: Result, expected: Expect, require: Vec<&str>) { let expectation_held: bool = match expected { Expect::Pass => res.is_ok(), @@ -302,12 +311,7 @@ mod tests { Err(file) => file, }; - let lines: Vec = BufReader::new(file) - .lines() - .into_iter() - .filter(|line| line.is_ok()) - .map(|line| line.unwrap()) - .collect(); + let lines = lines_from_file(file); let buildlog = lines .into_iter()