darkicewolf50/RustBrock
1
0
Fork 0
mirror of https://github.com/darkicewolf50/RustBrock.git synced 2025-08-02 08:10:53 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

finished ch12.3

Browse Source
This commit is contained in:
darkicewolf50
2025-02-18 11:27:40 -07:00
parent 4a7a034870
commit e0bc88cf97
4 changed files with 235 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
minigrep/src/lib.rs Normal file
View File

@ -0,0 +1,29 @@
use std::fs;
use std::error::Error;
// refactor 9
pub struct Config {
pub query: String,
pub file_path: String,
}
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();
Ok(Config { query, file_path })
}
}
pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
let contents = fs::read_to_string(config.file_path)?;
println!("With text:\n{contents}")
Ok(())
}

93
minigrep/src/main.rs
View File

@ -1,7 +1,9 @@
use std::env;
use std::fs;
use std::process;
use std::error::Error;
// refactor 9
// use std::fs;
// use std::error::Error;
use minigrep::Config;
fn main() {
let args: Vec<String> = env::args().collect();
@ -21,37 +23,49 @@ fn main() {
// let config = Config::new(&args);
// recfactor 6
let config = Config::build(&args).unwrap_or_else(|err| {
println!("Problem parsing arguments: {err}");
process::exit(1);
});
let config = Config::build(&args);
// refactor 8
//.unwrap_or_else(|err| {
// println!("Problem parsing arguments: {err}");
// process::exit(1);
// });
println!("Searching for {}", config.query);
println!("In the file {}", config.file_path);
// refactor 8
if let Err(e) = minigrep::run(config) {
println!("Application error: {e}");
process::exit(1);
}
// refactor 7
// // --snip--
// let contents = fs::read_to_string(config.file_path).expect("Should have been able to read the file");
// println!("With text:\n{contents}");
run(config);
// refactor 8
// run(config);
}
// refactor 7
fn run(config: Config) -> Result<(), Box<dyn Error>> {
let contents = fs::read_to_string(config.file_path)?;
// refactor 9
// // refactor 7
// fn run(config: Config) -> Result<(), Box<dyn Error>> {
// let contents = fs::read_to_string(config.file_path)?;
println!("With text:\n{contents}")
// println!("With text:\n{contents}")
Ok(())
}
// Ok(())
// }
// refactor 3
struct Config {
query: String,
file_path: String,
}
// refactor 9
// // refactor 3
// struct Config {
// query: String,
// file_path: String,
// }
// refactor 1
// fn parse_config(args: &[String]) -> (&str, &str) {
@ -69,29 +83,30 @@ struct Config {
// Config { query, file_path }
// }
// refactor 9
// refactor 3
impl Config {
// // refactor 3
// fn new(args: &[String]) -> Config {
// // refactor 4
// if args.len() < 3 {
// panic!("not enough arguments");
// }
// let query = args[1].clone();
// let file_path = args[2].clone();
// impl Config {
// // // refactor 3
// // fn new(args: &[String]) -> Config {
// // // refactor 4
// // if args.len() < 3 {
// // panic!("not enough arguments");
// // }
// // let query = args[1].clone();
// // let file_path = args[2].clone();
// Config { query, file_path }
// }
// // Config { query, file_path }
// // }
// refactor 5
fn build(args: &[String]) -> Result<Config, &'static str> {
if args.len() < 3 {
return Err("not enough arguments");
}
// // refactor 5
// 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();
// let query = args[1].clone();
// let file_path = args[2].clone();
Ok(Config { query, file_path })
}
}
// Ok(Config { query, file_path })
// }
// }