about summary refs log tree commit diff
path: root/src/doc/book
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-09-28 20:21:50 -0700
committerGitHub <noreply@github.com>2016-09-28 20:21:50 -0700
commit83c54dc9716018fe6a544df3bc32321fb31dc720 (patch)
treebfd39831b2e1b48c0a50a6d4f40bcadc1edd4471 /src/doc/book
parent86affcdf6c622278a89b73bb7f1b8ac00e970888 (diff)
parentd9bd4d5981218f2adc1249984b501935aac7beaf (diff)
downloadrust-83c54dc9716018fe6a544df3bc32321fb31dc720.tar.gz
rust-83c54dc9716018fe6a544df3bc32321fb31dc720.zip
Rollup merge of #35286 - dns2utf8:doc_never_expression, r=nikomatsakis
Add docs for "!" Never type (rfc 1216)

Pull Request: https://github.com/rust-lang/rfcs/pull/1216
Tracking Issue: #35121
Diffstat (limited to 'src/doc/book')
-rw-r--r--src/doc/book/syntax-index.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/doc/book/syntax-index.md b/src/doc/book/syntax-index.md
index 0259db221b6..1e05b01d30d 100644
--- a/src/doc/book/syntax-index.md
+++ b/src/doc/book/syntax-index.md
@@ -61,7 +61,6 @@
 * `-` (`- expr`): arithmetic negation.  Overloadable (`Neg`).
 * `-=` (`var -= expr`): arithmetic subtraction & assignment. Overloadable (`SubAssign`).
 * `->` (`fn(…) -> type`, `|…| -> type`): function and closure return type.  See [Functions], [Closures].
-* `-> !` (`fn(…) -> !`, `|…| -> !`): diverging function or closure. See [Diverging Functions].
 * `.` (`expr.ident`): member access.  See [Structs], [Method Syntax].
 * `..` (`..`, `expr..`, `..expr`, `expr..expr`): right-exclusive range literal.
 * `..` (`..expr`): struct literal update syntax.  See [Structs (Update syntax)].
@@ -159,6 +158,10 @@
 * `/*!…*/`: inner block doc comment.  See [Comments].
 * `/**…*/`: outer block doc comment.  See [Comments].
 
+<!-- Special types -->
+
+* `!`: always empty Never type.  See [Diverging Functions].
+
 <!-- Various things involving parens and tuples -->
 
 * `()`: empty tuple (*a.k.a.* unit), both literal and type.