about summary refs log tree commit diff
path: root/src/doc/reference.md
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-09 18:22:47 -0800
committerGitHub <noreply@github.com>2016-11-09 18:22:47 -0800
commitb46ce08df51f95e5d9f6dff9156b1d8e38cf4795 (patch)
tree605693ae8861f9ce5371e3ad076f6013e2a37fc6 /src/doc/reference.md
parent0b46947d35e9fdc35cd06dd889c3c3a892d7ddf8 (diff)
parent3a5b45aae5142635e2b14c139a69c684bf3f1a19 (diff)
Auto merge of #37678 - eddyb:rollup, r=eddyb
Rollup of 5 pull requests

- Successful merges: #37402, #37412, #37661, #37664, #37667
- Failed merges:
Diffstat (limited to 'src/doc/reference.md')
-rw-r--r--src/doc/reference.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index 7233dbc618a..0596e476d5f 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -2863,8 +2863,8 @@ assert_eq!(x, y);
 
 ### Unary operator expressions
 
-Rust defines the following unary operators. They are all written as prefix operators,
-before the expression they apply to.
+Rust defines the following unary operators. With the exception of `?`, they are
+all written as prefix operators, before the expression they apply to.
 
 * `-`
   : Negation. Signed integer types and floating-point types support negation. It
@@ -2893,6 +2893,10 @@ before the expression they apply to.
     If the `&` or `&mut` operators are applied to an rvalue, a
     temporary value is created; the lifetime of this temporary value
     is defined by [syntactic rules](#temporary-lifetimes).
+* `?`
+  : Propagating errors if applied to `Err(_)` and unwrapping if
+    applied to `Ok(_)`. Only works on the `Result<T, E>` type,
+    and written in postfix notation.
 
 ### Binary operator expressions