about summary refs log tree commit diff
path: root/src/etc
diff options
context:
space:
mode:
authorPiotr Jawniak <sawyer47@gmail.com>2014-06-22 09:31:39 +0200
committerPiotr Jawniak <sawyer47@gmail.com>2014-06-22 09:31:39 +0200
commit0b9e4fcaff609cc8e642d054e61fc54b168df22f (patch)
treec8116967baa54a7d35f9dce9d49de57346fb7863 /src/etc
parent4c39962d325c09849e9cbb1828f85028f29fcea3 (diff)
downloadrust-0b9e4fcaff609cc8e642d054e61fc54b168df22f.tar.gz
rust-0b9e4fcaff609cc8e642d054e61fc54b168df22f.zip
Update few files after comparison traits renaming
There were still Total{Ord,Eq} in docs and src/etc
Diffstat (limited to 'src/etc')
-rwxr-xr-xsrc/etc/generate-deriving-span-tests.py4
-rw-r--r--src/etc/vim/syntax/rust.vim4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py
index 7e6bfcdd4ec..94b3fb6b93a 100755
--- a/src/etc/generate-deriving-span-tests.py
+++ b/src/etc/generate-deriving-span-tests.py
@@ -119,8 +119,8 @@ for (trait, supers, errs) in [('Rand', [], 1),
                               ('Clone', [], 1),
                               ('PartialEq', [], 2),
                               ('PartialOrd', ['PartialEq'], 8),
-                              ('TotalEq', ['PartialEq'], 1),
-                              ('TotalOrd', ['TotalEq', 'PartialOrd', 'PartialEq'], 1),
+                              ('Eq', ['PartialEq'], 1),
+                              ('Ord', ['Eq', 'PartialOrd', 'PartialEq'], 1),
                               ('Show', [], 1),
                               ('Hash', [], 1)]:
     traits[trait] = (ALL, supers, errs)
diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim
index a0488cdb05a..8ef03f87b5b 100644
--- a/src/etc/vim/syntax/rust.vim
+++ b/src/etc/vim/syntax/rust.vim
@@ -82,7 +82,7 @@ syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
 syn keyword rustTrait ToCStr
 syn keyword rustTrait Char
 syn keyword rustTrait Clone
-syn keyword rustTrait Eq Ord TotalEq TotalOrd Ordering Equiv
+syn keyword rustTrait Eq Ord PartialEq PartialOrd Ordering Equiv
 syn keyword rustEnumVariant Less Equal Greater
 syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet
 syn keyword rustTrait FromIterator Extendable
@@ -104,7 +104,7 @@ syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8
 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12
 syn keyword rustTrait CloneableVector ImmutableCloneableVector MutableCloneableVector
 syn keyword rustTrait ImmutableVector MutableVector
-syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector MutableTotalOrdVector
+syn keyword rustTrait ImmutableEqVector ImmutableOrdVector MutableOrdVector
 syn keyword rustTrait Vector VectorVector OwnedVector MutableVectorAllocating
 syn keyword rustTrait String
 syn keyword rustTrait Vec