From 16acc10bf9f0318d1d6e310a1fd23dd242811d10 Mon Sep 17 00:00:00 2001 From: nham Date: Sun, 27 Jul 2014 23:51:28 -0400 Subject: [PATCH] Implement PartialOrd for TrieMap and TrieSet --- src/libcollections/trie.rs | 73 +++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/src/libcollections/trie.rs b/src/libcollections/trie.rs index 1ac05fbd562..5d6a9080374 100644 --- a/src/libcollections/trie.rs +++ b/src/libcollections/trie.rs @@ -93,6 +93,13 @@ fn eq(&self, other: &TrieMap) -> bool { impl Eq for TrieMap {} +impl PartialOrd for TrieMap { + #[inline] + fn partial_cmp(&self, other: &TrieMap) -> Option { + iter::order::partial_cmp(self.iter(), other.iter()) + } +} + impl Show for TrieMap { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "{{")); @@ -517,7 +524,7 @@ fn hash(&self, state: &mut S) { /// set.clear(); /// assert!(set.is_empty()); /// ``` -#[deriving(Clone, Hash, PartialEq, Eq)] +#[deriving(Clone, Hash, PartialEq, Eq, PartialOrd)] pub struct TrieSet { map: TrieMap<()> } @@ -1309,6 +1316,38 @@ fn test_eq() { assert!(a == b); } + #[test] + fn test_lt() { + let mut a = TrieMap::new(); + let mut b = TrieMap::new(); + + assert!(!(a < b) && !(b < a)); + assert!(b.insert(2u, 5i)); + assert!(a < b); + assert!(a.insert(2, 7)); + assert!(!(a < b) && b < a); + assert!(b.insert(1, 0)); + assert!(b < a); + assert!(a.insert(0, 6)); + assert!(a < b); + assert!(a.insert(6, 2)); + assert!(a < b && !(b < a)); + } + + #[test] + fn test_ord() { + let mut a = TrieMap::new(); + let mut b = TrieMap::new(); + + assert!(a <= b && a >= b); + assert!(a.insert(1u, 1i)); + assert!(a > b && a >= b); + assert!(b < a && b <= a); + assert!(b.insert(2, 2)); + assert!(b > a && b >= a); + assert!(a < b && a <= b); + } + #[test] fn test_hash() { let mut x = TrieMap::new(); @@ -1513,4 +1552,36 @@ fn test_clone() { assert!(a.clone() == a); } + + #[test] + fn test_lt() { + let mut a = TrieSet::new(); + let mut b = TrieSet::new(); + + assert!(!(a < b) && !(b < a)); + assert!(b.insert(2u)); + assert!(a < b); + assert!(a.insert(3u)); + assert!(!(a < b) && b < a); + assert!(b.insert(1)); + assert!(b < a); + assert!(a.insert(0)); + assert!(a < b); + assert!(a.insert(6)); + assert!(a < b && !(b < a)); + } + + #[test] + fn test_ord() { + let mut a = TrieSet::new(); + let mut b = TrieSet::new(); + + assert!(a <= b && a >= b); + assert!(a.insert(1u)); + assert!(a > b && a >= b); + assert!(b < a && b <= a); + assert!(b.insert(2u)); + assert!(b > a && b >= a); + assert!(a < b && a <= b); + } } -- 2.44.0