Keep struct Config private in chapter 12 listings rust-lang#4554 and rust-lang#4555

nixxo · nixxo · commit 0e30ff45f44a · 2025-11-02T12:04:18.000+01:00
diff --git a/listings/ch12-an-io-project/listing-12-22/src/main.rs b/listings/ch12-an-io-project/listing-12-22/src/main.rs
@@ -25,10 +25,10 @@ fn main() {
 }
 
 // ANCHOR: here
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 // ANCHOR_END: here
 
diff --git a/listings/ch12-an-io-project/listing-12-23/src/main.rs b/listings/ch12-an-io-project/listing-12-23/src/main.rs
@@ -19,10 +19,10 @@ fn main() {
     }
 }
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 // ANCHOR: here
diff --git a/listings/ch12-an-io-project/listing-12-24/src/main.rs b/listings/ch12-an-io-project/listing-12-24/src/main.rs
@@ -21,10 +21,10 @@ fn main() {
 }
 // ANCHOR_END: here
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 impl Config {
diff --git a/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs b/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs
@@ -1,36 +1,3 @@
-use std::error::Error;
-use std::fs;
-
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-}
-
-impl Config {
-    pub fn build(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("Non ci sono abbastanza argomenti");
-        }
-
-        let query = args[1].clone();
-        let percorso_file = args[2].clone();
-
-        Ok(Config { query, percorso_file })
-    }
-}
-
-// ANCHOR: here
-pub fn esegui(config: Config) -> Result<(), Box<dyn Error>> {
-    let contenuto = fs::read_to_string(config.percorso_file)?;
-
-    for line in cerca(&config.query, &contenuto) {
-        println!("{line}");
-    }
-
-    Ok(())
-}
-// ANCHOR_END: here
-
 pub fn cerca<'a>(query: &str, contenuto: &'a str) -> Vec<&'a str> {
     let mut risultato = Vec::new();
 
diff --git a/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs b/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs
@@ -1,7 +1,9 @@
 use std::env;
+use std::error::Error;
+use std::fs;
 use std::process;
 
-use minigrep::Config;
+use minigrep::cerca;
 
 fn main() {
     let args: Vec<String> = env::args().collect();
@@ -11,8 +13,36 @@ fn main() {
         process::exit(1);
     });
 
-    if let Err(e) = minigrep::esegui(config) {
+    if let Err(e) = esegui(config) {
         println!("Errore nell'applicazione: {e}");
         process::exit(1);
     }
 }
+
+struct Config {
+    query: String,
+    percorso_file: String,
+}
+
+impl Config {
+    fn build(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("Non ci sono abbastanza argomenti");
+        }
+
+        let query = args[1].clone();
+        let percorso_file = args[2].clone();
+
+        Ok(Config { query, percorso_file })
+    }
+}
+
+fn esegui(config: Config) -> Result<(), Box<dyn Error>> {
+    let contenuto = fs::read_to_string(config.percorso_file)?;
+
+    for line in cerca(&config.query, &contenuto) {
+        println!("{line}");
+    }
+
+    Ok(())
+}
diff --git a/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs b/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs
@@ -1,36 +1,3 @@
-use std::error::Error;
-use std::fs;
-
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-}
-
-impl Config {
-    pub fn build(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("Non ci sono abbastanza argomenti");
-        }
-
-        let query = args[1].clone();
-        let percorso_file = args[2].clone();
-
-        Ok(Config { query, percorso_file })
-    }
-}
-
-// ANCHOR: here
-pub fn esegui(config: Config) -> Result<(), Box<dyn Error>> {
-    let contenuto = fs::read_to_string(config.percorso_file)?;
-
-    for line in cerca(&config.query, &contenuto) {
-        println!("{line}");
-    }
-
-    Ok(())
-}
-// ANCHOR_END: here
-
 pub fn cerca<'a>(query: &str, contenuto: &'a str) -> Vec<&'a str> {
     let mut risultato = Vec::new();
 
diff --git a/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs b/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs
@@ -1,7 +1,9 @@
 use std::env;
+use std::error::Error;
+use std::fs;
 use std::process;
 
-use minigrep::Config;
+use minigrep::cerca;
 
 fn main() {
     let args: Vec<String> = env::args().collect();
@@ -11,8 +13,36 @@ fn main() {
         process::exit(1);
     });
 
