add use of iterators

Author: racka98

src/lib.rs

@@ -7,12 +7,18 @@ pub struct Config {
 }
 
 impl Config {
-    pub fn build(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("Not enough arguments");
-        }
-        let query = args[1].clone();
-        let file_path = args[2].clone();
+    pub fn build(mut args: impl Iterator<Item = String>) -> Result<Config, &'static str> {
+        args.next(); // First value in args is just the name of the program
+        
+        let query = match args.next() {
+            Some(arg) => arg,
+            _none => return Err("Didn't get a query String!"),
+        };
+        let file_path = match args.next() {
+            Some(arg) => arg,
+            _none => return Err("Didn't get a file path!")
+        };
+        
         let ignore_case = env::var("IGNORE_CASE").is_ok();
 
         Ok(Config {
@@ -37,14 +43,9 @@ pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
 }
 
 pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    let mut results: Vec<&str> = Vec::new();
-
-    for line in contents.lines() {
-        if line.contains(query) {
-            results.push(line);
-        }
-    }
-    results
+    contents.lines()
+        .filter(|line| line.contains(query))
+        .collect()
 }
 
 pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {

src/main.rs

@@ -4,15 +4,14 @@ use minigrep::run;
 use minigrep::Config;
 
 fn main() {
-    let args: Vec<String> = env::args().collect();
 
-    let config = Config::build(&args).unwrap_or_else(|err| {
+    let config = Config::build(env::args()).unwrap_or_else(|err| {
         eprintln!("Problem parsing arguments: {}", err);
         process::exit(1);
     });
 
-    println!("Searching for {}", config.query);
-    println!("In file {}\n", config.file_path);
+    println!("Searching for \"{}\"", config.query);
+    println!("In file \"{}\"\n", config.file_path);
 
     if let Err(e) = run(config) {
         eprintln!("Application error: {}", e);