From 743788298ef4d83eae58890f4fb5262510de37ce Mon Sep 17 00:00:00 2001
From: Ruben Pollan
Date: Mon, 27 Aug 2018 20:01:34 +0200
Subject: Implement Orc for dates
---
src/event.rs | 56 +++++++++++++++++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 21 deletions(-)
(limited to 'src')
diff --git a/src/event.rs b/src/event.rs
index 3594a11..bf97727 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -1,4 +1,4 @@
-use std::cmp::Ordering;
+use std::cmp::{Ordering, Ord, PartialEq, PartialOrd};
use std::fmt;
use std::str::FromStr;
@@ -9,7 +9,7 @@ use chrono_tz::{Tz, UTC};
use errors::EventError;
-#[derive(Debug)]
+#[derive(Debug, Clone)]
pub struct Event {
pub start: Date,
pub end: Date,
@@ -19,13 +19,13 @@ pub struct Event {
pub status: Status,
}
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone, Eq)]
pub enum Date {
Time(chrono::DateTime<Tz>),
AllDay(chrono::Date<Tz>),
}
-#[derive(Debug)]
+#[derive(Debug, Copy, Clone)]
pub enum Status {
Confirmed,
Tentative,
@@ -64,23 +64,6 @@ impl Date {
Date::Time(UTC.timestamp(0, 0))
}
- pub fn cmp(&self, other: &Self) -> Ordering {
- match *self {
- Date::Time(t1) => {
- match *other {
- Date::Time(t2) => t1.cmp(&t2),
- Date::AllDay(d) => cmp_date_time(&d, &t1).reverse(),
- }
- }
- Date::AllDay(d1) => {
- match *other {
- Date::Time(t) => cmp_date_time(&d1, &t),
- Date::AllDay(d2) => d1.cmp(&d2),
- }
- }
- }
- }
-
pub fn parse(date: &String, time_zone: &String) -> Result<Self, EventError> {
let absolute_time = date.chars().rev().next().unwrap() == 'Z';
let tz: Tz = if absolute_time {
@@ -114,6 +97,37 @@ impl Date {
}
}
+impl Ord for Date {
+ fn cmp(&self, other: &Self) -> Ordering {
+ match *self {
+ Date::Time(t1) => {
+ match *other {
+ Date::Time(t2) => t1.cmp(&t2),
+ Date::AllDay(d) => cmp_date_time(&d, &t1).reverse(),
+ }
+ }
+ Date::AllDay(d1) => {
+ match *other {
+ Date::Time(t) => cmp_date_time(&d1, &t),
+ Date::AllDay(d2) => d1.cmp(&d2),
+ }
+ }
+ }
+ }
+}
+
+impl PartialOrd for Date {
+ fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+ Some(self.cmp(other))
+ }
+}
+
+impl PartialEq for Date {
+ fn eq(&self, other: &Self) -> bool {
+ self.cmp(other) == Ordering::Equal
+ }
+}
+
impl FromStr for Status {
type Err = EventError;
--
cgit v1.2.3