Skip to content

Commit

Permalink
rename existing TimeDelta to OldTimeDelta
Browse files Browse the repository at this point in the history
  • Loading branch information
@esheppa
esheppa committed Oct 8, 2022
1 parent 1795e4d commit ae23b6b
Show file tree
Hide file tree
Showing 15 changed files with 757 additions and 757 deletions.
60 changes: 30 additions & 30 deletions src/date.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::format::Locale;
use crate::format::{DelayedFormat, Item, StrftimeItems};
use crate::naive::{IsoWeek, NaiveDate, NaiveTime};
use crate::offset::{TimeZone, Utc};
use crate::time_delta::TimeDelta;
use crate::time_delta::OldTimeDelta;
use crate::DateTime;
use crate::{Datelike, Weekday};

Expand Down Expand Up @@ -240,7 +240,7 @@ impl<Tz: TimeZone> Date<Tz> {
///
/// Returns `None` when it will result in overflow.
#[inline]
pub fn checked_add_signed(self, rhs: TimeDelta) -> Option<Date<Tz>> {
pub fn checked_add_signed(self, rhs: OldTimeDelta) -> Option<Date<Tz>> {
let date = self.date.checked_add_signed(rhs)?;
Some(Date { date, offset: self.offset })
}
Expand All @@ -249,7 +249,7 @@ impl<Tz: TimeZone> Date<Tz> {
///
/// Returns `None` when it will result in overflow.
#[inline]
pub fn checked_sub_signed(self, rhs: TimeDelta) -> Option<Date<Tz>> {
pub fn checked_sub_signed(self, rhs: OldTimeDelta) -> Option<Date<Tz>> {
let date = self.date.checked_sub_signed(rhs)?;
Some(Date { date, offset: self.offset })
}
Expand All @@ -260,7 +260,7 @@ impl<Tz: TimeZone> Date<Tz> {
/// This does not overflow or underflow at all,
/// as all possible output fits in the range of `Duration`.
#[inline]
pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: Date<Tz2>) -> TimeDelta {
pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: Date<Tz2>) -> OldTimeDelta {
self.date.signed_duration_since(rhs.date)
}

Expand Down Expand Up @@ -483,43 +483,43 @@ impl<Tz: TimeZone> hash::Hash for Date<Tz> {
}
}

impl<Tz: TimeZone> Add<TimeDelta> for Date<Tz> {
impl<Tz: TimeZone> Add<OldTimeDelta> for Date<Tz> {
type Output = Date<Tz>;

#[inline]
fn add(self, rhs: TimeDelta) -> Date<Tz> {
fn add(self, rhs: OldTimeDelta) -> Date<Tz> {
self.checked_add_signed(rhs).expect("`Date + Duration` overflowed")
}
}

impl<Tz: TimeZone> AddAssign<TimeDelta> for Date<Tz> {
impl<Tz: TimeZone> AddAssign<OldTimeDelta> for Date<Tz> {
#[inline]
fn add_assign(&mut self, rhs: TimeDelta) {
fn add_assign(&mut self, rhs: OldTimeDelta) {
self.date = self.date.checked_add_signed(rhs).expect("`Date + Duration` overflowed");
}
}

impl<Tz: TimeZone> Sub<TimeDelta> for Date<Tz> {
impl<Tz: TimeZone> Sub<OldTimeDelta> for Date<Tz> {
type Output = Date<Tz>;

#[inline]
fn sub(self, rhs: TimeDelta) -> Date<Tz> {
fn sub(self, rhs: OldTimeDelta) -> Date<Tz> {
self.checked_sub_signed(rhs).expect("`Date - Duration` overflowed")
}
}

impl<Tz: TimeZone> SubAssign<TimeDelta> for Date<Tz> {
impl<Tz: TimeZone> SubAssign<OldTimeDelta> for Date<Tz> {
#[inline]
fn sub_assign(&mut self, rhs: TimeDelta) {
fn sub_assign(&mut self, rhs: OldTimeDelta) {
self.date = self.date.checked_sub_signed(rhs).expect("`Date - Duration` overflowed");
}
}

impl<Tz: TimeZone> Sub<Date<Tz>> for Date<Tz> {
type Output = TimeDelta;
type Output = OldTimeDelta;

#[inline]
fn sub(self, rhs: Date<Tz>) -> TimeDelta {
fn sub(self, rhs: Date<Tz>) -> OldTimeDelta {
self.signed_duration_since(rhs)
}
}
Expand All @@ -543,7 +543,7 @@ where
mod tests {
use super::Date;

use crate::time_delta::TimeDelta;
use crate::time_delta::OldTimeDelta;
use crate::{FixedOffset, NaiveDate, Utc};

#[cfg(feature = "clock")]
Expand All @@ -555,15 +555,15 @@ mod tests {
const WEEKS_PER_YEAR: f32 = 52.1775;

// This is always at least one year because 1 year = 52.1775 weeks.
let one_year_ago = Utc::today() - TimeDelta::weeks((WEEKS_PER_YEAR * 1.5).ceil() as i64);
let one_year_ago = Utc::today() - OldTimeDelta::weeks((WEEKS_PER_YEAR * 1.5).ceil() as i64);
// A bit more than 2 years.
let two_year_ago = Utc::today() - TimeDelta::weeks((WEEKS_PER_YEAR * 2.5).ceil() as i64);
let two_year_ago = Utc::today() - OldTimeDelta::weeks((WEEKS_PER_YEAR * 2.5).ceil() as i64);

assert_eq!(Utc::today().years_since(one_year_ago), Some(1));
assert_eq!(Utc::today().years_since(two_year_ago), Some(2));

// If the given DateTime is later than now, the function will always return 0.
let future = Utc::today() + TimeDelta::weeks(12);
let future = Utc::today() + OldTimeDelta::weeks(12);
assert_eq!(Utc::today().years_since(future), None);
}

Expand All @@ -573,20 +573,20 @@ mod tests {
let date = Date::<Utc>::from_utc(naivedate, Utc);
let mut date_add = date;

date_add += TimeDelta::days(5);
assert_eq!(date_add, date + TimeDelta::days(5));
date_add += OldTimeDelta::days(5);
assert_eq!(date_add, date + OldTimeDelta::days(5));

let timezone = FixedOffset::east(60 * 60);
let date = date.with_timezone(&timezone);
let date_add = date_add.with_timezone(&timezone);

assert_eq!(date_add, date + TimeDelta::days(5));
assert_eq!(date_add, date + OldTimeDelta::days(5));

let timezone = FixedOffset::west(2 * 60 * 60);
let date = date.with_timezone(&timezone);
let date_add = date_add.with_timezone(&timezone);

assert_eq!(date_add, date + TimeDelta::days(5));
assert_eq!(date_add, date + OldTimeDelta::days(5));
}

#[test]
Expand All @@ -597,8 +597,8 @@ mod tests {
let date = Local.from_utc_date(&naivedate);
let mut date_add = date;

date_add += TimeDelta::days(5);
assert_eq!(date_add, date + TimeDelta::days(5));
date_add += OldTimeDelta::days(5);
assert_eq!(date_add, date + OldTimeDelta::days(5));
}

#[test]
Expand All @@ -607,20 +607,20 @@ mod tests {
let date = Date::<Utc>::from_utc(naivedate, Utc);
let mut date_sub = date;

date_sub -= TimeDelta::days(5);
assert_eq!(date_sub, date - TimeDelta::days(5));
date_sub -= OldTimeDelta::days(5);
assert_eq!(date_sub, date - OldTimeDelta::days(5));

let timezone = FixedOffset::east(60 * 60);
let date = date.with_timezone(&timezone);
let date_sub = date_sub.with_timezone(&timezone);

assert_eq!(date_sub, date - TimeDelta::days(5));
assert_eq!(date_sub, date - OldTimeDelta::days(5));

let timezone = FixedOffset::west(2 * 60 * 60);
let date = date.with_timezone(&timezone);
let date_sub = date_sub.with_timezone(&timezone);

assert_eq!(date_sub, date - TimeDelta::days(5));
assert_eq!(date_sub, date - OldTimeDelta::days(5));
}

#[test]
Expand All @@ -631,7 +631,7 @@ mod tests {
let date = Local.from_utc_date(&naivedate);
let mut date_sub = date;

date_sub -= TimeDelta::days(5);
assert_eq!(date_sub, date - TimeDelta::days(5));
date_sub -= OldTimeDelta::days(5);
assert_eq!(date_sub, date - OldTimeDelta::days(5));
}
}
28 changes: 14 additions & 14 deletions src/datetime/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::naive::{Days, IsoWeek, NaiveDate, NaiveDateTime, NaiveTime};
#[cfg(feature = "clock")]
use crate::offset::Local;
use crate::offset::{FixedOffset, Offset, TimeZone, Utc};
use crate::{Date, Datelike, Months, TimeDelta, Timelike, Weekday};
use crate::{Date, Datelike, Months, OldTimeDelta, Timelike, Weekday};

/// documented at re-export site
#[cfg(feature = "serde")]
Expand Down Expand Up @@ -318,7 +318,7 @@ impl<Tz: TimeZone> DateTime<Tz> {
///
/// Returns `None` when it will result in overflow.
#[inline]
pub fn checked_add_signed(self, rhs: TimeDelta) -> Option<DateTime<Tz>> {
pub fn checked_add_signed(self, rhs: OldTimeDelta) -> Option<DateTime<Tz>> {
let datetime = self.datetime.checked_add_signed(rhs)?;
let tz = self.timezone();
Some(tz.from_utc_datetime(&datetime))
Expand All @@ -341,7 +341,7 @@ impl<Tz: TimeZone> DateTime<Tz> {
///
/// Returns `None` when it will result in overflow.
#[inline]
pub fn checked_sub_signed(self, rhs: TimeDelta) -> Option<DateTime<Tz>> {
pub fn checked_sub_signed(self, rhs: OldTimeDelta) -> Option<DateTime<Tz>> {
let datetime = self.datetime.checked_sub_signed(rhs)?;
let tz = self.timezone();
Some(tz.from_utc_datetime(&datetime))
Expand Down Expand Up @@ -383,7 +383,7 @@ impl<Tz: TimeZone> DateTime<Tz> {
/// Subtracts another `DateTime` from the current date and time.
/// This does not overflow or underflow at all.
#[inline]
pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: DateTime<Tz2>) -> TimeDelta {
pub fn signed_duration_since<Tz2: TimeZone>(self, rhs: DateTime<Tz2>) -> OldTimeDelta {
self.datetime.signed_duration_since(rhs.datetime)
}

Expand Down Expand Up @@ -966,18 +966,18 @@ impl<Tz: TimeZone> hash::Hash for DateTime<Tz> {
}
}

impl<Tz: TimeZone> Add<TimeDelta> for DateTime<Tz> {
impl<Tz: TimeZone> Add<OldTimeDelta> for DateTime<Tz> {
type Output = DateTime<Tz>;

#[inline]
fn add(self, rhs: TimeDelta) -> DateTime<Tz> {
fn add(self, rhs: OldTimeDelta) -> DateTime<Tz> {
self.checked_add_signed(rhs).expect("`DateTime + Duration` overflowed")
}
}

impl<Tz: TimeZone> AddAssign<TimeDelta> for DateTime<Tz> {
impl<Tz: TimeZone> AddAssign<OldTimeDelta> for DateTime<Tz> {
#[inline]
fn add_assign(&mut self, rhs: TimeDelta) {
fn add_assign(&mut self, rhs: OldTimeDelta) {
let datetime =
self.datetime.checked_add_signed(rhs).expect("`DateTime + Duration` overflowed");
let tz = self.timezone();
Expand All @@ -993,18 +993,18 @@ impl<Tz: TimeZone> Add<Months> for DateTime<Tz> {
}
}

impl<Tz: TimeZone> Sub<TimeDelta> for DateTime<Tz> {
impl<Tz: TimeZone> Sub<OldTimeDelta> for DateTime<Tz> {
type Output = DateTime<Tz>;

#[inline]
fn sub(self, rhs: TimeDelta) -> DateTime<Tz> {
fn sub(self, rhs: OldTimeDelta) -> DateTime<Tz> {
self.checked_sub_signed(rhs).expect("`DateTime - Duration` overflowed")
}
}

impl<Tz: TimeZone> SubAssign<TimeDelta> for DateTime<Tz> {
impl<Tz: TimeZone> SubAssign<OldTimeDelta> for DateTime<Tz> {
#[inline]
fn sub_assign(&mut self, rhs: TimeDelta) {
fn sub_assign(&mut self, rhs: OldTimeDelta) {
let datetime =
self.datetime.checked_sub_signed(rhs).expect("`DateTime - Duration` overflowed");
let tz = self.timezone();
Expand All @@ -1021,10 +1021,10 @@ impl<Tz: TimeZone> Sub<Months> for DateTime<Tz> {
}

impl<Tz: TimeZone> Sub<DateTime<Tz>> for DateTime<Tz> {
type Output = TimeDelta;
type Output = OldTimeDelta;

#[inline]
fn sub(self, rhs: DateTime<Tz>) -> TimeDelta {
fn sub(self, rhs: DateTime<Tz>) -> OldTimeDelta {
self.signed_duration_since(rhs)
}
}
Expand Down
36 changes: 18 additions & 18 deletions src/datetime/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::offset::Local;
use crate::offset::{FixedOffset, TimeZone, Utc};
#[cfg(feature = "clock")]
use crate::Datelike;
use crate::TimeDelta;
use crate::OldTimeDelta;

#[test]
fn test_datetime_offset() {
Expand Down Expand Up @@ -38,10 +38,10 @@ fn test_datetime_offset() {

let dt = Utc.ymd(2014, 5, 6).and_hms(7, 8, 9);
assert_eq!(dt, edt.ymd(2014, 5, 6).and_hms(3, 8, 9));
assert_eq!(dt + TimeDelta::seconds(3600 + 60 + 1), Utc.ymd(2014, 5, 6).and_hms(8, 9, 10));
assert_eq!(dt + OldTimeDelta::seconds(3600 + 60 + 1), Utc.ymd(2014, 5, 6).and_hms(8, 9, 10));
assert_eq!(
dt.signed_duration_since(edt.ymd(2014, 5, 6).and_hms(10, 11, 12)),
TimeDelta::seconds(-7 * 3600 - 3 * 60 - 3)
OldTimeDelta::seconds(-7 * 3600 - 3 * 60 - 3)
);

assert_eq!(*Utc.ymd(2014, 5, 6).and_hms(7, 8, 9).offset(), Utc);
Expand Down Expand Up @@ -418,15 +418,15 @@ fn test_years_elapsed() {
const WEEKS_PER_YEAR: f32 = 52.1775;

// This is always at least one year because 1 year = 52.1775 weeks.
let one_year_ago = Utc::today() - TimeDelta::weeks((WEEKS_PER_YEAR * 1.5).ceil() as i64);
let one_year_ago = Utc::today() - OldTimeDelta::weeks((WEEKS_PER_YEAR * 1.5).ceil() as i64);
// A bit more than 2 years.
let two_year_ago = Utc::today() - TimeDelta::weeks((WEEKS_PER_YEAR * 2.5).ceil() as i64);
let two_year_ago = Utc::today() - OldTimeDelta::weeks((WEEKS_PER_YEAR * 2.5).ceil() as i64);

assert_eq!(Utc::today().years_since(one_year_ago), Some(1));
assert_eq!(Utc::today().years_since(two_year_ago), Some(2));

// If the given DateTime is later than now, the function will always return 0.
let future = Utc::today() + TimeDelta::weeks(12);
let future = Utc::today() + OldTimeDelta::weeks(12);
assert_eq!(Utc::today().years_since(future), None);
}

Expand All @@ -436,20 +436,20 @@ fn test_datetime_add_assign() {
let datetime = DateTime::<Utc>::from_utc(naivedatetime, Utc);
let mut datetime_add = datetime;

datetime_add += TimeDelta::seconds(60);
assert_eq!(datetime_add, datetime + TimeDelta::seconds(60));
datetime_add += OldTimeDelta::seconds(60);
assert_eq!(datetime_add, datetime + OldTimeDelta::seconds(60));

let timezone = FixedOffset::east(60 * 60);
let datetime = datetime.with_timezone(&timezone);
let datetime_add = datetime_add.with_timezone(&timezone);

assert_eq!(datetime_add, datetime + TimeDelta::seconds(60));
assert_eq!(datetime_add, datetime + OldTimeDelta::seconds(60));

let timezone = FixedOffset::west(2 * 60 * 60);
let datetime = datetime.with_timezone(&timezone);
let datetime_add = datetime_add.with_timezone(&timezone);

assert_eq!(datetime_add, datetime + TimeDelta::seconds(60));
assert_eq!(datetime_add, datetime + OldTimeDelta::seconds(60));
}

#[test]
Expand All @@ -462,8 +462,8 @@ fn test_datetime_add_assign_local() {

// ensure we cross a DST transition
for i in 1..=365 {
datetime_add += TimeDelta::days(1);
assert_eq!(datetime_add, datetime + TimeDelta::days(i))
datetime_add += OldTimeDelta::days(1);
assert_eq!(datetime_add, datetime + OldTimeDelta::days(i))
}
}

Expand All @@ -473,20 +473,20 @@ fn test_datetime_sub_assign() {
let datetime = DateTime::<Utc>::from_utc(naivedatetime, Utc);
let mut datetime_sub = datetime;

datetime_sub -= TimeDelta::minutes(90);
assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
datetime_sub -= OldTimeDelta::minutes(90);
assert_eq!(datetime_sub, datetime - OldTimeDelta::minutes(90));

let timezone = FixedOffset::east(60 * 60);
let datetime = datetime.with_timezone(&timezone);
let datetime_sub = datetime_sub.with_timezone(&timezone);

assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
assert_eq!(datetime_sub, datetime - OldTimeDelta::minutes(90));

let timezone = FixedOffset::west(2 * 60 * 60);
let datetime = datetime.with_timezone(&timezone);
let datetime_sub = datetime_sub.with_timezone(&timezone);

assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
assert_eq!(datetime_sub, datetime - OldTimeDelta::minutes(90));
}

#[test]
Expand All @@ -499,7 +499,7 @@ fn test_datetime_sub_assign_local() {

// ensure we cross a DST transition
for i in 1..=365 {
datetime_sub -= TimeDelta::days(1);
assert_eq!(datetime_sub, datetime - TimeDelta::days(i))
datetime_sub -= OldTimeDelta::days(1);
assert_eq!(datetime_sub, datetime - OldTimeDelta::days(i))
}
}
Loading

0 comments on commit ae23b6b

Please sign in to comment.