store: move timestamp to calendar

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -21,13 +21,13 @@ use crate::{
 struct TimeRangeElement {
     #[serde(
         rename = "@start",
-        deserialize_with = "rustical_store::timestamp::deserialize_utc_datetime",
+        deserialize_with = "rustical_store::calendar::deserialize_utc_datetime",
         default
     )]
     start: Option<DateTime<Utc>>,
     #[serde(
         rename = "@end",
-        deserialize_with = "rustical_store::timestamp::deserialize_utc_datetime",
+        deserialize_with = "rustical_store::calendar::deserialize_utc_datetime",
         default
     )]
     end: Option<DateTime<Utc>>,

crates/store/src/calendar/event.rs

@@ -1,7 +1,5 @@
-use crate::{
+use super::{parse_duration, CalDateTime};
-    timestamp::{parse_duration, CalDateTime},
+use crate::Error;
-    Error,
-};
 use chrono::Duration;
 use ical::{
     generator::IcalEvent,

crates/store/src/calendar/mod.rs

@@ -2,10 +2,12 @@ mod calendar;
 mod event;
 mod journal;
 mod object;
+mod timestamp;
 mod todo;
 
 pub use calendar::*;
 pub use event::*;
 pub use journal::*;
 pub use object::*;
+pub use timestamp::*;
 pub use todo::*;

crates/store/src/calendar/object.rs

@@ -1,5 +1,5 @@
-use super::{event::EventObject, journal::JournalObject, todo::TodoObject};
+use super::{CalDateTime, EventObject, JournalObject, TodoObject};
-use crate::{timestamp::CalDateTime, Error};
+use crate::Error;
 use anyhow::Result;
 use ical::parser::{ical::component::IcalTimeZone, Component};
 use serde::{Deserialize, Serialize};

crates/store/src/calendar/timestamp.rs

@@ -1,5 +1,4 @@
 use crate::Error;
-use anyhow::{anyhow, Result};
 use chrono::{DateTime, Duration, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use chrono_tz::Tz;
 use ical::{

crates/store/src/lib.rs

@@ -2,7 +2,6 @@ pub mod addressbook;
 pub mod addressbook_store;
 pub mod calendar_store;
 pub mod error;
-pub mod timestamp;
 pub use error::Error;
 pub mod auth;
 pub mod calendar;