about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-14 23:37:27 +0000
committerbors <bors@rust-lang.org>2014-11-14 23:37:27 +0000
commitd91a015ab4c538f02fbbc03dfb08193a381c2e3b (patch)
tree388c0123be96c4e5c54d8cf7efa88bd4e0059676
parent1e4e55aebc1a71b6674c00b8604efa6b1e2e52cd (diff)
parent7b28ba07781c0c769c393dbb002367ec1f972b4b (diff)
downloadrust-d91a015ab4c538f02fbbc03dfb08193a381c2e3b.tar.gz
rust-d91a015ab4c538f02fbbc03dfb08193a381c2e3b.zip
auto merge of #18894 : ArtemGr/rust/patch-1, r=pnkfelix
A typo about Results being panics crawled in. Fixing it.
-rw-r--r--src/libcore/result.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index c4cb2987241..69802aef4c2 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -267,7 +267,7 @@
 //! a bug.
 //!
 //! A module that instead returns `Results` is alerting the caller
-//! that panics are possible, and providing precise control over how
+//! that failure is possible, and providing precise control over how
 //! it is handled.
 //!
 //! Furthermore, panics may not be recoverable at all, depending on