Merge branch 'main' into add_vietnamese

Author: carols10cents

CONTRIBUTING.md

@@ -12,7 +12,7 @@ they only get updated when edits are sent to No Starch. **Do not submit pull
 requests changing files in the `nostarch` directory, they will be closed.**
 
 We use [`rustfmt`][rustfmt] to apply standard formatting to Rust code in the
-repo and [`dprint`][dprint] to apply standing formatting to the Markdown source
+repo and [`dprint`][dprint] to apply standard formatting to the Markdown source
 and the non-Rust code in the project.
 
 [rustfmt]: https://github.com/rust-lang/rustfmt

ci/dictionary.txt

@@ -58,6 +58,7 @@ booleans
 Bors
 BorrowMutError
 BoxMeUp
+boxt
 BTreeSet
 BufRead
 BufReader
@@ -167,6 +168,7 @@ eprintln
 Erlang
 ErrorKind
 Español
+ETAPS
 eval
 executables
 ExitCode
@@ -343,6 +345,7 @@ mutexes
 Mutexes
 MutexGuard
 mutext
+mutextarct
 MyAsyncStateMachine
 MyBox
 myprogram
@@ -376,6 +379,7 @@ OpenGL
 optimizations
 OptionalFloatingPointNumber
 OptionalNumber
+optiont
 OsStr
 OsString
 other's
@@ -439,6 +443,7 @@ refactoring
 refcell
 RefCell
 refcellt
+refcelltrct
 RefMut
 reformats
 refutability
@@ -455,6 +460,7 @@ retweet
 rewordings
 rint
 ripgrep
+Rumbul
 runnable
 runtime
 runtimes
@@ -596,6 +602,7 @@ unsynchronized
 Unyank
 UpperCamelCase
 URIs
+urls
 UsefulType
 username
 USERPROFILE
@@ -619,6 +626,7 @@ wasi
 wasn
 weakt
 WeatherForecast
+webpage
 WebSocket
 whitespace
 wildcard

listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs

@@ -2,11 +2,11 @@ pub fn add(left: u64, right: u64) -> u64 {
     left + right
 }
 
+// ANCHOR: here
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    // ANCHOR: here
     #[test]
     fn it_works() -> Result<(), String> {
         let result = add(2, 2);
@@ -17,5 +17,5 @@ mod tests {
             Err(String::from("two plus two does not equal four"))
         }
     }
-    // ANCHOR_END: here
 }
+// ANCHOR_END: here

listings/ch15-smart-pointers/listing-15-14/output.txt

@@ -2,6 +2,6 @@ $ cargo run
    Compiling drop-example v0.1.0 (file:///projects/drop-example)
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.60s
      Running `target/debug/drop-example`
-CustomSmartPointers created.
+CustomSmartPointers created
 Dropping CustomSmartPointer with data `other stuff`!
 Dropping CustomSmartPointer with data `my stuff`!

listings/ch15-smart-pointers/listing-15-14/src/main.rs

@@ -15,5 +15,5 @@ fn main() {
     let d = CustomSmartPointer {
         data: String::from("other stuff"),
     };
-    println!("CustomSmartPointers created.");
+    println!("CustomSmartPointers created");
 }

listings/ch15-smart-pointers/listing-15-15/src/main.rs

@@ -13,8 +13,8 @@ fn main() {
     let c = CustomSmartPointer {
         data: String::from("some data"),
     };
-    println!("CustomSmartPointer created.");
+    println!("CustomSmartPointer created");
     c.drop();
-    println!("CustomSmartPointer dropped before the end of main.");
+    println!("CustomSmartPointer dropped before the end of main");
 }
 // ANCHOR_END: here

listings/ch15-smart-pointers/listing-15-16/output.txt

@@ -2,6 +2,6 @@ $ cargo run
    Compiling drop-example v0.1.0 (file:///projects/drop-example)
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.73s
      Running `target/debug/drop-example`
-CustomSmartPointer created.
+CustomSmartPointer created
 Dropping CustomSmartPointer with data `some data`!
-CustomSmartPointer dropped before the end of main.
+CustomSmartPointer dropped before the end of main

listings/ch15-smart-pointers/listing-15-16/src/main.rs

@@ -13,8 +13,8 @@ fn main() {
     let c = CustomSmartPointer {
         data: String::from("some data"),
     };
-    println!("CustomSmartPointer created.");
+    println!("CustomSmartPointer created");
     drop(c);
-    println!("CustomSmartPointer dropped before the end of main.");
+    println!("CustomSmartPointer dropped before the end of main");
 }
 // ANCHOR_END: here

listings/ch15-smart-pointers/listing-15-25/src/main.rs

@@ -1,3 +1,4 @@
+// ANCHOR: here
 use crate::List::{Cons, Nil};
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -16,5 +17,6 @@ impl List {
         }
     }
 }
+// ANCHOR_END: here
 
 fn main() {}

listings/ch17-async-await/listing-17-04/src/main.rs

@@ -6,7 +6,7 @@ use trpl::Html;
 fn main() {
     let args: Vec<String> = std::env::args().collect();
 
-    trpl::run(async {
+    trpl::block_on(async {
         let url = &args[1];
         match page_title(url).await {
             Some(title) => println!("The title for {url} was {title}"),