language changes: {,Total}{Eq,Ord} -> {Partial,}{Eq,Ord}.

This commit is contained in:
Kang Seonghoon 2014-06-01 01:36:59 +09:00
parent b11484613f
commit 75d90a56fa
4 changed files with 8 additions and 8 deletions

View File

@ -16,7 +16,7 @@ pub static MAX_YEAR: int = internals::MAX_YEAR as int;
pub static MIN_YEAR: int = internals::MIN_YEAR as int; pub static MIN_YEAR: int = internals::MIN_YEAR as int;
/// The day of week (DOW). /// The day of week (DOW).
#[deriving(Eq, TotalEq, FromPrimitive, Show)] #[deriving(PartialEq, Eq, FromPrimitive, Show)]
pub enum Weekday { pub enum Weekday {
Mon = 0, Mon = 0,
Tue = 1, Tue = 1,
@ -208,7 +208,7 @@ pub trait Datelike {
/// ISO 8601 calendar date without timezone. /// ISO 8601 calendar date without timezone.
/// Allows for every proleptic Gregorian date from Jan 1, 262145 BCE to Dec 31, 262143 CE. /// Allows for every proleptic Gregorian date from Jan 1, 262145 BCE to Dec 31, 262143 CE.
/// Also supports the conversion from ISO 8601 ordinal and week date. /// Also supports the conversion from ISO 8601 ordinal and week date.
#[deriving(Eq, TotalEq, Ord, TotalOrd, Hash)] #[deriving(PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct DateZ { pub struct DateZ {
ymdf: DateImpl, // (year << 13) | of ymdf: DateImpl, // (year << 13) | of
} }
@ -740,7 +740,7 @@ mod internals {
/// where `a` is `1` for the common year (simplifies the `Of` validation) /// where `a` is `1` for the common year (simplifies the `Of` validation)
/// and `bbb` is a non-zero `Weekday` (mapping `Mon` to 7) of the last day in the past year /// and `bbb` is a non-zero `Weekday` (mapping `Mon` to 7) of the last day in the past year
/// (simplifies the day of week calculation from the 1-based ordinal). /// (simplifies the day of week calculation from the 1-based ordinal).
#[deriving(Eq, TotalEq)] #[deriving(PartialEq, Eq)]
pub struct YearFlags(pub u8); pub struct YearFlags(pub u8);
pub static A: YearFlags = YearFlags(0o15); pub static AG: YearFlags = YearFlags(0o05); pub static A: YearFlags = YearFlags(0o15); pub static AG: YearFlags = YearFlags(0o05);
@ -980,7 +980,7 @@ mod internals {
/// ///
/// The whole bits except for the least 3 bits are referred as `Ol` (ordinal and leap flag), /// The whole bits except for the least 3 bits are referred as `Ol` (ordinal and leap flag),
/// which is an index to the `OL_TO_MDL` lookup table. /// which is an index to the `OL_TO_MDL` lookup table.
#[deriving(Eq, Ord)] #[deriving(PartialEq, PartialOrd)]
pub struct Of(pub uint); pub struct Of(pub uint);
impl Of { impl Of {
@ -1081,7 +1081,7 @@ mod internals {
/// The whole bits except for the least 3 bits are referred as `Mdl` /// The whole bits except for the least 3 bits are referred as `Mdl`
/// (month, day of month and leap flag), /// (month, day of month and leap flag),
/// which is an index to the `MDL_TO_OL` lookup table. /// which is an index to the `MDL_TO_OL` lookup table.
#[deriving(Eq, Ord)] #[deriving(PartialEq, PartialOrd)]
pub struct Mdf(pub uint); pub struct Mdf(pub uint);
impl Mdf { impl Mdf {

View File

@ -11,7 +11,7 @@ use duration::Duration;
use time::{Timelike, TimeZ}; use time::{Timelike, TimeZ};
use date::{Datelike, DateZ, Weekday}; use date::{Datelike, DateZ, Weekday};
#[deriving(Eq, TotalEq, Ord, TotalOrd, Hash)] #[deriving(PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct DateTimeZ { pub struct DateTimeZ {
date: DateZ, date: DateZ,
time: TimeZ, time: TimeZ,

View File

@ -19,7 +19,7 @@ macro_rules! earlyexit(
($e:expr) => (match $e { Some(v) => v, None => return None }) ($e:expr) => (match $e { Some(v) => v, None => return None })
) )
#[deriving(Eq, TotalEq, Ord, TotalOrd)] #[deriving(PartialEq, Eq, PartialOrd, Ord)]
pub struct Duration { pub struct Duration {
days: i32, days: i32,
secs: u32, secs: u32,

View File

@ -63,7 +63,7 @@ pub trait Timelike {
/// ISO 8601 time without timezone. /// ISO 8601 time without timezone.
/// Allows for the nanosecond precision and optional leap second representation. /// Allows for the nanosecond precision and optional leap second representation.
#[deriving(Eq, TotalEq, Ord, TotalOrd, Hash)] #[deriving(PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct TimeZ { pub struct TimeZ {
hour: u8, hour: u8,
min: u8, min: u8,