diff options
| author | bors <bors@rust-lang.org> | 2015-06-04 08:42:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-04 08:42:22 +0000 |
| commit | 0aeb9f6f08c353c71d962d5cc7a231e73040ca3c (patch) | |
| tree | 37ac7efa631a9ffd2a32c330b3223135d3c711fc /src/libcore | |
| parent | 80d08a37b6215a59ecce042f36ad446c5357b543 (diff) | |
| parent | fd3b6ca508ed99004a11291ef1d2c64104102a41 (diff) | |
| download | rust-0aeb9f6f08c353c71d962d5cc7a231e73040ca3c.tar.gz rust-0aeb9f6f08c353c71d962d5cc7a231e73040ca3c.zip | |
Auto merge of #26002 - Manishearth:rollup, r=Manishearth
- Successful merges: #25900, #25987, #25988, #25990, #25994, #26000 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/result.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs index e909946ece4..003c4b2b78c 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -223,7 +223,9 @@ //! } //! ``` //! -//! `try!` is imported by the prelude, and is available everywhere. +//! `try!` is imported by the prelude and is available everywhere, but it can only +//! be used in functions that return `Result` because of the early return of +//! `Err` that it provides. #![stable(feature = "rust1", since = "1.0.0")] |