Skip to content

Commit 972a8ce

Browse files
authored
Rollup merge of rust-lang#59366 - ehuss:update-books, r=QuietMisdreavus
Update books Update reference, book, rust-by-example, edition-guide, embedded-book ## reference 15 commits in 41493ff..27ad493 2019-03-05 12:32:22 +0100 to 2019-03-26 02:06:15 +0100 - Document wasm_import_module for #[link]. (rust-lang/reference#554) - Fix tidy error. (rust-lang/reference#552) - Some minor contributing updates. (rust-lang/reference#551) - Document `type_length_limit`. (rust-lang/reference#546) - Add some terms to the glossary. (rust-lang/reference#547) - Document `target_feature` and `cfg_target_feature`. (rust-lang/reference#545) - Remove undocumented page (rust-lang/reference#539) - Reorg and update attributes (rust-lang/reference#537) - Fix some minor link errors. (rust-lang/reference#538) - Add linkchecker. (rust-lang/reference#521) - Expand docs on Macros By Example. (rust-lang/reference#511) - document #[panic_handler] (rust-lang/reference#362) - document #[used] (rust-lang/reference#361) - Note that UB is program-global (rust-lang/reference#490) - Fix copy-paste error in procedural-macros.md (rust-lang/reference#533) ## book 16 commits in 9cffbeabec3bcec42d09432bfe7705125c848889..b93ec30bbc7b1b5c2f44223249ab359bed2ed5a6 2019-03-02 08:22:41 -0500 to 2019-03-26 16:54:10 -0400 - Unignore example that now compiles - Fix code snippet (rust-lang/book#1863) - Fix mdbook link text in readme (rust-lang/book#1881) - Wrap to 80 cols - Make sentence more complete (rust-lang/book#1885) - consistenly use increment and decrement (rust-lang/book#1884) - Fix link to Reference's conditional-compilation. (rust-lang/book#1878) - Fix subject/verb agreement - Remove nostarch snapshot files that have been incorporated and checked - haha teach the dictionary steve's name - Add authorship info to the front page - fix accidental <ol>'s (rust-lang/book#1866) - Edits to Macros (rust-lang/book#1848) - Mention `lock` returns `MutexGuard` wrapped in a `LockResult` - Add an example that illustrates NLL (rust-lang/book#1842) - change the parameter name from `type` to `kind` (rust-lang/book#1845) ## rust-by-example 33 commits in 2ce92beabb912d417a7314d6da83ac9b50dc2afb..f68ef3d0f4959f6a7d92a08d9994b117f0f4d32d 2018-11-20 10:10:23 -0500 to 2019-03-12 15:32:12 -0300 - Fix some broken links. (rust-lang/rust-by-example#1161) - Update links in README (rust-lang/rust-by-example#1167) - Add score/lifetimes/trait.md (rust-lang/rust-by-example#1168) - Fix rust-lang/rust-by-example#1147 - No more `open_mode` method (rust-lang/rust-by-example#1164) - Fix for loop description in list print example (rust-lang/rust-by-example#1162) - Add link to Cargo chapter in the index page (rust-lang/rust-by-example#1159) - Fix grammar in sentence about integer notation (rust-lang/rust-by-example#1157) - Do not use deprecated functions from `std::error::Error` trait (rust-lang/rust-by-example#1151) - Update new_types.md to clarify conversion to base type (rust-lang/rust-by-example#1148) - Fix compatibility with Rust 2018 (rust-lang/rust-by-example#1150) - Hello: Fix hint link in `fmt` chapter. (rust-lang/rust-by-example#1146) - Clarify pub(restricted) example a bit (rust-lang/rust-by-example#1133) - Add "literal" to list of macro designators (rust-lang/rust-by-example#1153) - Minor fixes for the macros chapter (rust-lang/rust-by-example#1113) - Use new book links instead of the old second-edition ones (rust-lang/rust-by-example#1143) - Recommend implementing Display over ToString (rust-lang/rust-by-example#1145) - Remove unused import and format with `rustfmt` (rust-lang/rust-by-example#1144) - fix typo (rust-lang/rust-by-example#1142) - Update syntax for 2018 Edition (rust-lang/rust-by-example#1136) - Added two missing full stops (rust-lang/rust-by-example#1138) - Removed unnecessary spaces before macro designators in macros/dry (rust-lang/rust-by-example#1139) - fix install mdbook command (rust-lang/rust-by-example#1128) - Changed word `function` to `type` in comment of fn area (rust-lang/rust-by-example#1132) - Added two missing backticks in generics/multi_bounds (rust-lang/rust-by-example#1129) - Fixed small logic error in error/option_unwrap/and_then (rust-lang/rust-by-example#1127) - Fix typo (rust-lang/rust-by-example#1125) - The code of conduct link was dead. I fixed it. (rust-lang/rust-by-example#1122) - I added a space in the Display fmt for Complex (rust-lang/rust-by-example#1123) - Fix Rust install link in the index (rust-lang/rust-by-example#1124) - Update cargo conventions section (rust-lang/rust-by-example#1121) - Fixed curly braces in the `To and from Strings` chapter to be parentheses (rust-lang/rust-by-example#1120) - Edit a typo (rust-lang/rust-by-example#1119) - Fixes rust-lang/rust-by-example#1115 by correcting the typo from into_iterator to into_iter (rust-lang/rust-by-example#1118) ## edition-guide 1 commits in aa0022c875907886cae8f3ef8e9ebf6e2a5e728d..b56ddb11548450a6df4edd1ed571b2bc304eb9e6 2019-02-27 22:10:39 -0800 to 2019-03-10 10:23:16 +0100 - Links fixes (rust-lang/edition-guide#133) ## embedded-book 6 commits in 9e656ead82bfe869493dec82653a52e27fa6a05c..07fd3880ea0874d82b1d9ed30ad3427ec98b4e8a 2019-03-03 16:03:26 +0000 to 2019-03-27 15:40:52 +0000 - Fix test errors. (rust-embedded/book#180) - Update qemu.md (rust-embedded/book#170) - Update no-std.md to remove obsolete FAQ link (rust-embedded/book#177) - We've come a long way :) (rust-embedded/book#176) - Correct link to team (rust-embedded/book#175) - Update some book links to their new homes. (rust-embedded/book#173)
2 parents 003382e + 7a5c82d commit 972a8ce

