Skip to content
/ rust Public
forked from rust-lang/rust

Commit

Permalink
Rollup merge of rust-lang#134388 - rustbot:docs-update, r=ehuss
Browse files Browse the repository at this point in the history
Update books

## rust-lang/book

21 commits in 9900d976bbfecf4e8124da54351a9ad85ee3c7f3..ad2011d3bcad9f152d034faf7635c22506839d58
2024-12-16 16:11:34 UTC to 2024-12-05 19:19:24 UTC

- Ch. 10: clarify note about compiler errors and `'static` (rust-lang/book#4164)
- Introduce `let`-`else` statement (rust-lang/book#3702)
- Fix misleading explanation of comma in `$(),*` (rust-lang/book#3800)
- ch18-03: Matching Named Variables: mention `if let`/`while let` (rust-lang/book#3110)
- Ch. 4: Rephrase/clarify paragraph on reference scope (rust-lang/book#3688)
- Simplify note about functions in ch13-01-closures.md (rust-lang/book#3699)
- fix: make the reason more understandable (rust-lang/book#4074)
- Fixed grammatical error in the comment on line 22 (rust-lang/book#3180)
- ch17-02: Monomorphization applies to generics in general  (rust-lang/book#3367)
- Ch. 21: Use `Vec::drain` to teach alternatives to `Option` (rust-lang/book#4159)
- fix(typo): correct punctuation in ch15-06-reference-cycles.md (rust-lang/book#4155)
- Ch. 20: show both `impl Fn` and `Box<dyn Fn>` (rust-lang/book#4152)
- Add `use super::*;` to unit-test examples. (rust-lang/book#4151)
- Remove emphasis on four-space indents (rust-lang/book#4150)
- Fix `.git-blame-ignore-revs` file (rust-lang/book#4149)
- Rust 2024: distinguish `unsafe fn` vs. `unsafe` blocks (rust-lang/book#4148)
- Update README.md typo (rust-lang/book#4146)
- Ch. 15.5: account for improved error message (rust-lang/book#4142)
- Document use of rustfmt and dprint for formatting (rust-lang/book#4138)
- tools: fix nostarch build reference to mdbook-trpl (rust-lang/book#4137)
- Revise sentence to not refer to two subjects as it (rust-lang/book#4136)

## rust-lang/edition-guide

4 commits in 128669297c8a7fdf771042eaec18b8adfaeaf0cd..f56c9ae2d5b4344367e96513aea9eafb33c897e4
2024-12-10 21:29:01 UTC to 2024-12-04 21:24:35 UTC

- Show tail expression temporary example that fails in 2024 (rust-lang/edition-guide#345)
- Add more triagebot labeling support (rust-lang/edition-guide#346)
- 2024: Assignment operator RHS indentation (rust-lang/edition-guide#341)
- 2024: Add chapter on single-line `where` clauses (rust-lang/edition-guide#340)

## rust-lang/nomicon

1 commits in 0674321898cd454764ab69702819d39a919afd68..97e84a38c94bf9362b11284c20b2cb4adaa1e868
2024-12-10 02:41:27 UTC to 2024-12-10 02:41:27 UTC

- races.md: data race -> race condition to violate memory safety (rust-lang/nomicon#470)

## rust-lang/reference

4 commits in ede56d1bbe132bac476b5029cd6d7508ca9572e9..183dd4b95f35dce35527d9fe68d869ac35e640e3
2024-12-14 21:22:49 UTC to 2024-12-06 03:21:54 UTC

- Describe async closures (rust-lang/reference#1692)
- Update closures for edition 2021 disjoint closure capturing (rust-lang/reference#1521)
- Fix paragraphs with trailing `\1` (rust-lang/reference#1696)
- Add triagebot autolabel (rust-lang/reference#1694)

## rust-lang/rust-by-example

1 commits in e1d1f2cdcee4d52b9a01ff7c448be4372a377b70..76406337f4131253443aea0ed7e7f451b464117c
2024-12-07 00:24:30 UTC to 2024-12-07 00:24:30 UTC

- Fix rust-lang#1900 (rust-lang/rust-by-example#1901)

## rust-lang/rustc-dev-guide

9 commits in b21d99b..7f7ba48f04abc2ad25e52f30b5e2bffa286b019f
2024-12-16 07:12:01 UTC to 2024-12-05 05:01:46 UTC

- Specify what a CGU is (rust-lang/rustc-dev-guide#2163)
- functionality removed from codebase (part 2) (rust-lang/rustc-dev-guide#2160)
- functionality removed from codebase (rust-lang/rustc-dev-guide#2159)
- remove polymorphization (rust-lang/rustc-dev-guide#2158)
- squashing: recommend --keep-base when squashing without a conflict (rust-lang/rustc-dev-guide#2157)
- update section even more (rust-lang/rustc-dev-guide#2156)
- extend closure constraints section (rust-lang/rustc-dev-guide#2155)
- Remove `//@ compare-output-lines-by-subset` directive (rust-lang/rustc-dev-guide#2151)
- Document `needs-target-has-atomic` directive (rust-lang/rustc-dev-guide#2154)
  • Loading branch information
jhpratt authored Dec 17, 2024
2 parents c1a739a + 9cfc105 commit 36cafcd
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 50 files
+1 −1 .git-blame-ignore-revs
+29 −0 CONTRIBUTING.md
+1 −1 README.md
+3 −2 listings/ch04-understanding-ownership/listing-04-08/src/main.rs
+2 −2 listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-07/Cargo.lock
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-07/Cargo.toml
+45 −0 listings/ch06-enums-and-pattern-matching/listing-06-07/src/main.rs
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-08/Cargo.lock
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-08/Cargo.toml
+45 −0 listings/ch06-enums-and-pattern-matching/listing-06-08/src/main.rs
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-09/Cargo.lock
+6 −0 listings/ch06-enums-and-pattern-matching/listing-06-09/Cargo.toml
+43 −0 listings/ch06-enums-and-pattern-matching/listing-06-09/src/main.rs
+1 −1 listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs
+1 −1 listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs
+1 −1 listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs
+1 −1 listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs
+0 −20 listings/ch20-advanced-features/no-listing-18-returns-closure/output.txt
+1 −1 listings/ch20-advanced-features/no-listing-18-returns-closure/src/lib.rs
+0 −3 listings/ch20-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs
+15 −0 listings/ch20-advanced-features/no-listing-19-returns-closure-trait-object/src/main.rs
+4 −9 listings/ch21-web-server/listing-21-23/src/lib.rs
+4 −9 listings/ch21-web-server/listing-21-24/src/lib.rs
+4 −9 listings/ch21-web-server/listing-21-25/src/lib.rs
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/404.html
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/Cargo.lock
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/Cargo.toml
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/hello.html
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/output.txt
+4 −4 listings/ch21-web-server/no-listing-04-update-drop-definition/src/lib.rs
+0 −0 listings/ch21-web-server/no-listing-04-update-drop-definition/src/main.rs
+1 −1 src/SUMMARY.md
+3 −5 src/ch01-02-hello-world.md
+4 −4 src/ch04-02-references-and-borrowing.md
+6 −4 src/ch04-03-slices.md
+64 −2 src/ch06-03-if-let.md
+1 −1 src/ch10-03-lifetime-syntax.md
+6 −3 src/ch11-01-writing-tests.md
+6 −6 src/ch13-01-closures.md
+4 −3 src/ch15-05-interior-mutability.md
+1 −1 src/ch15-06-reference-cycles.md
+9 −10 src/ch18-02-trait-objects.md
+5 −5 src/ch19-02-refutability.md
+16 −15 src/ch19-03-pattern-syntax.md
+8 −3 src/ch20-01-unsafe-rust.md
+15 −15 src/ch20-05-advanced-functions-and-closures.md
+3 −2 src/ch20-06-macros.md
+30 −52 src/ch21-03-graceful-shutdown-and-cleanup.md
+1 −1 tools/nostarch.sh
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated 1 files
+2 −2 src/races.md
2 changes: 1 addition & 1 deletion src/doc/rust-by-example

0 comments on commit 36cafcd

Please sign in to comment.