bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #15088 : Sawyer47/rust/detotal, r=alexcrichton

Browse source 
There were still Total{Ord,Eq} in docs and src/etc
This commit is contained in:
bors 2014-06-22 15:16:39 +00:00
commit c9f3c68961
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/doc/guide-container.md
View file

@ -26,7 +26,7 @@ The standard library provides three owned map/set types:
implement `Eq` and `Hash` implement `Eq` and `Hash`
* `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint` * `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint`
* `collections::TreeMap` and `collections::TreeSet`, requiring the keys * `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 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 long as the key and value types are sendable. Neither the key or value type has

2
src/doc/rust.md
View file

@ -2270,7 +2270,7 @@ impl<T: PartialEq> PartialEq for Foo<T> {
Supported traits for `deriving` are: Supported traits for `deriving` are:
* Comparison traits: `PartialEq`, `TotalEq`, `PartialOrd`, `TotalOrd`. * Comparison traits: `PartialEq`, `Eq`, `PartialOrd`, `Ord`.
* Serialization: `Encodable`, `Decodable`. These require `serialize`. * Serialization: `Encodable`, `Decodable`. These require `serialize`.
* `Clone`, to create `T` from `&T` via a copy. * `Clone`, to create `T` from `&T` via a copy.
* `Hash`, to iterate over the bytes in a data type. * `Hash`, to iterate over the bytes in a data type.

4
src/doc/tutorial.md
View file

@ -2619,8 +2619,8 @@ fn main() {
} }
~~~ ~~~
The full list of derivable traits is `PartialEq`, `TotalEq`, `Ord`, The full list of derivable traits is `PartialEq`, `Eq`, `PartialOrd`,
`TotalOrd`, `Encodable`, `Decodable`, `Clone`, `Ord`, `Encodable`, `Decodable`, `Clone`,
`Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`. `Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
# Crates and the module system # Crates and the module system

4
src/etc/generate-deriving-span-tests.py
View file

@ -119,8 +119,8 @@ for (trait, supers, errs) in [('Rand', [], 1),
('Clone', [], 1), ('Clone', [], 1),
('PartialEq', [], 2), ('PartialEq', [], 2),
('PartialOrd', ['PartialEq'], 8), ('PartialOrd', ['PartialEq'], 8),
('TotalEq', ['PartialEq'], 1), ('Eq', ['PartialEq'], 1),
('TotalOrd', ['TotalEq', 'PartialOrd', 'PartialEq'], 1), ('Ord', ['Eq', 'PartialOrd', 'PartialEq'], 1),
('Show', [], 1), ('Show', [], 1),
('Hash', [], 1)]: ('Hash', [], 1)]:
traits[trait] = (ALL, supers, errs) traits[trait] = (ALL, supers, errs)

4
src/etc/vim/syntax/rust.vim
View file

@ -82,7 +82,7 @@ syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
syn keyword rustTrait ToCStr syn keyword rustTrait ToCStr
syn keyword rustTrait Char syn keyword rustTrait Char
syn keyword rustTrait Clone 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 rustEnumVariant Less Equal Greater
syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet
syn keyword rustTrait FromIterator Extendable 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 Tuple9 Tuple10 Tuple11 Tuple12
syn keyword rustTrait CloneableVector ImmutableCloneableVector MutableCloneableVector syn keyword rustTrait CloneableVector ImmutableCloneableVector MutableCloneableVector
syn keyword rustTrait ImmutableVector MutableVector 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 Vector VectorVector OwnedVector MutableVectorAllocating
syn keyword rustTrait String syn keyword rustTrait String
syn keyword rustTrait Vec syn keyword rustTrait Vec