about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <476013+matthiaskrgr@users.noreply.github.com>2025-04-16 13:45:31 +0200
committerGitHub <noreply@github.com>2025-04-16 13:45:31 +0200
commit1bde68e26eee905c9fa7d5f23cb93f3f0857e94c (patch)
tree36d812ca2a6d015162db0e520ba5123b53ae9fbc
parentec6bdda983fd0e5253cd2fc9da8ca45896a3ef9f (diff)
parentea1b230170c36ddf95cb24a8542316df9f786e5a (diff)
downloadrust-1bde68e26eee905c9fa7d5f23cb93f3f0857e94c.tar.gz
rust-1bde68e26eee905c9fa7d5f23cb93f3f0857e94c.zip
Rollup merge of #139884 - rustbot:docs-update, r=ehuss
Update books

## rust-lang/book

1 commits in 45f05367360f033f89235eacbbb54e8d73ce6b70..d33916341d480caede1d0ae57cbeae23aab23e88
2025-04-08 18:24:27 UTC to 2025-04-08 18:24:27 UTC

- Ch01+ch02 after tech review (rust-lang/book#4329)

## rust-lang/edition-guide

2 commits in 1e27e5e6d5133ae4612f5cc195c15fc8d51b1c9c..467f45637b73ec6aa70fb36bc3054bb50b8967ea
2025-04-15 19:49:59 UTC to 2025-04-11 15:27:31 UTC

- fix grammar errors (rust-lang/edition-guide#374)
- remove the unused and deprecated `multilingual` field from `book.toml` (rust-lang/edition-guide#375)

## rust-lang/nomicon

2 commits in b4448fa406a6dccde62d1e2f34f70fc51814cdcc..0c10c30cc54736c5c194ce98c50e2de84eeb6e79
2025-04-09 01:54:42 UTC to 2025-04-07 20:22:31 UTC

- Remove double wording in opaque type chapter (rust-lang/nomicon#487)
- remove `rust-intrinsic` ABI (rust-lang/nomicon#485)

## rust-lang/reference

6 commits in 46435cd4eba11b66acaa42c01da5c80ad88aee4b..3340922df189bddcbaad17dc3927d51a76bcd5ed
2025-04-15 19:03:24 UTC to 2025-04-10 01:56:25 UTC

- Add a new grammar renderer (rust-lang/reference#1787)
- Misc. spelling fixes (rust-lang/reference#1785)
- Fix std::ops links in range-expr (rust-lang/reference#1786)
- traits.md: remove unusual formatting (rust-lang/reference#1784)
- doc: add missing space (rust-lang/reference#1782)
- spelling fix, Discrimants -> Discriminants (rust-lang/reference#1783)
m---------src/doc/book0
m---------src/doc/edition-guide0
m---------src/doc/nomicon0
m---------src/doc/reference0
-rw-r--r--src/tools/rustbook/Cargo.lock10
5 files changed, 10 insertions, 0 deletions
diff --git a/src/doc/book b/src/doc/book
-Subproject 45f05367360f033f89235eacbbb54e8d73ce6b7
+Subproject d33916341d480caede1d0ae57cbeae23aab23e8
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject 1e27e5e6d5133ae4612f5cc195c15fc8d51b1c9
+Subproject 467f45637b73ec6aa70fb36bc3054bb50b8967e
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject b4448fa406a6dccde62d1e2f34f70fc51814cdc
+Subproject 0c10c30cc54736c5c194ce98c50e2de84eeb6e7
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 46435cd4eba11b66acaa42c01da5c80ad88aee4
+Subproject 3340922df189bddcbaad17dc3927d51a76bcd5e
diff --git a/src/tools/rustbook/Cargo.lock b/src/tools/rustbook/Cargo.lock
index e0939afc09b..c14372dd6ae 100644
--- a/src/tools/rustbook/Cargo.lock
+++ b/src/tools/rustbook/Cargo.lock
@@ -951,6 +951,7 @@ dependencies = [
  "once_cell",
  "pathdiff",
  "pulldown-cmark 0.10.3",
+ "railroad",
  "regex",
  "semver",
  "serde_json",
@@ -1301,6 +1302,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
 [[package]]
+name = "railroad"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ecedffc46c1b2cb04f4b80e094eae6b3f3f470a9635f1f396dd5206428f6b58"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
 name = "rand"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"