Merge remote-tracking branch 'upstream/main' into dev

Author: willcrichton

.github/workflows/main.yml

@@ -14,6 +14,9 @@ env:
   AQUASCOPE_VERSION: 0.3.8
   AQUASCOPE_TOOLCHAIN: nightly-2024-12-15
 
+env:
+  MDBOOK_VERSION: 0.5.1
+
 jobs:
   test:
     name: Run tests
@@ -35,8 +38,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.85 -c rust-docs
-        rustup default 1.85
+        rustup toolchain install 1.90 -c rust-docs
+        rustup default 1.90
 
     - name: Install Depot
       run: curl https://raw.githubusercontent.com/cognitive-engineering-lab/depot/main/scripts/install.sh | sh

2018-edition/book.toml

@@ -1,6 +1,6 @@
 [book]
 title = "The Rust Programming Language"
-author = "Steve Klabnik and Carol Nichols, with Contributions from the Rust Community"
+authors = ["Steve Klabnik", "Carol Nichols", "Contributions from the Rust Community"]
 
 [output.html]
 additional-css = ["ferris.css"]

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

README.md

@@ -29,7 +29,7 @@ Building the book requires [mdBook], ideally the same version that
 rust-lang/rust uses in [this file][rust-mdbook]. To get it:
 
 [mdBook]: https://github.com/rust-lang/mdBook
