New upstream version 1.63.0+dfsg1

[rustc.git] / src / doc / book / listings / ch12-an-io-project / listing-12-24 / src / lib.rs

diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
index 0a3478f46a713934e69f18bde9e0c62dafc08573..292b0978975d729097626378dcc737ca972fe639 100644 (file)
--- a/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
@@ -4,31 +4,31 @@ use std::fs;
 
 pub struct Config {
     pub query: String,
-    pub filename: String,
+    pub file_path: String,
     pub ignore_case: bool,
 }
 
 impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+    pub fn build(args: &[String]) -> Result<Config, &'static str> {
         if args.len() < 3 {
             return Err("not enough arguments");
         }
 
         let query = args[1].clone();
-        let filename = args[2].clone();
+        let file_path = args[2].clone();
 
         let ignore_case = env::var("IGNORE_CASE").is_ok();
 
         Ok(Config {
             query,
-            filename,
+            file_path,
             ignore_case,
         })
     }
 }
 
 pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
-    let contents = fs::read_to_string(config.filename)?;
+    let contents = fs::read_to_string(config.file_path)?;
 
     let results = if config.ignore_case {
         search_case_insensitive(&config.query, &contents)
@@ -37,7 +37,7 @@ pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
     };
 
     for line in results {
-        println!("{}", line);
+        println!("{line}");
     }
 
     Ok(())