diff options
| author | bors <bors@rust-lang.org> | 2018-11-21 15:56:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-21 15:56:32 +0000 |
| commit | 910ec6d97ff03549c22352d7763be02b60d73470 (patch) | |
| tree | 998378180d691dfcf2b2f69a317e3515351b4566 /src/doc | |
| parent | ee7bb94044bbdc1689cd29fcc585dd7d49a2672e (diff) | |
| parent | d7b3f5c6aeedf07c6a0ea4d5a79a106642488e0d (diff) | |
| download | rust-910ec6d97ff03549c22352d7763be02b60d73470.tar.gz rust-910ec6d97ff03549c22352d7763be02b60d73470.zip | |
Auto merge of #56118 - steveklabnik:update-books, r=alexcrichton
Update books for Rust 2018
This PR:
1. updates all of the books
* I don't know if @Gankro has further plans for the nomicon or not
2. updates the build process because TRPL is only distributing one edition now
3. fixes up the stdlib links
I think that this passes but it's 3:20 am and so I'm sending it in and will fix up anything i missed in the morning.
/cc @alexcrichton for the big beta backport
Diffstat (limited to 'src/doc')
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| -rw-r--r-- | src/doc/unstable-book/src/language-features/macro-literal-matcher.md | 4 | ||||
| -rw-r--r-- | src/doc/unstable-book/src/language-features/plugin.md | 2 |
6 files changed, 2 insertions, 4 deletions
diff --git a/src/doc/book b/src/doc/book -Subproject e871c4598925594421d63e929fee292e6e071f9 +Subproject 616fe4172b688393aeee5f34935cc25733c9c06 diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 7f7a597b47ed6c35c2a0f0ee6a69050fe2d5e01 +Subproject f8a4e96feb2e5a6ed1ef170ad40e3509a7755cb diff --git a/src/doc/reference b/src/doc/reference -Subproject b9fb838054b8441223c22eeae5b6d8e498071cd +Subproject 60077efda319c95a89fe39609803c5433567adb diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject bc342a475c09b6df8004d518382e6d5b6bcb49f +Subproject 2ce92beabb912d417a7314d6da83ac9b50dc2af diff --git a/src/doc/unstable-book/src/language-features/macro-literal-matcher.md b/src/doc/unstable-book/src/language-features/macro-literal-matcher.md index 7e3638fd1cf..870158200de 100644 --- a/src/doc/unstable-book/src/language-features/macro-literal-matcher.md +++ b/src/doc/unstable-book/src/language-features/macro-literal-matcher.md @@ -4,7 +4,7 @@ The tracking issue for this feature is: [#35625] The RFC is: [rfc#1576]. -With this feature gate enabled, the [list of fragment specifiers][frags] gains one more entry: +With this feature gate enabled, the [list of designators] gains one more entry: * `literal`: a literal. Examples: 2, "string", 'c' @@ -12,6 +12,6 @@ A `literal` may be followed by anything, similarly to the `ident` specifier. [rfc#1576]: http://rust-lang.github.io/rfcs/1576-macros-literal-matcher.html [#35625]: https://github.com/rust-lang/rust/issues/35625 -[frags]: ../book/first-edition/macros.html#syntactic-requirements +[list of designators]: ../reference/macros-by-example.html ------------------------ diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md index b408d5d0805..74bdd4dc3b5 100644 --- a/src/doc/unstable-book/src/language-features/plugin.md +++ b/src/doc/unstable-book/src/language-features/plugin.md @@ -137,8 +137,6 @@ of extensions. See `Registry::register_syntax_extension` and the ## Tips and tricks -Some of the [macro debugging tips](../book/first-edition/macros.html#debugging-macro-code) are applicable. - You can use `syntax::parse` to turn token trees into higher-level syntax elements like expressions: |