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/libglob/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libglob') diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs index 8db8f0dac10..86753fbb811 100644 --- a/src/libglob/lib.rs +++ b/src/libglob/lib.rs @@ -198,12 +198,12 @@ fn list_dir_sorted(path: &Path) -> Option> { /** * A compiled Unix shell style pattern. */ -#[deriving(Clone, PartialEq, TotalEq, PartialOrd, TotalOrd, Hash, Default)] +#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] pub struct Pattern { tokens: Vec, } -#[deriving(Clone, PartialEq, TotalEq, PartialOrd, TotalOrd, Hash)] +#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] enum PatternToken { Char(char), AnyChar, @@ -212,7 +212,7 @@ enum PatternToken { AnyExcept(Vec ) } -#[deriving(Clone, PartialEq, TotalEq, PartialOrd, TotalOrd, Hash)] +#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] enum CharSpecifier { SingleChar(char), CharRange(char, char) @@ -596,7 +596,7 @@ fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool { /** * Configuration options to modify the behaviour of `Pattern::matches_with(..)` */ -#[deriving(Clone, PartialEq, TotalEq, PartialOrd, TotalOrd, Hash, Default)] +#[deriving(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] pub struct MatchOptions { /** -- cgit 1.4.1-3-g733a5