rowan.a.tl/rust_book
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ch13.03 done

Browse Source
This commit is contained in:
Rowan Torbitzky-Lane 2025-03-31 13:26:26 -05:00
parent aa4818e9e7
commit 359fc2b0b7
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ch12/minigrep/src/lib.rs
View File

@ -34,15 +34,37 @@ impl Config {
}
}
pub fn build(args: &[String]) -> Result<Config, &'static str> {
if args.len() < 3 {
return Err("not enough arguments");
}
// pub fn build(args: &[String]) -> Result<Config, &'static str> {
// if args.len() < 3 {
// return Err("not enough arguments");
// }
// Ok(Config {
// query: args[1].clone(),
// file_path: args[2].clone(),
// ignore_case: env::var("IGNORE_CASE").is_ok(),
// })
// }
pub fn build(mut args: impl Iterator<Item = String>) -> Result<Config, &'static str> {
args.next();
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 {
query: args[1].clone(),
file_path: args[2].clone(),
ignore_case: env::var("IGNORE_CASE").is_ok(),
query,
file_path,
ignore_case,
})
}
}
@ -68,15 +90,19 @@ 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::new();
contents
.lines()
.filter(|line| line.contains(query))
.collect()
// let mut results = Vec::new();
for line in contents.lines() {
if line.contains(query) {
results.push(line);
}
}
// for line in contents.lines() {
// if line.contains(query) {
// results.push(line);
// }
// }
results
// results
}
pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {

6
ch12/minigrep/src/main.rs
View File

@ -20,8 +20,9 @@ use std::process;
use minigrep::Config;
// The modifications for ch13 are added in this version
fn main() {
let args: Vec<String> = env::args().collect();
// let args: Vec<String> = env::args().collect();
// dbg!(args);
// let config = Config::new(&args);
@ -29,7 +30,8 @@ fn main() {
// unwrap_or_else passes an argument to a closure which is an
// anonymous function
// eprintln!() for output to stdout
let config = Config::build(&args).unwrap_or_else(|err| {
// 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);
});