diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 7851ea3e363a4..8d3c8fc435c8d 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -402,6 +402,7 @@ impl<'a> Builder<'a> { test::UnstableBook, test::RustcBook, test::EmbeddedBook, + test::EditionGuide, test::Rustfmt, test::Miri, test::Clippy, diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 41c73f307b6d0..881bea5d97ea4 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1425,6 +1425,7 @@ test_book!( EmbeddedBook, "src/doc/embedded-book", "embedded-book", default=false; TheBook, "src/doc/book", "book", default=false; UnstableBook, "src/doc/unstable-book", "unstable-book", default=true; + EditionGuide, "src/doc/edition-guide", "edition-guide", default=false; ); #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 97e6ee25ec7a0..af0198705a2fe 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -24,6 +24,7 @@ python2.7 "$X_PY" test --no-fail-fast \ src/doc/reference \ src/doc/rust-by-example \ src/doc/embedded-book \ + src/doc/edition-guide \ src/tools/clippy \ src/tools/rls \ src/tools/rustfmt \ @@ -73,6 +74,7 @@ status_check() { check_dispatch $1 beta nomicon src/doc/nomicon check_dispatch $1 beta reference src/doc/reference check_dispatch $1 beta rust-by-example src/doc/rust-by-example + check_dispatch $1 beta edition-guide src/doc/edition-guide check_dispatch $1 beta rls src/tools/rls check_dispatch $1 beta rustfmt src/tools/rustfmt check_dispatch $1 beta clippy-driver src/tools/clippy diff --git a/src/doc/book b/src/doc/book index 9cffbeabec3bc..b93ec30bbc7b1 160000 --- a/src/doc/book +++ b/src/doc/book @@ -1 +1 @@ -Subproject commit 9cffbeabec3bcec42d09432bfe7705125c848889 +Subproject commit b93ec30bbc7b1b5c2f44223249ab359bed2ed5a6 diff --git a/src/doc/edition-guide b/src/doc/edition-guide index aa0022c875907..b56ddb1154845 160000 --- a/src/doc/edition-guide +++ b/src/doc/edition-guide @@ -1 +1 @@ -Subproject commit aa0022c875907886cae8f3ef8e9ebf6e2a5e728d +Subproject commit b56ddb11548450a6df4edd1ed571b2bc304eb9e6 diff --git a/src/doc/embedded-book b/src/doc/embedded-book index 9e656ead82bfe..07fd3880ea087 160000 --- a/src/doc/embedded-book +++ b/src/doc/embedded-book @@ -1 +1 @@ -Subproject commit 9e656ead82bfe869493dec82653a52e27fa6a05c +Subproject commit 07fd3880ea0874d82b1d9ed30ad3427ec98b4e8a diff --git a/src/doc/reference b/src/doc/reference index 41493ffce5d0e..27ad493a10364 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit 41493ffce5d0e17d54eaf5ec9a995054e2b9aece +Subproject commit 27ad493a10364e907ec476e2ad61e8a1614b57e1 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example index 2ce92beabb912..f68ef3d0f4959 160000 --- a/src/doc/rust-by-example +++ b/src/doc/rust-by-example @@ -1 +1 @@ -Subproject commit 2ce92beabb912d417a7314d6da83ac9b50dc2afb +Subproject commit f68ef3d0f4959f6a7d92a08d9994b117f0f4d32d diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md index cab350381d2bd..49fe7c9e994fe 100644 --- a/src/doc/unstable-book/src/language-features/plugin.md +++ b/src/doc/unstable-book/src/language-features/plugin.md @@ -130,7 +130,7 @@ The advantages over a simple `fn(&str) -> u32` are: a way to define new literal syntax for any data type. In addition to procedural macros, you can define new -[`derive`](../reference/attributes.html#derive)-like attributes and other kinds +[`derive`](../reference/attributes/derive.html)-like attributes and other kinds of extensions. See `Registry::register_syntax_extension` and the `SyntaxExtension` enum. For a more involved macro example, see [`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. # Lint plugins Plugins can extend [Rust's lint -infrastructure](../reference/attributes.html#lint-check-attributes) with +infrastructure](../reference/attributes/diagnostics.html#lint-check-attributes) with additional checks for code style, safety, etc. Now let's write a plugin [`lint_plugin_test.rs`](https://github.com/rust-lang/rust/blob/master/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs) that warns about any item named `lintme`. @@ -253,7 +253,7 @@ mostly use the same infrastructure as lint plugins, and provide examples of how to access type information. Lints defined by plugins are controlled by the usual [attributes and compiler -flags](../reference/attributes.html#lint-check-attributes), e.g. +flags](../reference/attributes/diagnostics.html#lint-check-attributes), e.g. `#[allow(test_lint)]` or `-A test-lint`. These identifiers are derived from the first argument to `declare_lint!`, with appropriate case and punctuation conversion. diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py index f2a585e627307..93d7aa5c1ecb4 100755 --- a/src/tools/publish_toolstate.py +++ b/src/tools/publish_toolstate.py @@ -20,12 +20,13 @@ 'rustfmt': '@nrc @topecongiro', 'book': '@carols10cents @steveklabnik', 'nomicon': '@frewsxcv @Gankro', - 'reference': '@steveklabnik @Havvy @matthewjasper @alercah', + 'reference': '@steveklabnik @Havvy @matthewjasper @ehuss', 'rust-by-example': '@steveklabnik @marioidival @projektir', 'embedded-book': ( '@adamgreig @andre-richter @jamesmunns @korken89 ' '@ryankurte @thejpster @therealprof' ), + 'edition-guide': '@ehuss @Centril @steveklabnik', } REPOS = { @@ -38,6 +39,7 @@ 'reference': 'https://github.com/rust-lang-nursery/reference', 'rust-by-example': 'https://github.com/rust-lang/rust-by-example', 'embedded-book': 'https://github.com/rust-embedded/book', + 'edition-guide': 'https://github.com/rust-lang-nursery/edition-guide', }