File tree

10 files changed

+15
-9
lines changed

10 files changed

+15
-9
lines changed

src/bootstrap/builder.rs

+1
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ impl<'a> Builder<'a> {
402402
test::UnstableBook,
403403
test::RustcBook,
404404
test::EmbeddedBook,
405+
test::EditionGuide,
405406
test::Rustfmt,
406407
test::Miri,
407408
test::Clippy,

src/bootstrap/test.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,7 @@ test_book!(
14251425
EmbeddedBook, "src/doc/embedded-book", "embedded-book", default=false;
14261426
TheBook, "src/doc/book", "book", default=false;
14271427
UnstableBook, "src/doc/unstable-book", "unstable-book", default=true;
1428+
EditionGuide, "src/doc/edition-guide", "edition-guide", default=false;
14281429
);
14291430

14301431
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]

src/ci/docker/x86_64-gnu-tools/checktools.sh

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ python2.7 "$X_PY" test --no-fail-fast \
2424
src/doc/reference \
2525
src/doc/rust-by-example \
2626
src/doc/embedded-book \
27+
src/doc/edition-guide \
2728
src/tools/clippy \
2829
src/tools/rls \
2930
src/tools/rustfmt \
@@ -73,6 +74,7 @@ status_check() {
7374
check_dispatch $1 beta nomicon src/doc/nomicon
7475
check_dispatch $1 beta reference src/doc/reference
7576
check_dispatch $1 beta rust-by-example src/doc/rust-by-example
77+
check_dispatch $1 beta edition-guide src/doc/edition-guide
7678
check_dispatch $1 beta rls src/tools/rls
7779
check_dispatch $1 beta rustfmt src/tools/rustfmt
7880
check_dispatch $1 beta clippy-driver src/tools/clippy

src/doc/edition-guide

src/doc/reference

src/doc/unstable-book/src/language-features/plugin.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The advantages over a simple `fn(&str) -> u32` are:
130130
a way to define new literal syntax for any data type.
131131

132132
In addition to procedural macros, you can define new
133-
[`derive`](../reference/attributes.html#derive)-like attributes and other kinds
133+
[`derive`](../reference/attributes/derive.html)-like attributes and other kinds
134134
of extensions. See `Registry::register_syntax_extension` and the
135135
`SyntaxExtension` enum. For a more involved macro example, see
136136
[`regex_macros`](https://github.com/rust-lang/regex/blob/master/regex_macros/src/lib.rs).
@@ -174,7 +174,7 @@ quasiquote as an ordinary plugin library.
174174
# Lint plugins
175175

176176
Plugins can extend [Rust's lint
177-
infrastructure](../reference/attributes.html#lint-check-attributes) with
177+
infrastructure](../reference/attributes/diagnostics.html#lint-check-attributes) with
178178
additional checks for code style, safety, etc. Now let's write a plugin
179179
[`lint_plugin_test.rs`](https://github.com/rust-lang/rust/blob/master/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs)
180180
that warns about any item named `lintme`.
@@ -253,7 +253,7 @@ mostly use the same infrastructure as lint plugins, and provide examples of how
253253
to access type information.
254254

255255
Lints defined by plugins are controlled by the usual [attributes and compiler
256-
flags](../reference/attributes.html#lint-check-attributes), e.g.
256+
flags](../reference/attributes/diagnostics.html#lint-check-attributes), e.g.
257257
`#[allow(test_lint)]` or `-A test-lint`. These identifiers are derived from the
258258
first argument to `declare_lint!`, with appropriate case and punctuation
259259
conversion.

src/tools/publish_toolstate.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
'rustfmt': '@nrc @topecongiro',
2121
'book': '@carols10cents @steveklabnik',
2222
'nomicon': '@frewsxcv @Gankro',
23-
'reference': '@steveklabnik @Havvy @matthewjasper @alercah',
23+
'reference': '@steveklabnik @Havvy @matthewjasper @ehuss',
2424
'rust-by-example': '@steveklabnik @marioidival @projektir',
2525
'embedded-book': (
2626
'@adamgreig @andre-richter @jamesmunns @korken89 '
2727
'@ryankurte @thejpster @therealprof'
2828
),
29+
'edition-guide': '@ehuss @Centril @steveklabnik',
2930
}
3031

3132
REPOS = {
@@ -38,6 +39,7 @@
3839
'reference': 'https://github.com/rust-lang-nursery/reference',
3940
'rust-by-example': 'https://github.com/rust-lang/rust-by-example',
4041
'embedded-book': 'https://github.com/rust-embedded/book',
42+
'edition-guide': 'https://github.com/rust-lang-nursery/edition-guide',
4143
}
4244

4345

0 commit comments

Comments
 (0)