diff options
| author | bors <bors@rust-lang.org> | 2014-03-20 15:01:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-20 15:01:47 -0700 |
| commit | 6eae7df43cd21b76fe91eeaf6ef2af9bd2a8fafc (patch) | |
| tree | d13414e6e7f40dc03d146014aac3874abe34bff7 /src/doc | |
| parent | 7334c11b4b196e39da2418a239e2ff916896fa19 (diff) | |
| parent | 0de6441aa928446e9e9c4c9a903dcb66a3145c1a (diff) | |
| download | rust-6eae7df43cd21b76fe91eeaf6ef2af9bd2a8fafc.tar.gz rust-6eae7df43cd21b76fe91eeaf6ef2af9bd2a8fafc.zip | |
auto merge of #13023 : thestinger/rust/deep_clone, r=alexcrichton
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rust.md | 2 | ||||
| -rw-r--r-- | src/doc/tutorial.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md index 39b62615536..deb26610ada 100644 --- a/src/doc/rust.md +++ b/src/doc/rust.md @@ -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. diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index 0a417a5a8bf..3c0439b7cd1 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -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 |