auto merge of #13023 : thestinger/rust/deep_clone, r=alexcrichton

This commit is contained in:
bors 2014-03-20 15:01:47 -07:00
commit 6eae7df43c
4 changed files with 4 additions and 4 deletions

View file

@ -2033,7 +2033,7 @@ Supported traits for `deriving` are:
* Comparison traits: `Eq`, `TotalEq`, `Ord`, `TotalOrd`.
* Serialization: `Encodable`, `Decodable`. These require `serialize`.
* `Clone` and `DeepClone`, to perform (deep) copies.
* `Clone`, to create `T` from `&T` via a copy.
* `Hash`, to iterate over the bytes in a data type.
* `Rand`, to create a random instance of a data type.
* `Default`, to create an empty instance of a data type.

View file

@ -2538,7 +2538,7 @@ enum ABC { A, B, C }
~~~
The full list of derivable traits is `Eq`, `TotalEq`, `Ord`,
`TotalOrd`, `Encodable` `Decodable`, `Clone`, `DeepClone`,
`TotalOrd`, `Encodable` `Decodable`, `Clone`,
`Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
# Crates and the module system