about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-04-14 14:49:11 -0400
committerSteve Klabnik <steve@steveklabnik.com>2016-04-14 14:49:11 -0400
commite14401f4913f49f2bbdf5d2ccb4f8dc8fd494529 (patch)
tree4d6e2188bc0d64514666d355304ecb20054de9d3 /src/libstd
parenteadd5748ce8da87370d34ad265a68a45a3ebcd5a (diff)
parent05a3fea8f6b425889f905c7b1dca47139e7df63f (diff)
downloadrust-e14401f4913f49f2bbdf5d2ccb4f8dc8fd494529.tar.gz
rust-e14401f4913f49f2bbdf5d2ccb4f8dc8fd494529.zip
Rollup merge of #32940 - birkenfeld:patch-3, r=alexcrichton
Fix a typo and add a missing word
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panic.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index 16401c4527f..bbd89af01a7 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -346,9 +346,9 @@ impl<R, F: FnOnce() -> R> FnOnce<()> for AssertRecoverSafe<F> {
 /// It is **not** recommended to use this function for a general try/catch
 /// mechanism. The `Result` type is more appropriate to use for functions that
 /// can fail on a regular basis. Additionally, this function is not guaranteed
-/// to catch all panics, see the "Notes" sectino below.
+/// to catch all panics, see the "Notes" section below.
 ///
-/// The closure provided is required to adhere to the `UnwindSafe` to ensure
+/// The closure provided is required to adhere to the `UnwindSafe` trait to ensure
 /// that all captured variables are safe to cross this boundary. The purpose of
 /// this bound is to encode the concept of [exception safety][rfc] in the type
 /// system. Most usage of this function should not need to worry about this