diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2016-11-10 03:46:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 03:46:28 +0200 |
| commit | e733667210cb6cfe7cc6ba9c817dd0c977bb2fed (patch) | |
| tree | 0f8973cd9cb203db7f15cfb1f580a367009bd635 | |
| parent | 8cc6be1bcbf8d9648d6406e4cdd26b614d242657 (diff) | |
| parent | 1e9aad752beb789df4f2232adf6b9a24efbdac8d (diff) | |
| download | rust-e733667210cb6cfe7cc6ba9c817dd0c977bb2fed.tar.gz rust-e733667210cb6cfe7cc6ba9c817dd0c977bb2fed.zip | |
Rollup merge of #37664 - est31:master, r=nrc
Document the question mark operator in reference and the book's syntax index The question mark operator will be stabilized for the Rust 1.13 release (unfortunately). Even though I don't like the operator, it still should be documented in the syntax index in the book and in the reference. Maybe there are people who also want to change the book's chapters on error handling, depending on their views of what idiomatic error handling is, now that the operator is stable, but I don't want to and I'd prefer to keep this PR focused on the reference and syntax index only. Please also apply this PR to the beta branch of rust.
| -rw-r--r-- | src/doc/book/syntax-index.md | 2 | ||||
| -rw-r--r-- | src/doc/reference.md | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/doc/book/syntax-index.md b/src/doc/book/syntax-index.md index 1e05b01d30d..28403711cd7 100644 --- a/src/doc/book/syntax-index.md +++ b/src/doc/book/syntax-index.md @@ -94,6 +94,7 @@ * `|=` (`var |= expr`): bitwise or & assignment. Overloadable (`BitOrAssign`). * `||` (`expr || expr`): logical or. * `_`: "ignored" pattern binding (see [Patterns (Ignoring bindings)]). Also used to make integer-literals readable (see [Reference (Integer literals)]). +* `?` (`expr?`): Error propagation. Returns early when `Err(_)` is encountered, unwraps otherwise. Similar to the [`try!` macro]. ## Other Syntax @@ -210,6 +211,7 @@ [Functions]: functions.html [Generics]: generics.html [Iterators]: iterators.html +[`try!` macro]: error-handling.html#the-try-macro [Lifetimes]: lifetimes.html [Loops (`for`)]: loops.html#for [Loops (`loop`)]: loops.html#loop 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 |