about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <476013+matthiaskrgr@users.noreply.github.com>2025-03-12 08:06:48 +0100
committerGitHub <noreply@github.com>2025-03-12 08:06:48 +0100
commit53e4e6f0cca1106756706ade6d8aa26601e10f14 (patch)
tree03f472686afd7be37d4cbb8946747b0a8d66dd0f
parent143eb4f03eabc7543095b7d6827e62f1de1b0284 (diff)
parent61339997194448cd8b18b422f32ced0126963213 (diff)
downloadrust-53e4e6f0cca1106756706ade6d8aa26601e10f14.tar.gz
rust-53e4e6f0cca1106756706ade6d8aa26601e10f14.zip
Rollup merge of #138313 - rustbot:docs-update, r=jieyouxu
Update books

## rust-lang/book

11 commits in 4a01a9182496f807aaa5f72d93a25ce18bcbe105..81a976a237f84b8392c4ce1bd5fd076eb757a2eb
2025-02-27 22:10:41 UTC to 2025-02-24 18:36:27 UTC

- Ch. 10: Make social media discussion generic. (rust-lang/book#4249)
- Another Ch. 17 -> 18 fix (rust-lang/book#4247)
- Ch. 05: further tweak to wording about `user1` availability (rust-lang/book#4246)
- Ch. 02: Fix rand version mistake (from testing) (rust-lang/book#4245)
- Ch. 19: Correct the discussion of `fn` type and closures (rust-lang/book#4244)
- Edition maintenance: scripting the updates for future work (rust-lang/book#4243)
- Ch. 17: fresh-eyes edits (rust-lang/book#4242)
- Ch. 17: drop lifetime not required in 2024 Edition (rust-lang/book#4212)
- Appendix B, Operators: Replace “member access” with “field access” and “method call”. (rust-lang/book#4240)
- Update to Rust 1.85 and 2024 Edition! (rust-lang/book#4241)
- Chapter 1: fix 'four things' now that spacing is not emphasized (rust-lang/book#4239)

## rust-lang/edition-guide

2 commits in daa4b763cd848f986813b5cf8069e1649f7147af..1e27e5e6d5133ae4612f5cc195c15fc8d51b1c9c
2025-03-04 22:02:00 UTC to 2025-02-26 12:47:41 UTC

- Mention both `rustfmt.toml` and `.rustfmt.toml` (rust-lang/edition-guide#372)
- Fix a typo (rust-lang/edition-guide#370)

## rust-lang/nomicon

1 commits in 8f5c7322b65d079aa5b242eb10d89a98e12471e1..b4448fa406a6dccde62d1e2f34f70fc51814cdcc
2025-03-01 04:48:05 UTC to 2025-03-01 04:48:05 UTC

- Update to 2024 edition (rust-lang/nomicon#481)

## rust-lang/reference

8 commits in 615b4cec60c269cfc105d511c93287620032d5b0..dda31c85f2ef2e5d2f0f2f643c9231690a30a626
2025-03-09 14:25:25 UTC to 2025-02-25 16:07:17 UTC

- Rework note blocks and change admonition rendering (rust-lang/reference#1754)
- Add more information on rules and tests (rust-lang/reference#1753)
- Mention `explicit_builtin_cfgs_in_flags` lint cfg chapter (rust-lang/reference#1747)
- fixup test links (rust-lang/reference#1741)
- Fix diagnostics typo: `do_no_recommend` -> `do_not_recommend` (rust-lang/reference#1749)
- panic runtime and C-unwind documentation (rust-lang/reference#1226)
- Closures: fix example of desugaring (rust-lang/reference#1743)
- Update boolean.md, Comment breaks paragraph format (rust-lang/reference#1744)

## rust-lang/rust-by-example

1 commits in 66543bbc5b7dbd4e679092c07ae06ba6c73fd912..6f69823c28ae8d929d6c815181c73d3e99ef16d3
2025-03-09 13:12:24 UTC to 2025-03-09 13:12:24 UTC

- Update mdbook to 0.4.46 (rust-lang/rust-by-example#1914)

try-job: x86_64-gnu-distcheck
-rw-r--r--src/bootstrap/src/core/build_steps/vendor.rs1
m---------src/doc/book0
m---------src/doc/edition-guide0
m---------src/doc/nomicon0
m---------src/doc/reference0
m---------src/doc/rust-by-example0
6 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/build_steps/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs
index 984c70955d7..0caeb328811 100644
--- a/src/bootstrap/src/core/build_steps/vendor.rs
+++ b/src/bootstrap/src/core/build_steps/vendor.rs
@@ -103,6 +103,7 @@ impl Step for Vendor {
         // Will read the libstd Cargo.toml
         // which uses the unstable `public-dependency` feature.
         cmd.env("RUSTC_BOOTSTRAP", "1");
+        cmd.env("RUSTC", &builder.initial_rustc);
 
         cmd.current_dir(self.root_dir).arg(&self.output_dir);
 
diff --git a/src/doc/book b/src/doc/book
-Subproject 4a01a9182496f807aaa5f72d93a25ce18bcbe10
+Subproject 81a976a237f84b8392c4ce1bd5fd076eb757a2e
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject daa4b763cd848f986813b5cf8069e1649f7147a
+Subproject 1e27e5e6d5133ae4612f5cc195c15fc8d51b1c9
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject 8f5c7322b65d079aa5b242eb10d89a98e12471e
+Subproject b4448fa406a6dccde62d1e2f34f70fc51814cdc
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 615b4cec60c269cfc105d511c93287620032d5b
+Subproject dda31c85f2ef2e5d2f0f2f643c9231690a30a62
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 66543bbc5b7dbd4e679092c07ae06ba6c73fd91
+Subproject 6f69823c28ae8d929d6c815181c73d3e99ef16d