diff options
| author | kennytm <kennytm@gmail.com> | 2018-10-12 22:04:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 22:04:08 +0800 |
| commit | 80ee322a20ac6e8e3546ea26e3211cb77a462f80 (patch) | |
| tree | db32e2dbd1e0c75e65ff48d6cba02f317717657a /src/libstd | |
| parent | ef7f77d53db23ecd94539f4107a4b4fd12ec0753 (diff) | |
| parent | 54a3583da7031df49009d1162ddbb054c488428c (diff) | |
| download | rust-80ee322a20ac6e8e3546ea26e3211cb77a462f80.tar.gz rust-80ee322a20ac6e8e3546ea26e3211cb77a462f80.zip | |
Rollup merge of #54913 - RalfJung:unwind-safe, r=alexcrichton
doc fix: it's auto traits that make for automatic implementations Being a marker trait is not good enough (that just means "no items in the trait"). r? @alexcrichton who [originally wrote these docs](https://github.com/RalfJung/rust/commit/0a13f1abafe70cddf34bf2b2ba3946c418ed6241).
Diffstat (limited to 'src/libstd')
| -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 48a9b2f4a93..5c87035d8e9 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -79,7 +79,7 @@ pub use core::panic::{PanicInfo, Location}; /// /// Simply put, a type `T` implements `UnwindSafe` if it cannot easily allow /// witnessing a broken invariant through the use of `catch_unwind` (catching a -/// panic). This trait is a marker trait, so it is automatically implemented for +/// panic). This trait is an auto trait, so it is automatically implemented for /// many types, and it is also structurally composed (e.g. a struct is unwind /// safe if all of its components are unwind safe). /// |