diff options
| author | bors <bors@rust-lang.org> | 2015-12-10 16:28:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-10 16:28:53 +0000 |
| commit | 41a33852b8ededcb3edd62d2e0ab7fca9fbf324f (patch) | |
| tree | 4301229a3b2671a5e91fec1c35d6eb216a008ba3 /src | |
| parent | ae1cf9815f51f029c9f1b55c7cef6b9b48ea4a5f (diff) | |
| parent | af4414bd30b75202fd93c369dc5eac372e07b203 (diff) | |
| download | rust-41a33852b8ededcb3edd62d2e0ab7fca9fbf324f.tar.gz rust-41a33852b8ededcb3edd62d2e0ab7fca9fbf324f.zip | |
Auto merge of #30298 - Letheed:docpatch, r=sanxiyn
Missing Panics tag and missing period in the documentation of `fn expect(…)` for `Option` and `Result`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/option.rs | 2 | ||||
| -rw-r--r-- | src/libcore/result.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 209cebeaf1b..c04015fc0ab 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -309,7 +309,7 @@ impl<T> Option<T> { // Getting to contained values ///////////////////////////////////////////////////////////////////////// - /// Unwraps an option, yielding the content of a `Some` + /// Unwraps an option, yielding the content of a `Some`. /// /// # Panics /// diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 37c40f96b0f..9fe3c2d2aa2 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -744,6 +744,8 @@ impl<T, E: fmt::Debug> Result<T, E> { /// Unwraps a result, yielding the content of an `Ok`. /// + /// # Panics + /// /// Panics if the value is an `Err`, with a panic message including the /// passed message, and the content of the `Err`. /// |