about summary refs log tree commit diff
path: root/src/libstd/panic.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-17 12:23:57 +0000
committerbors <bors@rust-lang.org>2016-01-17 12:23:57 +0000
commitbff52927f582e2ca8dea799bd58f06e654295e21 (patch)
tree2286b17c8092d1e6a9a026ef979dd7ecd333b348 /src/libstd/panic.rs
parent0b524edb043c22a577968290fed1a4ff9936a28a (diff)
parent00a4eeadaf10156e2e2b7a0c050c2ca1ac826f76 (diff)
downloadrust-bff52927f582e2ca8dea799bd58f06e654295e21.tar.gz
rust-bff52927f582e2ca8dea799bd58f06e654295e21.zip
Auto merge of #30975 - Manishearth:rollup, r=Manishearth
- Successful merges: #30938, #30940, #30943, #30949, #30952, #30957, #30959
- Failed merges:
Diffstat (limited to 'src/libstd/panic.rs')
-rw-r--r--src/libstd/panic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index 8c0a785a102..3677bd27b16 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -136,7 +136,7 @@ pub trait RefRecoverSafe {}
 ///
 /// let mut variable = 4;
 ///
-/// // This code will not compile becuause the closure captures `&mut variable`
+/// // This code will not compile because the closure captures `&mut variable`
 /// // which is not considered panic safe by default.
 ///
 /// // panic::recover(|| {