diff options
| author | bors <bors@rust-lang.org> | 2016-02-09 22:28:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-09 22:28:45 +0000 |
| commit | 32b2ef7add2836cba5867d2e5ac9610cef416447 (patch) | |
| tree | 4e7fd04d0b3cac99c23257d42a79cf4d58b53af1 /src/libstd/panic.rs | |
| parent | 096dbf84c7acc78283adfa46eecd41d7355f6f3e (diff) | |
| parent | af1a0a346639966373206b70d7cd6376937bb544 (diff) | |
| download | rust-32b2ef7add2836cba5867d2e5ac9610cef416447.tar.gz rust-32b2ef7add2836cba5867d2e5ac9610cef416447.zip | |
Auto merge of #31523 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #31473, #31513, #31514, #31515, #31516, #31520 - Failed merges:
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 3677bd27b16..83df54f1830 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -84,7 +84,7 @@ pub use panicking::{take_handler, set_handler, PanicInfo, Location}; /// recover safe. The general idea is that any mutable state which can be shared /// across `recover` is not recover safe by default. This is because it is very /// easy to witness a broken invariant outside of `recover` as the data is -/// simply accesed as usual. +/// simply accessed as usual. /// /// Types like `&Mutex<T>`, however, are recover safe because they implement /// poisoning by default. They still allow witnessing a broken invariant, but |