Skip to content

Commit

Permalink
Rollup merge of rust-lang#54913 - RalfJung:unwind-safe, r=alexcrichton
Browse files Browse the repository at this point in the history
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](RalfJung@0a13f1a).
  • Loading branch information
pietroalbini committed Oct 9, 2018
2 parents 2f3569b + 54a3583 commit 7fee74b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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).
///
Expand Down

0 comments on commit 7fee74b

Please sign in to comment.