2024 Print Edition: updates to Word docs and more fixes to Markdown text

listings/ch08-common-collections/listing-08-19/src/main.rs

@@ -1,6 +1,6 @@
 fn main() {
     // ANCHOR: here
-    let s1 = String::from("hello");
+    let s1 = String::from("hi");
     let h = s1[0];
     // ANCHOR_END: here
 }

listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder", "add_one"]

listings/ch14-more-about-cargo/no-listing-01-workspace/add/Cargo.toml

@@ -1,2 +1,2 @@
 [workspace]
-resolver = "2"
+resolver = "3"

listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder", "add_one"]

listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder", "add_one"]

listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder", "add_one"]

listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder"]

listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [ "add_one","adder"]

listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["adder", "add_one"]

listings/ch19-patterns-and-matching/listing-19-09/src/main.rs

@@ -1,8 +1,8 @@
 fn main() {
     let some_option_value: Option<i32> = None;
     // ANCHOR: here
-    if let Some(x) = some_option_value {
-        println!("{x}");
-    }
+    let Some(x) = some_option_value else {
+        return;
+    };
     // ANCHOR_END: here
 }

listings/ch19-patterns-and-matching/listing-19-10/src/main.rs

@@ -1,7 +1,7 @@
 fn main() {
     // ANCHOR: here
-    if let x = 5 {
-        println!("{x}");
+    let x = 5 else {
+        return;
     };
     // ANCHOR_END: here
 }

listings/ch19-patterns-and-matching/listing-19-15/src/main.rs

@@ -19,7 +19,7 @@ fn main() {
             println!("Text message: {text}");
         }
         Message::ChangeColor(r, g, b) => {
-            println!("Change the color to red {r}, green {g}, and blue {b}");
+            println!("Change color to red {r}, green {g}, and blue {b}");
         }
     }
 }

listings/ch19-patterns-and-matching/listing-19-19/src/main.rs

@@ -4,7 +4,7 @@ fn main() {
 
     match numbers {
         (first, _, third, _, fifth) => {
-            println!("Some numbers: {first}, {third}, {fifth}")
+            println!("Some numbers: {first}, {third}, {fifth}");
         }
     }
     // ANCHOR_END: here

listings/ch20-advanced-features/listing-20-11/output.txt

@@ -1,5 +1,5 @@
 $ cargo +nightly miri run
    Compiling unsafe-example v0.1.0 (file:///projects/unsafe-example)
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.01s
-     Running `/Users/chris/.rustup/toolchains/nightly-aarch64-apple-darwin/bin/cargo-miri runner target/miri/aarch64-apple-darwin/debug/unsafe-example`
+     Running `file:///home/.rustup/toolchains/nightly/bin/cargo-miri runner target/miri/debug/unsafe-example`
 COUNTER: 3

listings/ch20-advanced-features/listing-20-12/src/main.rs

@@ -1,9 +1,11 @@
+// ANCHOR: here
 unsafe trait Foo {
     // methods go here
 }
 
 unsafe impl Foo for i32 {
     // method implementations go here
 }
+// ANCHOR_END: here
 
 fn main() {}

listings/ch20-advanced-features/listing-20-29/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "macros-example"
+name = "functions-example"
 version = "0.1.0"
 edition = "2024"
 

listings/ch20-advanced-features/listing-20-31/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "hello_macro"
+name = "functions-example"
 version = "0.1.0"
 edition = "2024"
 

listings/ch20-advanced-features/listing-20-31/src/main.rs

@@ -1,9 +1,10 @@
-use hello_macro::HelloMacro;
-use hello_macro_derive::HelloMacro;
-
-#[derive(HelloMacro)]
-struct Pancakes;
-
 fn main() {
-    Pancakes::hello_macro();
+    // ANCHOR: here
+    enum Status {
+        Value(u32),
+        Stop,
+    }
+
+    let list_of_statuses: Vec<Status> = (0u32..20).map(Status::Value).collect();
+    // ANCHOR_END: here
 }

listings/ch20-advanced-features/listing-20-32/src/lib.rs

@@ -0,0 +1,3 @@
+fn returns_closure() -> impl Fn(i32) -> i32 {
+    |x| x + 1
+}

listings/ch20-advanced-features/listing-20-33/output.txt

@@ -0,0 +1,20 @@
+$ cargo build
+   Compiling functions-example v0.1.0 (file:///projects/functions-example)
+    error[E0308]: mismatched types
+    --> src/main.rs:4:9
+    |
+    4  |         returns_initialized_closure(123)
+    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected opaque type, found a different opaque type
+    ...
+    12 | fn returns_closure() -> impl Fn(i32) -> i32 {
+    |                         ------------------- the expected opaque type
+    ...
+    16 | fn returns_initialized_closure(init: i32) -> impl Fn(i32) -> i32 {
+    |                                              ------------------- the found opaque type
+    |
+    = note: expected opaque type `impl Fn(i32) -> i32` (opaque type at <src/main.rs:12:25>)
+                found opaque type `impl Fn(i32) -> i32` (opaque type at <src/main.rs:16:46>)
+    = note: distinct uses of `impl Trait` result in different opaque types
+
+    For more information about this error, try `rustc --explain E0308`.
+    error: could not compile `functions-example` (bin "functions-example") due to 1 previous error

listings/ch20-advanced-features/listing-20-33/src/main.rs

@@ -0,0 +1,15 @@
+fn main() {
+    let handlers = vec![returns_closure(), returns_initialized_closure(123)];
+    for handler in handlers {
+        let output = handler(5);
+        println!("{output}");
+    }
+}
+
+fn returns_closure() -> impl Fn(i32) -> i32 {
+    |x| x + 1
+}
+
+fn returns_initialized_closure(init: i32) -> impl Fn(i32) -> i32 {
+    move |x| x + init
+}

listings/ch20-advanced-features/no-listing-19-returns-closure-trait-object/src/main.rs → listings/ch20-advanced-features/listing-20-34/src/main.rs

@@ -6,10 +6,12 @@ fn main() {
     }
 }
 
+// ANCHOR: here
 fn returns_closure() -> Box<dyn Fn(i32) -> i32> {
     Box::new(|x| x + 1)
 }
 
 fn returns_initialized_closure(init: i32) -> Box<dyn Fn(i32) -> i32> {
     Box::new(move |x| x + init)
 }
+// ANCHOR_END: here

listings/ch20-advanced-features/listing-20-35/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "macros-example"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]

listings/ch20-advanced-features/listing-20-37/src/main.rs

@@ -0,0 +1,9 @@
+use hello_macro::HelloMacro;
+use hello_macro_derive::HelloMacro;
+
+#[derive(HelloMacro)]
+struct Pancakes;
+
+fn main() {
+    Pancakes::hello_macro();
+}

listings/ch20-advanced-features/listing-20-40/hello_macro/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]

listings/ch20-advanced-features/listing-20-42/hello_macro/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]

listings/ch20-advanced-features/listing-20-42/hello_macro/src/lib.rs

@@ -0,0 +1,3 @@
+pub trait HelloMacro {
+    fn hello_macro();
+}