From 0b9e4fcaff609cc8e642d054e61fc54b168df22f Mon Sep 17 00:00:00 2001 From: Piotr Jawniak Date: Sun, 22 Jun 2014 09:31:39 +0200 Subject: [PATCH] Update few files after comparison traits renaming There were still Total{Ord,Eq} in docs and src/etc --- src/doc/guide-container.md | 2 +- src/doc/rust.md | 2 +- src/doc/tutorial.md | 4 ++-- src/etc/generate-deriving-span-tests.py | 4 ++-- src/etc/vim/syntax/rust.vim | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/doc/guide-container.md b/src/doc/guide-container.md index cca8cd7a84a..903aa868409 100644 --- a/src/doc/guide-container.md +++ b/src/doc/guide-container.md @@ -26,7 +26,7 @@ The standard library provides three owned map/set types: implement `Eq` and `Hash` * `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint` * `collections::TreeMap` and `collections::TreeSet`, requiring the keys - to implement `TotalOrd` + to implement `Ord` These maps do not use managed pointers so they can be sent between tasks as long as the key and value types are sendable. Neither the key or value type has diff --git a/src/doc/rust.md b/src/doc/rust.md index 6049ffab2bf..e7b6941b622 100644 --- a/src/doc/rust.md +++ b/src/doc/rust.md @@ -2270,7 +2270,7 @@ impl PartialEq for Foo { Supported traits for `deriving` are: -* Comparison traits: `PartialEq`, `TotalEq`, `PartialOrd`, `TotalOrd`. +* Comparison traits: `PartialEq`, `Eq`, `PartialOrd`, `Ord`. * Serialization: `Encodable`, `Decodable`. These require `serialize`. * `Clone`, to create `T` from `&T` via a copy. * `Hash`, to iterate over the bytes in a data type. diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index 6d9aa484167..e6d9cef7a31 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -2619,8 +2619,8 @@ fn main() { } ~~~ -The full list of derivable traits is `PartialEq`, `TotalEq`, `Ord`, -`TotalOrd`, `Encodable`, `Decodable`, `Clone`, +The full list of derivable traits is `PartialEq`, `Eq`, `PartialOrd`, +`Ord`, `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 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