diff --git a/src/doc/rust.md b/src/doc/rust.md index 7233288a81328..ff2235c994d4a 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 cdb521b96c42f..6dc6ba4529d47 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -2534,7 +2534,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 diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index 05ce884dfb186..df8d33882c116 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -116,7 +116,7 @@ def write_file(name, string): } for (trait, supers, errs) in [('Rand', [], 1), - ('Clone', [], 1), ('DeepClone', ['Clone'], 1), + ('Clone', [], 1), ('Eq', [], 2), ('Ord', [], 8), ('TotalEq', [], 1), ('TotalOrd', ['TotalEq'], 1), ('Show', [], 1), diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index 9c8e5b5d01086..c63948d3ed16a 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -72,7 +72,7 @@ syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes syn keyword rustTrait ToCStr syn keyword rustTrait Char -syn keyword rustTrait Clone DeepClone +syn keyword rustTrait Clone syn keyword rustTrait Eq Ord TotalEq TotalOrd Ordering Equiv syn keyword rustEnumVariant Less Equal Greater syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet