diff options
| author | bors <bors@rust-lang.org> | 2015-04-25 03:43:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-25 03:43:31 +0000 |
| commit | a40261ac91dd80b21830cc94de6132744e0c5078 (patch) | |
| tree | 023666901a4f040367389290d46a22c97ae7d8ce /src/libcore | |
| parent | f9e53c7f2c8285f3422ac7ac091349ce572c4baa (diff) | |
| parent | 23b1d172a8245f810f179d939488325fff005158 (diff) | |
| download | rust-a40261ac91dd80b21830cc94de6132744e0c5078.tar.gz rust-a40261ac91dd80b21830cc94de6132744e0c5078.zip | |
Auto merge of #24798 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24662, #24722, #24725, #24729, #24736, #24749, #24751, #24766, #24769, #24772, #24775, #24790 - Failed merges: #24760
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index 1c1ad5fd33f..d9cda58d9eb 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -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. |