From c2e9f6130470257955999f6bcc9e972beb3ecafa Mon Sep 17 00:00:00 2001 From: Weiyuan Wu Date: Wed, 23 Mar 2022 20:44:36 +0000 Subject: [PATCH] tidy up imports --- src/date.rs | 8 +++++--- src/naive/date.rs | 7 ++++--- src/naive/datetime/mod.rs | 4 ++-- src/naive/time/mod.rs | 5 +++-- src/offset/fixed.rs | 5 +++-- src/offset/local.rs | 8 ++++---- src/offset/utc.rs | 15 ++++++++------- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/date.rs b/src/date.rs index 1904378389..0758cc844f 100644 --- a/src/date.rs +++ b/src/date.rs @@ -3,23 +3,25 @@ //! 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}; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; + /// ISO 8601 calendar date with time zone. /// /// You almost certainly want to be using a [`NaiveDate`] instead of this type. diff --git a/src/naive/date.rs b/src/naive/date.rs index 70011478b4..50ba1129a8 100644 --- a/src/naive/date.rs +++ b/src/naive/date.rs @@ -3,22 +3,23 @@ //! 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}; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; use super::internals::{self, DateImpl, Mdf, Of, YearFlags}; use super::isoweek; diff --git a/src/naive/datetime/mod.rs b/src/naive/datetime/mod.rs index 9744453bc9..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; @@ -20,8 +22,6 @@ use crate::naive::time::{MAX_TIME, MIN_TIME}; use crate::naive::{IsoWeek, NaiveDate, NaiveTime}; use crate::oldtime::Duration as OldDuration; use crate::{Datelike, Timelike, Weekday}; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; #[cfg(feature = "rustc-serialize")] pub(super) mod rustc_serialize; diff --git a/src/naive/time/mod.rs b/src/naive/time/mod.rs index ea64dc0810..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; @@ -15,8 +18,6 @@ use crate::format::{parse, ParseError, ParseResult, Parsed, StrftimeItems}; use crate::format::{Fixed, Item, Numeric, Pad}; use crate::oldtime::Duration as OldDuration; use crate::Timelike; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; #[cfg(feature = "rustc-serialize")] mod rustc_serialize; diff --git a/src/offset/fixed.rs b/src/offset/fixed.rs index 9bca837039..df1a990bac 100644 --- a/src/offset/fixed.rs +++ b/src/offset/fixed.rs @@ -5,15 +5,16 @@ 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}; use crate::oldtime::Duration as OldDuration; use crate::DateTime; use crate::Timelike; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; /// The time zone with fixed offset, from UTC-23:59:59 to UTC+23:59:59. /// diff --git a/src/offset/local.rs b/src/offset/local.rs index 205e2257f1..f1da534212 100644 --- a/src/offset/local.rs +++ b/src/offset/local.rs @@ -3,19 +3,19 @@ //! 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}; -#[cfg(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; /// Converts a `time::Tm` struct into the timezone-aware `DateTime`. /// This assumes that `time` is working correctly, i.e. any error is fatal. diff --git a/src/offset/utc.rs b/src/offset/utc.rs index 54c1c022e8..730c03e95f 100644 --- a/src/offset/utc.rs +++ b/src/offset/utc.rs @@ -4,19 +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(feature = "rkyv")] -use rkyv::{Archive, Deserialize, Serialize}; #[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). ///