[Minigrep] - stopped panicking and adding results
This commit is contained in:
parent
636c12e4c0
commit
d61f038555
@ -1,22 +1,26 @@
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
use std::os::unix::process;
|
||||||
struct Config {
|
struct Config {
|
||||||
query: String,
|
query: String,
|
||||||
file_path: String,
|
file_path: String,
|
||||||
}
|
}
|
||||||
impl Config {
|
impl Config {
|
||||||
fn new(args: &[String]) -> Config {
|
fn build(args: &[String]) -> Result<Config, &'static str> {
|
||||||
if args.len() < 3 {
|
if args.len() < 3 {
|
||||||
panic!("not enough arguments");
|
return Err("not enough arguments");
|
||||||
}
|
}
|
||||||
let query = args[1].clone();
|
let query = args[1].clone();
|
||||||
let file_path = args[2].clone();
|
let file_path = args[2].clone();
|
||||||
Config { query, file_path }
|
Ok(Config { query, file_path })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn main() {
|
fn main() {
|
||||||
let args: Vec<String> = env::args().collect();
|
let args: Vec<String> = env::args().collect();
|
||||||
let config = Config::new(&args);
|
let config = Config::build(&args).unwrap_or_else(|err| {
|
||||||
|
println!("problem parsing arguments: {err}");
|
||||||
|
std::process::exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
println!("Searching for {}", config.query);
|
println!("Searching for {}", config.query);
|
||||||
println!("In file {}", config.file_path);
|
println!("In file {}", config.file_path);
|
||||||
|
Loading…
Reference in New Issue
Block a user