Skip to content

Commit

Permalink
Review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
nekevss authored and jedel1043 committed Feb 14, 2024
1 parent bf3f483 commit daaae7d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/components/calendar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,10 @@ impl<C: CalendarProtocol> CalendarSlot<C> {
CalendarSlot::Builtin(AnyCalendar::Iso(_)) => {
// 8. Let norm be NormalizeTimeDuration(duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]]).
// 9. Let balanceResult be BalanceTimeDuration(norm, "day").
let (balance_days, _) =
TimeDuration::from_normalized(duration.time().as_norm(), TemporalUnit::Day)?;
let (balance_days, _) = TimeDuration::from_normalized(
duration.time().to_normalized(),
TemporalUnit::Day,
)?;
// 10. Let result be ? AddISODate(date.[[ISOYear]], date.[[ISOMonth]], date.[[ISODay]], duration.[[Years]], duration.[[Months]], duration.[[Weeks]], duration.[[Days]] + balanceResult.[[Days]], overflow).
let result = date.iso().add_iso_date(
&DateDuration::new_unchecked(
Expand Down
2 changes: 1 addition & 1 deletion src/components/date.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ impl<C: CalendarProtocol> Date<C> {
// 3. Let overflow be ? ToTemporalOverflow(options).
// 4. Let days be ? BalanceTimeDuration(duration.[[Days]], duration.[[Hours]], duration.[[Minutes]], duration.[[Seconds]], duration.[[Milliseconds]], duration.[[Microseconds]], duration.[[Nanoseconds]], "day").[[Days]].
let (days, _) =
TimeDuration::from_normalized(duration.time().as_norm(), TemporalUnit::Day)?;
TimeDuration::from_normalized(duration.time().to_normalized(), TemporalUnit::Day)?;

// 5. Let result be ? AddISODate(plainDate.[[ISOYear]], plainDate.[[ISOMonth]], plainDate.[[ISODay]], 0, 0, 0, days, overflow).
let result = self
Expand Down
2 changes: 1 addition & 1 deletion src/components/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ impl Duration {
/// Calls `TimeDuration`'s balance method on the current `Duration`.
#[inline]
pub fn balance_time_duration(&self, unit: TemporalUnit) -> TemporalResult<(f64, TimeDuration)> {
TimeDuration::from_normalized(self.time().as_norm(), unit)
TimeDuration::from_normalized(self.time().to_normalized(), unit)
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/duration/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ impl TimeDuration {
}

/// Returns this `TimeDuration` as a `NormalizedTimeDuration`.
pub(crate) fn as_norm(&self) -> NormalizedTimeDuration {
NormalizedTimeDuration::from_time_duration(self)
pub(crate) fn to_normalized(self) -> NormalizedTimeDuration {
NormalizedTimeDuration::from_time_duration(&self)
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/components/instant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ impl Instant {

if smallest_unit == TemporalUnit::Nanosecond {
let (_, result) = TimeDuration::from_normalized(
TimeDuration::new_unchecked(0f64, 0f64, secs, millis, micros, nanos).as_norm(),
TimeDuration::new_unchecked(0f64, 0f64, secs, millis, micros, nanos)
.to_normalized(),
largest_unit,
)?;
return Ok(result);
Expand All @@ -89,7 +90,8 @@ impl Instant {
smallest_unit,
rounding_mode,
)?;
let (_, result) = TimeDuration::from_normalized(round_result.as_norm(), largest_unit)?;
let (_, result) =
TimeDuration::from_normalized(round_result.to_normalized(), largest_unit)?;
Ok(result)
}

Expand Down

0 comments on commit daaae7d

Please sign in to comment.