about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
committerbors <bors@rust-lang.org>2018-02-18 17:50:21 +0000
commit27a046e9338fb0455c33b13e8fe28da78212dedc (patch)
tree004849f31563f7dd4c1eb9f54d12ad392887c077 /src/doc
parent1ad094d81c97b3d2dd8e980ccd1475a80647540d (diff)
parentcc20de3993bc47be613d20fdd4ec3c35cc410fcd (diff)
Auto merge of #48322 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests

- Successful merges: #48194, #48273, #48274, #48275, #48282, #48312
- Failed merges:
Diffstat (limited to 'src/doc')
m---------src/doc/rust-by-example0
-rw-r--r--src/doc/unstable-book/src/language-features/macro-at-most-once-rep.md3
2 files changed, 3 insertions, 0 deletions
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 919980be7df4ea7d45a9dca8efc34da89bcf7d6
+Subproject ebb28c95b2ea68b96eddb9e71aff4d32eacc74f
diff --git a/src/doc/unstable-book/src/language-features/macro-at-most-once-rep.md b/src/doc/unstable-book/src/language-features/macro-at-most-once-rep.md
index dbaf91b6e78..ec9d85db107 100644
--- a/src/doc/unstable-book/src/language-features/macro-at-most-once-rep.md
+++ b/src/doc/unstable-book/src/language-features/macro-at-most-once-rep.md
@@ -6,7 +6,10 @@ With this feature gate enabled, one can use `?` as a Kleene operator meaning "0
 or 1 repetitions" in a macro definition. Previously only `+` and `*` were allowed.
 
 For example:
+
 ```rust
+#![feature(macro_at_most_once_rep)]
+
 macro_rules! foo {
     (something $(,)?) // `?` indicates `,` is "optional"...
         => {}