Merge pull request #4272 from rust-lang/nostarch-backports

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

Author: chriskrycho

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
 }