diff --git a/Cargo.toml b/Cargo.toml index 44ea37a9..cf85aaca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,6 @@ now = ["std"] wasmbind = ["dep:wasm-bindgen", "dep:js-sys"] unstable-locales = ["dep:pure-rust-locales"] # Note that rkyv-16, rkyv-32, and rkyv-64 are mutually exclusive. -rkyv = ["dep:rkyv", "rkyv/size_32"] rkyv-16 = ["dep:rkyv", "rkyv?/size_16"] rkyv-32 = ["dep:rkyv", "rkyv?/size_32"] rkyv-64 = ["dep:rkyv", "rkyv?/size_64"] diff --git a/README.md b/README.md index 70aa01d6..87e08551 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ Default features: Optional features: * `serde`: Enable serialization/deserialization via [serde]. -* `rkyv`: Deprecated, use the `rkyv-*` features. * `rkyv-16`: Enable serialization/deserialization via [rkyv], using 16-bit integers for integral `*size` types. * `rkyv-32`: Enable serialization/deserialization via [rkyv], using 32-bit integers for integral `*size` types. * `rkyv-64`: Enable serialization/deserialization via [rkyv], using 64-bit integers for integral `*size` types. @@ -70,7 +69,7 @@ Optional features: The implementation and API may change or even be removed in a patch release. Feedback welcome. * `oldtime`: This feature no longer has any effect; it used to offer compatibility with the `time` 0.1 crate. -Note: The `rkyv{,-16,-32,-64}` features are mutually exclusive. +Note: The `rkyv-{16,32,64}` features are mutually exclusive. [serde]: https://github.com/serde-rs/serde [rkyv]: https://github.com/rkyv/rkyv diff --git a/src/datetime/mod.rs b/src/datetime/mod.rs index fd935a13..e99b85e6 100644 --- a/src/datetime/mod.rs +++ b/src/datetime/mod.rs @@ -30,7 +30,7 @@ use crate::offset::{FixedOffset, MappedLocalTime, Offset, TimeZone, Utc}; use crate::OutOfRange; use crate::{try_err, try_ok_or, Datelike, Error, Months, TimeDelta, Timelike, Weekday}; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; /// documented at re-export site @@ -47,7 +47,7 @@ mod tests; /// [`TimeZone`](./offset/trait.TimeZone.html) implementations. #[derive(Copy, Clone)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)) )] diff --git a/src/lib.rs b/src/lib.rs index 4c5c315a..6bd8a7d9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,7 +35,6 @@ //! Optional features: //! //! - `serde`: Enable serialization/deserialization via [serde]. -//! - `rkyv`: Deprecated, use the `rkyv-*` features. //! - `rkyv-16`: Enable serialization/deserialization via [rkyv], //! using 16-bit integers for integral `*size` types. //! - `rkyv-32`: Enable serialization/deserialization via [rkyv], @@ -47,7 +46,7 @@ //! - `unstable-locales`: Enable localization. This adds various methods with a `_localized` suffix. //! The implementation and API may change or even be removed in a patch release. Feedback welcome. //! -//! Note: The `rkyv{,-16,-32,-64}` features are mutually exclusive. +//! Note: The `rkyv-{16,32,64}` features are mutually exclusive. //! //! See the [cargo docs] for examples of specifying features. //! @@ -591,7 +590,7 @@ pub mod serde { /// Zero-copy serialization/deserialization with rkyv. /// /// This module re-exports the `Archived*` versions of chrono's types. -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] pub mod rkyv { pub use crate::datetime::ArchivedDateTime; pub use crate::month::ArchivedMonth; diff --git a/src/month.rs b/src/month.rs index 4a5bbb38..00798bd5 100644 --- a/src/month.rs +++ b/src/month.rs @@ -1,6 +1,6 @@ use core::fmt; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; use crate::OutOfRange; @@ -32,7 +32,7 @@ use crate::OutOfRange; /// Can be Serialized/Deserialized with serde. #[derive(PartialEq, Eq, Copy, Clone, Debug, Hash, PartialOrd, Ord)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/naive/date/mod.rs b/src/naive/date/mod.rs index 53b6fe99..2d6baf7a 100644 --- a/src/naive/date/mod.rs +++ b/src/naive/date/mod.rs @@ -20,7 +20,7 @@ use core::num::NonZeroI32; use core::ops::{Add, AddAssign, Sub, SubAssign}; use core::{fmt, str}; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; /// L10n locales. @@ -93,7 +93,7 @@ mod tests; /// [proleptic Gregorian date]: crate::NaiveDate#calendar-date #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/naive/datetime/mod.rs b/src/naive/datetime/mod.rs index 10c33c14..bd1c34e9 100644 --- a/src/naive/datetime/mod.rs +++ b/src/naive/datetime/mod.rs @@ -10,7 +10,7 @@ use core::ops::{Add, AddAssign, Sub, SubAssign}; use core::time::Duration; use core::{fmt, str}; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; #[cfg(feature = "alloc")] @@ -57,7 +57,7 @@ mod tests; /// ``` #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/naive/isoweek.rs b/src/naive/isoweek.rs index 533eba5d..2e5e5054 100644 --- a/src/naive/isoweek.rs +++ b/src/naive/isoweek.rs @@ -7,7 +7,7 @@ use core::fmt; use super::internals::YearFlags; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; /// ISO 8601 week. @@ -18,7 +18,7 @@ use rkyv::{Archive, Deserialize, Serialize}; /// via the [`Datelike::iso_week`](../trait.Datelike.html#tymethod.iso_week) method. #[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Hash)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/naive/time/mod.rs b/src/naive/time/mod.rs index 0a3d9daf..36480a83 100644 --- a/src/naive/time/mod.rs +++ b/src/naive/time/mod.rs @@ -9,7 +9,7 @@ use core::ops::{Add, AddAssign, Sub, SubAssign}; use core::time::Duration; use core::{fmt, str}; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; #[cfg(feature = "alloc")] @@ -205,7 +205,7 @@ mod tests; /// **there is absolutely no guarantee that the leap second read has actually happened**. #[derive(PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Clone)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/offset/fixed.rs b/src/offset/fixed.rs index bb19faeb..7c7344ec 100644 --- a/src/offset/fixed.rs +++ b/src/offset/fixed.rs @@ -6,7 +6,7 @@ use core::fmt; use core::str::FromStr; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; use super::{MappedLocalTime, Offset, TimeZone}; @@ -21,7 +21,7 @@ use crate::{Error, NaiveDateTime, ParseError}; /// [`west`](#method.west) methods for examples. #[derive(PartialEq, Eq, Hash, Copy, Clone)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq)), archive_attr(derive(Clone, Copy, PartialEq, Eq, Hash, Debug)) diff --git a/src/offset/local/mod.rs b/src/offset/local/mod.rs index 4b209a7f..bf476aac 100644 --- a/src/offset/local/mod.rs +++ b/src/offset/local/mod.rs @@ -6,7 +6,7 @@ #[cfg(windows)] use std::cmp::Ordering; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; use super::fixed::FixedOffset; @@ -107,7 +107,7 @@ mod tz_info; /// ``` #[derive(Copy, Clone, Debug)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq)), archive_attr(derive(Clone, Copy, Debug)) diff --git a/src/offset/utc.rs b/src/offset/utc.rs index f71ef1bd..9f4c0b13 100644 --- a/src/offset/utc.rs +++ b/src/offset/utc.rs @@ -14,7 +14,7 @@ use core::fmt; ))] use std::time::SystemTime; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; use super::{FixedOffset, MappedLocalTime, Offset, TimeZone}; @@ -43,7 +43,7 @@ use crate::OutOfRange; /// ``` #[derive(Copy, Clone, PartialEq, Eq, Hash)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq)), archive_attr(derive(Clone, Copy, PartialEq, Eq, Debug, Hash)) diff --git a/src/time_delta.rs b/src/time_delta.rs index 9bf779f6..2574a6b9 100644 --- a/src/time_delta.rs +++ b/src/time_delta.rs @@ -16,7 +16,7 @@ use core::{fmt, i64}; use crate::{expect, ok, try_ok_or, Error}; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; /// The number of nanoseconds in a microsecond. @@ -49,7 +49,7 @@ const SECS_PER_WEEK: i64 = 604_800; /// instance `abs()` can be called without any checks. #[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq, PartialOrd)), archive_attr(derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)) diff --git a/src/weekday.rs b/src/weekday.rs index 0c5ae022..0f96fcd3 100644 --- a/src/weekday.rs +++ b/src/weekday.rs @@ -1,6 +1,6 @@ use core::fmt; -#[cfg(any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] +#[cfg(any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"))] use rkyv::{Archive, Deserialize, Serialize}; use crate::OutOfRange; @@ -31,7 +31,7 @@ use crate::OutOfRange; /// ``` #[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)] #[cfg_attr( - any(feature = "rkyv", feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), + any(feature = "rkyv-16", feature = "rkyv-32", feature = "rkyv-64"), derive(Archive, Deserialize, Serialize), archive(compare(PartialEq)), archive_attr(derive(Clone, Copy, PartialEq, Eq, Debug, Hash))