Rollup merge of #24772 - steveklabnik:gh24712, r=alexcrichton

FIxes #24712
This commit is contained in:
Steve Klabnik 2015-04-24 22:54:26 -04:00
commit 5e38691ba6

View File

@ -11,7 +11,7 @@
//! Traits for conversions between types.
//!
//! The traits in this module provide a general way to talk about conversions from one type to
//! another. They follow the standard Rust conventions of `as`/`to`/`into`/`from`.
//! another. They follow the standard Rust conventions of `as`/`into`/`from`.
//!
//! Like many traits, these are often used as bounds for generic functions, to support arguments of
//! multiple types.