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/etc | |
| 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/etc')
| -rwxr-xr-x | src/etc/generate-deriving-span-tests.py | 2 | ||||
| -rw-r--r-- | src/etc/vim/syntax/rust.vim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index 05ce884dfb1..df8d33882c1 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -116,7 +116,7 @@ traits = { } 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 9c8e5b5d010..c63948d3ed1 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 |