-[rust-mdbook]: https://github.com/rust-lang/rust/blob/master/src/tools/rustbook/Cargo.toml
+[rust-mdbook]: https://github.com/rust-lang/rust/blob/HEAD/src/tools/rustbook/Cargo.toml
 
 ```bash
 $ cargo install mdbook --locked --version <version_num>

book.toml

@@ -11,13 +11,14 @@ additional-css = [
   "theme/semantic-notes.css", 
   "theme/listing.css",
   "theme/2018-edition.css",
-  "js-extensions/packages/consent-form/dist/index.css",
+  # Not doing any research right now, so no need to pester users with a form.
+  # "js-extensions/packages/consent-form/dist/index.css",
   "js-extensions/packages/feedback/dist/index.css",  
 ]
 additional-js = [
   "ferris.js",
-  "js-extensions/packages/telemetry/dist/index.js",
-  "js-extensions/packages/consent-form/dist/index.js",
+  # "js-extensions/packages/telemetry/dist/index.js",
+  # "js-extensions/packages/consent-form/dist/index.js",
   "js-extensions/packages/feedback/dist/index.js",
 ]
 
@@ -29,18 +30,47 @@ validate = true
 cache-answers = true
 more-words = "words.dic"
 
-[preprocessor.aquascope]
+# [preprocessor.aquascope]
 
 # [build]
 # extra-watch-dirs = ["quizzes", "../mdbook-quiz/target/debug", "js-extensions/packages/feedback/dist"]
+[output.html.search]
+use-boolean-and = true
+
+[output.html.redirect]
+"ch17-00-oop.html" = "ch18-00-oop.html"
+"ch17-01-what-is-oo.html" = "ch18-01-what-is-oo.html"
+"ch17-02-trait-objects.html" = "ch18-02-trait-objects.html"
+"ch17-03-oo-design-patterns.html" = "ch18-03-oo-design-patterns.html"
+"ch18-00-patterns.html" = "ch19-00-patterns.html"
+"ch18-01-all-the-places-for-patterns.html" = "ch19-01-all-the-places-for-patterns.html"
+"ch18-02-refutability.html" = "ch19-02-refutability.html"
+"ch18-03-pattern-syntax.html" = "ch19-03-pattern-syntax.html"
+"ch19-00-advanced-features.html" = "ch20-00-advanced-features.html"
+"ch19-01-unsafe-rust.html" = "ch20-01-unsafe-rust.html"
+"ch19-03-advanced-traits.html" = "ch20-02-advanced-traits.html"
+"ch20-03-advanced-traits.html" = "ch20-02-advanced-traits.html"
+"ch19-04-advanced-types.html" = "ch20-03-advanced-types.html"
+"ch20-04-advanced-types.html" = "ch20-03-advanced-types.html"
+"ch19-05-advanced-functions-and-closures.html" = "ch20-04-advanced-functions-and-closures.html"
+"ch20-05-advanced-functions-and-closures.html" = "ch20-04-advanced-functions-and-closures.html"
+"ch19-06-macros.html" = "ch20-05-macros.html"
+"ch20-06-macros.html" = "ch20-05-macros.html"
+"ch20-00-final-project-a-web-server.html" = "ch21-00-final-project-a-web-server.html"
+"ch20-01-single-threaded.html" = "ch21-01-single-threaded.html"
+"ch20-02-multithreaded.html" = "ch21-02-multithreaded.html"
+"ch20-03-graceful-shutdown-and-cleanup.html" = "ch21-03-graceful-shutdown-and-cleanup.html"
 
 # Do not sync this preprocessor; it is for the HTML renderer only.
 [preprocessor.trpl-note]
+command = "cargo run --manifest-path packages/mdbook-trpl/Cargo.toml --bin mdbook-trpl-note"
 
 [preprocessor.trpl-listing]
+command = "cargo run --manifest-path packages/mdbook-trpl/Cargo.toml --bin mdbook-trpl-listing"
 output-mode = "default"
 
-# [output.linkcheck]
-
 [rust]
-edition = "2024"
+edition = "2024"
+
+[build]
+extra-watch-dirs = ["packages/mdbook-trpl"]

ci/dictionary.txt

@@ -59,6 +59,7 @@ booleans
 Bors
 BorrowMutError
 BoxMeUp
+boxt
 BTreeSet
 BufRead
 BufReader
@@ -164,6 +165,8 @@ Enums
 eprintln
 Erlang
 ErrorKind
+Español
+ETAPS
 eval
 executables
 ExitCode
@@ -304,6 +307,7 @@ memoization
 metadata
 Metadata
 metaprogramming
+metavariable
 mibbit
 Mibbit
 microcontroller
@@ -334,6 +338,7 @@ mutexes
 Mutexes
 MutexGuard
 mutext
+mutextarct
 MyAsyncStateMachine
 MyBox
 myprogram
@@ -366,6 +371,7 @@ OpenGL
 optimizations
 OptionalFloatingPointNumber
 OptionalNumber
+optiont
 OsStr
 OsString
 other's
@@ -428,6 +434,7 @@ refactoring
 refcell
 RefCell
 refcellt
+refcelltrct
 RefMut
 reformats
 refutability
@@ -443,6 +450,7 @@ retweet
 rewordings
 rint
 ripgrep
+Rumbul
 runnable
 runtime
 runtimes
@@ -580,6 +588,7 @@ unsynchronized
 Unyank
 UpperCamelCase
 URIs
+urls
 UsefulType
 username
 USERPROFILE
@@ -602,6 +611,7 @@ waitlist
 wasn
 weakt
 WeatherForecast
+webpage
 WebSocket
 whitespace
 wildcard

first-edition/book.toml

@@ -1,3 +1,3 @@
 [book]
 title = "The Rust Programming Language"
-author = "The Rust Project Developers"
+authors = ["The Rust Project Developers"]

listings/ch02-guessing-game-tutorial/listing-02-04/output.txt

@@ -18,7 +18,7 @@ error[E0308]: mismatched types
    = note: expected reference `&String`
               found reference `&{integer}`
 note: method defined here
-  --> /rustc/4eb161250e340c8f48f66e2b929ef4a5bed7c181/library/core/src/cmp.rs:964:8
+  --> /rustc/1159e78c4747b02ef996e55082b704c09b970588/library/core/src/cmp.rs:979:8
 
 For more information about this error, try `rustc --explain E0308`.
 error: could not compile `guessing_game` (bin "guessing_game") due to 1 previous error

listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt

@@ -1,15 +1,15 @@
 $ cargo run
    Compiling ownership v0.1.0 (file:///projects/ownership)
 error[E0382]: borrow of moved value: `s1`
- --> src/main.rs:5:15
+ --> src/main.rs:5:16
   |
 2 |     let s1 = String::from("hello");
   |         -- move occurs because `s1` has type `String`, which does not implement the `Copy` trait
 3 |     let s2 = s1;
   |              -- value moved here
 4 |
 5 |     println!("{s1}, world!");
-  |               ^^^^ value borrowed here after move
+  |                ^^ value borrowed here after move
   |
   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider cloning the value if the performance cost is acceptable

listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt

@@ -9,7 +9,7 @@ error[E0499]: cannot borrow `s` as mutable more than once at a time
   |              ^^^^^^ second mutable borrow occurs here
 6 |
 7 |     println!("{r1}, {r2}");
-  |               ---- first borrow later used here
+  |                -- first borrow later used here
 
 For more information about this error, try `rustc --explain E0499`.
 error: could not compile `ownership` (bin "ownership") due to 1 previous error