diff options
| author | bors <bors@rust-lang.org> | 2015-09-05 11:01:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-05 11:01:42 +0000 |
| commit | 5c2cfdfb79d3be18ee50f5b5a60205d040c8396a (patch) | |
| tree | 8cd038cf48b57efb6c5995c2bcf55db69897d168 /src/libstd | |
| parent | 6b36e921f4198f5afc1656db2d153f4f74a1fabe (diff) | |
| parent | 1bf060ffb31ef6dc79543b4c10b975cd802020d0 (diff) | |
| download | rust-5c2cfdfb79d3be18ee50f5b5a60205d040c8396a.tar.gz rust-5c2cfdfb79d3be18ee50f5b5a60205d040c8396a.zip | |
Auto merge of #28258 - Manishearth:rollup, r=Manishearth
- Successful merges: #28225, #28231, #28234, #28253 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index 4597db41e90..82578172802 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.rs @@ -103,8 +103,8 @@ //! `Some` and `None`. //! * `std::result::Result::`{ //! [`self`](../result/enum.Result.html), -//! [`Some`](../result/enum.Result.html), -//! [`None`](../result/enum.Result.html) +//! [`Ok`](../result/enum.Result.html), +//! [`Err`](../result/enum.Result.html) //! }. //! The ubiquitous `Result` type and its two [variants][book-enums], //! `Ok` and `Err`. |