diff options
| author | bors <bors@rust-lang.org> | 2017-04-17 15:10:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-17 15:10:23 +0000 |
| commit | 011f240b898899644039bae4933ee8bd03efd609 (patch) | |
| tree | b7d2b87bad45ec7b7a80b1dd09a57c2e669cb3ff /src/doc | |
| parent | 5997806a6a4f1e57491bd9f24c7ac07619bf38d2 (diff) | |
| parent | 08a955af68ae350dabb7b66b4981f4503ba74aa3 (diff) | |
Auto merge of #41264 - alexeyzab:41158-fix-docs, r=steveklabnik
Fix old docs Fixes #41158
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/grammar.md | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md index 8e803aff4d6..3fbf9f06d99 100644 --- a/src/doc/grammar.md +++ b/src/doc/grammar.md @@ -761,8 +761,6 @@ closure_type := [ 'unsafe' ] [ '<' lifetime-list '>' ] '|' arg-list '|' [ ':' bound-list ] [ '->' type ] lifetime-list := lifetime | lifetime ',' lifetime-list arg-list := ident ':' type | ident ':' type ',' arg-list -bound-list := bound | bound '+' bound-list -bound := path | lifetime ``` ### Never type @@ -780,6 +778,15 @@ never_type : "!" ; **FIXME:** grammar? +### Type parameter bounds + +```antlr +bound := ty_bound | lt_bound +lt_bound := lifetime +ty_bound := [?] [ for<lt_param_defs> ] simple_path +bound-list := bound | bound '+' bound-list '+' ? +``` + ### Self types **FIXME:** grammar? |