Skip to content

Commit

Permalink
Rollup merge of #93062 - ehuss:update-books, r=ehuss
Browse files Browse the repository at this point in the history 
Update books

## nomicon

1 commits in c05c452b36358821bf4122f9c418674edd1d713d..66d097d3d80e8f88c288c6879c7c2b909ecf8ad4
2021-12-13 15:23:48 +0900 to 2022-01-05 05:45:21 +0900
- Fix typo / type error in FFI code example (rust-lang/nomicon#327)

## reference

8 commits in f8ba2f12df60ee19b96de24ae5b73af3de8a446b..4dee6eb63d728ffb9e7a2ed443e9ada9275c69d2
2022-01-03 11:02:08 -0800 to 2022-01-18 09:26:33 -0800
- (minor) Remove Expression Path sub-types splits in Pattern specs (rust-lang/reference#1138)
- Document destructuring assignment (rust-lang/reference#1116)
- Document the 2021 edition changes to macros-by-example `pat` metavariables (rust-lang/reference#1135)
- Improve the documentation of macros-by-example metavariable names (rust-lang/reference#1130)
- trait-bounds.md: add pronoun 'that' (rust-lang/reference#1131)
- Say that macros-by-example `ident` metavariables can match raw identifiers (rust-lang/reference#1133)
- State in the UAX31 profile description that a lone `_` is not an identifier (rust-lang/reference#1129)
- Document syntax reserved in Rust 2021 (rust-lang/reference#1128)

## book

17 commits in d3740fb7aad0ea4a80ae20f64dee3a8cfc0c5c3c..f17df27fc14696912c48b8b7a7a8fa49e648088d
2022-01-03 21:46:04 -0500 to 2022-01-18 17:46:28 -0500
- Add a notice to the top of all nostarch snapshots
- Fix quotes
- Grammar (minor): 'or' → 'and' for enum variants
- Propagate edits of chapter 8 to src
- Replies to nostarch edits
- more edits
- ch8 from nostarch
- Fix grammar and line wrapping
- Merge remote-tracking branch 'origin/pr/2880'
- Remove wikipedia link
- Merge remote-tracking branch 'origin/pr/2927'
- Snapshot of ch14 for nostarch
- Backport fixes to chapter 14 noticed while doing nostarch snapshot
- Fix usage of find piped into xargs
- Adjust some more line numbers of Cargo.toml includes
- Merge branch '2909'
- Merge remote-tracking branch 'parkerziegler/fix/ch14-add-one-naming'

## rustc-dev-guide

7 commits in 875464457c4104686faf667f47848aa7b0f0a744..78dd6a4684cf8d6b72275fab6d0429ea40b66338
2021-12-28 22:17:49 -0600 to 2022-01-18 14:44:26 -0300
- Reorganize and expand the testing chapters. (rust-lang/rustc-dev-guide#1281)
- Add inline assembly internals (rust-lang/rustc-dev-guide#1266)
- Spelling: Rename `rust` to `Rust` (rust-lang/rustc-dev-guide#1288)
- Clean up section about FCPs (rust-lang/rustc-dev-guide#1287)
- Address more review comments in rust-lang/rustc-dev-guide#1286.
- Address review comments in rust-lang/rustc-dev-guide#1286.
- Streamline "Getting Started" some more.
  • Loading branch information
@matthiaskrgr
matthiaskrgr authored Jan 19, 2022
2 parents d5bc168 + 84e0d9d commit ea1275a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 56 files
+2 −2 listings/ch14-more-about-cargo/listing-14-07/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/listing-14-07/add/add_one/Cargo.toml
+0 −0 listings/ch14-more-about-cargo/listing-14-07/add/add_one/src/lib.rs
+1 −1 listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
+2 −2 listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add_one/Cargo.toml
+0 −0 listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add_one/src/lib.rs
+1 −2 listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
+2 −2 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add_one/Cargo.toml
+0 −0 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add_one/src/lib.rs
+1 −1 listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml
+2 −2 listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add_one/Cargo.toml
+0 −0 listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add_one/src/lib.rs
+1 −1 listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/output-only-02-add-one/add/.gitignore
+2 −2 listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml
+0 −8 listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/Cargo.toml
+0 −7 listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/src/lib.rs
+1 −1 listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/Cargo.toml
+2 −2 listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock
+1 −1 listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml
+1 −1 listings/ch14-more-about-cargo/output-only-03-use-rand/add/add_one/Cargo.toml
+0 −0 listings/ch14-more-about-cargo/output-only-03-use-rand/add/add_one/src/lib.rs
+1 −1 listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/Cargo.toml
+5 −0 nostarch/chapter02.md
+5 −0 nostarch/chapter03.md
+5 −0 nostarch/chapter04.md
+5 −0 nostarch/chapter05.md
+5 −0 nostarch/chapter06.md
+210 −165 nostarch/chapter08.md
+5 −0 nostarch/chapter09.md
+5 −0 nostarch/chapter10.md
+5 −0 nostarch/chapter11.md
+5 −0 nostarch/chapter12.md
+1,006 −0 nostarch/chapter14.md
+2 −2 src/ch02-00-guessing-game-tutorial.md
+1 −1 src/ch06-02-match.md
+2 −2 src/ch08-00-common-collections.md
+71 −65 src/ch08-01-vectors.md
+69 −68 src/ch08-02-strings.md
+13 −13 src/ch08-03-hash-maps.md
+5 −2 src/ch14-02-publishing-to-crates-io.md
+39 −39 src/ch14-03-cargo-workspaces.md
+7 −7 src/ch15-02-deref.md
+6 −6 src/ch15-06-reference-cycles.md
+1 −1 tools/doc-to-md.sh
+1 −1 tools/megadiff.sh
+1 −1 tools/nostarch.sh
+10 −1 tools/src/bin/concat_chapters.rs
2 changes: 1 addition & 1 deletion src/doc/nomicon
Submodule nomicon updated 1 files
+1 −1 src/ffi.md
2 changes: 1 addition & 1 deletion src/doc/reference
Submodule reference updated 9 files
+1 −0 src/SUMMARY.md
+22 −6 src/expressions.md
+63 −4 src/expressions/operator-expr.md
+17 −0 src/expressions/underscore-expr.md
+2 −0 src/identifiers.md
+21 −4 src/macros-by-example.md
+3 −4 src/patterns.md
+39 −3 src/tokens.md
+1 −1 src/trait-bounds.md
2 changes: 1 addition & 1 deletion src/doc/rustc-dev-guide
Submodule rustc-dev-guide updated 35 files
+3 −0 book.toml
+9 −2 src/SUMMARY.md
+2 −2 src/about-this-guide.md
+367 −0 src/asm.md
+1 −1 src/backend/codegen.md
+2 −2 src/backend/monomorph.md
+1 −1 src/building/bootstrapping.md
+1 −1 src/building/compiler-documenting.md
+13 −16 src/building/how-to-build-and-run.md
+1 −1 src/building/suggested.md
+2 −2 src/compiler-src.md
+0 −223 src/compiletest.md
+1 −1 src/contributing.md
+14 −7 src/conventions.md
+1 −1 src/crates-io.md
+1 −1 src/diagnostics/diagnostic-items.md
+14 −160 src/getting-started.md
+20 −23 src/implementing_new_features.md
+1 −1 src/macro-expansion.md
+2 −2 src/overview.md
+2 −5 src/profiling.md
+7 −2 src/rustdoc.md
+1 −1 src/test-implementation.md
+139 −524 src/tests/adding.md
+73 −0 src/tests/ci.md
+526 −0 src/tests/compiletest.md
+45 −0 src/tests/crater.md
+52 −0 src/tests/docker.md
+403 −0 src/tests/headers.md
+134 −330 src/tests/intro.md
+50 −0 src/tests/perf.md
+128 −17 src/tests/running.md
+500 −0 src/tests/ui.md
+1 −1 src/ty.md
+10 −10 src/walkthrough.md

0 comments on commit ea1275a

Please sign in to comment.