diff --git a/CHANGELOG.md b/CHANGELOG.md index fd8facd028..e596cf406e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Versions with only mechanical changes will be omitted from the following list. * Correct build for wasm32-unknown-emscripten target (#568) * Change `Local::now()` and `Utc::now()` documentation from "current date" to "current date and time" (#647) * Fix `duration_round` panic on rounding by `Duration::zero()` (#658) +* Add optional rkyv support. ## 0.4.19 diff --git a/Cargo.toml b/Cargo.toml index 03ad3eb263..0a7c37cd86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,6 +39,7 @@ rustc-serialize = { version = "0.3.20", optional = true } serde = { version = "1.0.99", default-features = false, optional = true } pure-rust-locales = { version = "0.5.2", optional = true } criterion = { version = "0.3", optional = true } +rkyv = {version = "0.7", optional = true} [target.'cfg(all(target_arch = "wasm32", not(any(target_os = "emscripten", target_os = "wasi"))))'.dependencies] wasm-bindgen = { version = "0.2", optional = true } diff --git a/src/date.rs b/src/date.rs index a3cb88a0bc..0758cc844f 100644 --- a/src/date.rs +++ b/src/date.rs @@ -3,19 +3,22 @@ //! ISO 8601 calendar date with time zone. -use crate::oldtime::Duration as OldDuration; #[cfg(any(feature = "alloc", feature = "std", test))] use core::borrow::Borrow; use core::cmp::Ordering; use core::ops::{Add, Sub}; use core::{fmt, hash}; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; + #[cfg(feature = "unstable-locales")] use crate::format::Locale; #[cfg(any(feature = "alloc", feature = "std", test))] use crate::format::{DelayedFormat, Item, StrftimeItems}; use crate::naive::{self, IsoWeek, NaiveDate, NaiveTime}; use crate::offset::{TimeZone, Utc}; +use crate::oldtime::Duration as OldDuration; use crate::DateTime; use crate::{Datelike, Weekday}; @@ -51,6 +54,7 @@ use crate::{Datelike, Weekday}; /// so the local date and UTC date should be equal for most cases /// even though the raw calculation between `NaiveDate` and `Duration` may not. #[derive(Clone)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct Date { date: NaiveDate, offset: Tz::Offset, diff --git a/src/naive/date.rs b/src/naive/date.rs index d0b6b4c33a..50ba1129a8 100644 --- a/src/naive/date.rs +++ b/src/naive/date.rs @@ -3,19 +3,22 @@ //! ISO 8601 calendar date without timezone. -use crate::oldtime::Duration as OldDuration; #[cfg(any(feature = "alloc", feature = "std", test))] use core::borrow::Borrow; use core::ops::{Add, AddAssign, Sub, SubAssign}; use core::{fmt, str}; + use num_integer::div_mod_floor; use num_traits::ToPrimitive; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; #[cfg(any(feature = "alloc", feature = "std", test))] use crate::format::DelayedFormat; use crate::format::{parse, ParseError, ParseResult, Parsed, StrftimeItems}; use crate::format::{Item, Numeric, Pad}; use crate::naive::{IsoWeek, NaiveDateTime, NaiveTime}; +use crate::oldtime::Duration as OldDuration; use crate::{Datelike, Weekday}; use super::internals::{self, DateImpl, Mdf, Of, YearFlags}; @@ -96,6 +99,7 @@ const MAX_BITS: usize = 44; /// /// This is currently the internal format of Chrono's date types. #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct NaiveDate { ymdf: DateImpl, // (year << 13) | of } diff --git a/src/naive/datetime/mod.rs b/src/naive/datetime/mod.rs index 6d37af442e..cd1853c338 100644 --- a/src/naive/datetime/mod.rs +++ b/src/naive/datetime/mod.rs @@ -10,6 +10,8 @@ use core::{fmt, str}; use num_integer::div_mod_floor; use num_traits::ToPrimitive; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; #[cfg(any(feature = "alloc", feature = "std", test))] use crate::format::DelayedFormat; @@ -70,6 +72,7 @@ pub const MAX_DATETIME: NaiveDateTime = NaiveDateTime { date: MAX_DATE, time: MA /// assert_eq!(dt.num_seconds_from_midnight(), 33011); /// ``` #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct NaiveDateTime { date: NaiveDate, time: NaiveTime, diff --git a/src/naive/time/mod.rs b/src/naive/time/mod.rs index 8046214d23..29b0929a06 100644 --- a/src/naive/time/mod.rs +++ b/src/naive/time/mod.rs @@ -7,7 +7,10 @@ use core::borrow::Borrow; use core::ops::{Add, AddAssign, Sub, SubAssign}; use core::{fmt, str}; + use num_integer::div_mod_floor; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; #[cfg(any(feature = "alloc", feature = "std", test))] use crate::format::DelayedFormat; @@ -189,6 +192,7 @@ pub(super) const MAX_TIME: NaiveTime = /// Since Chrono alone cannot determine any existence of leap seconds, /// **there is absolutely no guarantee that the leap second read has actually happened**. #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct NaiveTime { secs: u32, frac: u32, diff --git a/src/offset/fixed.rs b/src/offset/fixed.rs index 3b31402a4b..df1a990bac 100644 --- a/src/offset/fixed.rs +++ b/src/offset/fixed.rs @@ -5,7 +5,10 @@ use core::fmt; use core::ops::{Add, Sub}; + use num_integer::div_mod_floor; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; use super::{LocalResult, Offset, TimeZone}; use crate::naive::{NaiveDate, NaiveDateTime, NaiveTime}; @@ -20,6 +23,7 @@ use crate::Timelike; /// `DateTime` instances. See the [`east`](#method.east) and /// [`west`](#method.west) methods for examples. #[derive(PartialEq, Eq, Hash, Copy, Clone)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct FixedOffset { local_minus_utc: i32, } diff --git a/src/offset/local.rs b/src/offset/local.rs index 3eef187bb8..f1da534212 100644 --- a/src/offset/local.rs +++ b/src/offset/local.rs @@ -3,14 +3,16 @@ //! The local (system) time zone. -#[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))] -use crate::sys::{self, Timespec}; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; use super::fixed::FixedOffset; use super::{LocalResult, TimeZone}; #[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))] use crate::naive::NaiveTime; use crate::naive::{NaiveDate, NaiveDateTime}; +#[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))] +use crate::sys::{self, Timespec}; use crate::{Date, DateTime}; #[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))] use crate::{Datelike, Timelike}; @@ -88,6 +90,7 @@ fn datetime_to_timespec(d: &NaiveDateTime, local: bool) -> sys::Timespec { /// let dt: DateTime = Local.timestamp(0, 0); /// ``` #[derive(Copy, Clone, Debug)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct Local; impl Local { diff --git a/src/offset/utc.rs b/src/offset/utc.rs index 42e76a9c1d..730c03e95f 100644 --- a/src/offset/utc.rs +++ b/src/offset/utc.rs @@ -4,17 +4,20 @@ //! The UTC (Coordinated Universal Time) time zone. use core::fmt; - -use super::{FixedOffset, LocalResult, Offset, TimeZone}; -use crate::naive::{NaiveDate, NaiveDateTime}; -#[cfg(feature = "clock")] -use crate::{Date, DateTime}; #[cfg(all( feature = "clock", not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")) ))] use std::time::{SystemTime, UNIX_EPOCH}; +#[cfg(feature = "rkyv")] +use rkyv::{Archive, Deserialize, Serialize}; + +use super::{FixedOffset, LocalResult, Offset, TimeZone}; +use crate::naive::{NaiveDate, NaiveDateTime}; +#[cfg(feature = "clock")] +use crate::{Date, DateTime}; + /// The UTC time zone. This is the most efficient time zone when you don't need the local time. /// It is also used as an offset (which is also a dummy type). /// @@ -33,6 +36,7 @@ use std::time::{SystemTime, UNIX_EPOCH}; /// assert_eq!(Utc.ymd(1970, 1, 1).and_hms(0, 1, 1), dt); /// ``` #[derive(Copy, Clone, PartialEq, Eq)] +#[cfg_attr(feature = "rkyv", derive(Archive, Deserialize, Serialize))] pub struct Utc; #[cfg(feature = "clock")]