From bba701c59d84eac4e20d0796ec06db8d1cdd39cf Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 31 May 2014 10:43:52 -0700 Subject: std: Drop Total from Total{Eq,Ord} This completes the last stage of the renaming of the comparison hierarchy of traits. This change renames TotalEq to Eq and TotalOrd to Ord. In the future the new Eq/Ord will be filled out with their appropriate methods, but for now this change is purely a renaming change. [breaking-change] --- src/libtest/lib.rs | 4 ++-- src/libtest/stats.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libtest') diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 35911949ea4..4d408864dc5 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -83,7 +83,7 @@ pub mod stats; // colons. This way if some test runner wants to arrange the tests // hierarchically it may. -#[deriving(Clone, PartialEq, TotalEq, Hash)] +#[deriving(Clone, PartialEq, Eq, Hash)] pub enum TestName { StaticTestName(&'static str), DynTestName(String) @@ -183,7 +183,7 @@ pub struct Bencher { // The definition of a single test. A test runner will run a list of // these. -#[deriving(Clone, Show, PartialEq, TotalEq, Hash)] +#[deriving(Clone, Show, PartialEq, Eq, Hash)] pub struct TestDesc { pub name: TestName, pub ignore: bool, diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index 16a96d9f606..b446a587bb9 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -441,7 +441,7 @@ pub fn write_boxplot( /// Returns a HashMap with the number of occurrences of every element in the /// sequence that the iterator exposes. -pub fn freq_count, U: TotalEq+Hash>(mut iter: T) -> hashmap::HashMap { +pub fn freq_count, U: Eq+Hash>(mut iter: T) -> hashmap::HashMap { let mut map: hashmap::HashMap = hashmap::HashMap::new(); for elem in iter { map.insert_or_update_with(elem, 1, |_, count| *count += 1); -- cgit 1.4.1-3-g733a5