-    if let Err(e) = minigrep::esegui(config) {
+    if let Err(e) = esegui(config) {
         println!("Errore nell'applicazione: {e}");
         process::exit(1);
     }
 }
+
+struct Config {
+    query: String,
+    percorso_file: String,
+}
+
+impl Config {
+    fn build(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("Non ci sono abbastanza argomenti");
+        }
+
+        let query = args[1].clone();
+        let percorso_file = args[2].clone();
+
+        Ok(Config { query, percorso_file })
+    }
+}
+
+fn esegui(config: Config) -> Result<(), Box<dyn Error>> {
+    let contenuto = fs::read_to_string(config.percorso_file)?;
+
+    for line in cerca(&config.query, &contenuto) {
+        println!("{line}");
+    }
+
+    Ok(())
+}
diff --git a/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs b/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs
@@ -19,10 +19,10 @@ fn main() {
     }
 }
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 // ANCHOR: ch13
diff --git a/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs b/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs
@@ -25,10 +25,10 @@ fn main() {
 }
 // ANCHOR_END: ch13
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 impl Config {
diff --git a/listings/ch13-functional-features/listing-13-18/src/main.rs b/listings/ch13-functional-features/listing-13-18/src/main.rs
@@ -23,10 +23,10 @@ fn main() {
 }
 // ANCHOR_END: here
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 impl Config {
diff --git a/listings/ch13-functional-features/listing-13-19/src/main.rs b/listings/ch13-functional-features/listing-13-19/src/main.rs
@@ -17,10 +17,10 @@ fn main() {
     }
 }
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 // ANCHOR: here
diff --git a/listings/ch13-functional-features/listing-13-20/src/main.rs b/listings/ch13-functional-features/listing-13-20/src/main.rs
@@ -17,10 +17,10 @@ fn main() {
     }
 }
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 // ANCHOR: here
diff --git a/listings/ch13-functional-features/listing-13-22/src/main.rs b/listings/ch13-functional-features/listing-13-22/src/main.rs
@@ -17,10 +17,10 @@ fn main() {
     }
 }
 
-pub struct Config {
-    pub query: String,
-    pub percorso_file: String,
-    pub ignora_maiuscole: bool,
+struct Config {
+    query: String,
+    percorso_file: String,
+    ignora_maiuscole: bool,
 }
 
 impl Config {

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ fn main() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// ANCHOR: here`
`28`		`-pub struct Config {`
`29`		`- pub query: String,`
`30`		`- pub percorso_file: String,`
`31`		`- pub ignora_maiuscole: bool,`
	`28`	`+struct Config {`
	`29`	`+ query: String,`
	`30`	`+ percorso_file: String,`
	`31`	`+ ignora_maiuscole: bool,`
`32`	`32`	`}`
`33`	`33`	`// ANCHOR_END: here`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ fn main() {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-pub struct Config {`
`23`		`- pub query: String,`
`24`		`- pub percorso_file: String,`
`25`		`- pub ignora_maiuscole: bool,`
	`22`	`+struct Config {`
	`23`	`+ query: String,`
	`24`	`+ percorso_file: String,`
	`25`	`+ ignora_maiuscole: bool,`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// ANCHOR: here`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ fn main() {`
`21`	`21`	`}`
`22`	`22`	`// ANCHOR_END: here`
`23`	`23`
`24`		`-pub struct Config {`
`25`		`- pub query: String,`
`26`		`- pub percorso_file: String,`
`27`		`- pub ignora_maiuscole: bool,`
	`24`	`+struct Config {`
	`25`	`+ query: String,`
	`26`	`+ percorso_file: String,`
	`27`	`+ ignora_maiuscole: bool,`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`impl Config {`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ fn main() {`
`23`	`23`	`}`
`24`	`24`	`// ANCHOR_END: here`
`25`	`25`
`26`		`-pub struct Config {`
`27`		`- pub query: String,`
`28`		`- pub percorso_file: String,`
`29`		`- pub ignora_maiuscole: bool,`
	`26`	`+struct Config {`
	`27`	`+ query: String,`
	`28`	`+ percorso_file: String,`
	`29`	`+ ignora_maiuscole: bool,`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl Config {`