update original

rustbook-en/ADMIN_TASKS.md

@@ -23,6 +23,11 @@ occasional maintenance tasks.
 To update the `edition = "[year]"` metadata in all the listings' `Cargo.toml`s,
 run the `./tools/update-editions.sh` script and commit the changes.
 
+## Update the `edition` in mdBook config
+
+Open `book.toml` and `nostarch/book.toml` and set the `edition` value in the
+`[rust]` table to the new edition.
+
 ## Release a new version of the listings
 
 We now make `.tar` files of complete projects containing every listing

rustbook-en/book.toml

@@ -3,7 +3,7 @@
 
 [book]
 title = "The Rust Programming Language"
-authors = ["Steve Klabnik", "Carol Nichols", "Contributions from the Rust Community"]
+authors = ["Steve Klabnik", "Carol Nichols", "Chris Krycho", "Contributions from the Rust Community"]
 
 [output.html]
 additional-css = ["ferris.css", "theme/2018-edition.css", "theme/semantic-notes.css", "theme/listing.css"]

rustbook-en/ci/dictionary.txt

@@ -269,6 +269,7 @@ JoinHandle
 Kay's
 kinded
 Klabnik
+Krycho
 lang
 LastWriteTime
 latin

rustbook-en/nostarch/book.toml

@@ -13,3 +13,6 @@ build-dir = "../tmp"
 
 [preprocessor.trpl-listing]
 output-mode = "simple"
+
+[rust]
+edition = "2021"

rustbook-en/src/appendix-02-operators.md

@@ -102,7 +102,7 @@ hierarchy to an item.
 | Symbol | Explanation |
 |--------|-------------|
 | `ident::ident` | Namespace path |
-| `::path` | Path relative to the crate root (i.e., an explicitly absolute path) |
+| `::path` | Path relative to the extern prelude, where all other crates are rooted (i.e., an explicitly absolute path including crate name) |
 | `self::path` | Path relative to the current module (i.e., an explicitly relative path). |
 | `super::path` | Path relative to the parent of the current module |
 | `type::ident`, `<type as trait>::ident` | Associated constants, functions, and types |

rustbook-en/src/ch17-01-futures-and-syntax.md

@@ -239,10 +239,10 @@ Most languages which support async bundle a runtime with the language. Rust does
 not. Instead, there are many different async runtimes available, each of which
 makes different tradeoffs suitable to the use case they target. For example, a
 high-throughput web server with many CPU cores and a large amount of RAM has
-very different different needs than a microcontroller with a single core, a
-small amount of RAM, and no ability to do heap allocations. The crates which
-provide those runtimes also often supply async versions of common functionality
-such as file or network I/O.
+very different needs than a microcontroller with a single core, a small amount
+of RAM, and no ability to do heap allocations. The crates which provide those
+runtimes also often supply async versions of common functionality such as file
+or network I/O.
 
 Here, and throughout the rest of this chapter, we’ll use the `run` function
 from the `trpl` crate, which takes a future as an argument and runs it to

rustbook-en/src/title-page.md

@@ -1,6 +1,7 @@
 # The Rust Programming Language
 
-*by Steve Klabnik and Carol Nichols, with contributions from the Rust Community*
+*by Steve Klabnik, Carol Nichols, and Chris Krycho, with contributions from the
+Rust Community*
 
 This version of the text assumes you’re using Rust 1.81.0 (released 2024-09-04)
 or later. See the [“Installation” section of Chapter 1][install]<!-- ignore -->