Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove UnitGroup addition #171

Merged
merged 3 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/date.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
iso::{IsoDate, IsoDateTime, IsoTime},
options::{
ArithmeticOverflow, DifferenceOperation, DifferenceSettings, DisplayCalendar,
ResolvedRoundingOptions, TemporalUnit, UnitGroup,
ResolvedRoundingOptions, TemporalUnit,
},
parsers::{parse_date_time, IxdtfStringBuilder},
primitive::FiniteF64,
Expand Down Expand Up @@ -263,7 +263,6 @@ impl PlainDate {
let resolved = ResolvedRoundingOptions::from_diff_settings(
settings,
op,
UnitGroup::Date,
TemporalUnit::Day,
TemporalUnit::Day,
)?;
Expand Down
3 changes: 1 addition & 2 deletions src/components/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
iso::{IsoDate, IsoDateTime, IsoTime},
options::{
ArithmeticOverflow, DifferenceOperation, DifferenceSettings, DisplayCalendar,
ResolvedRoundingOptions, RoundingOptions, TemporalUnit, ToStringRoundingOptions, UnitGroup,
ResolvedRoundingOptions, RoundingOptions, TemporalUnit, ToStringRoundingOptions,
},
parsers::{parse_date_time, IxdtfStringBuilder},
temporal_assert, TemporalError, TemporalResult, TemporalUnwrap, TimeZone,
Expand Down Expand Up @@ -134,7 +134,6 @@ impl PlainDateTime {
let options = ResolvedRoundingOptions::from_diff_settings(
settings,
op,
UnitGroup::DateTime,
TemporalUnit::Day,
TemporalUnit::Nanosecond,
)?;
Expand Down
3 changes: 1 addition & 2 deletions src/components/instant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
iso::{IsoDate, IsoDateTime, IsoTime},
options::{
ArithmeticOverflow, DifferenceOperation, DifferenceSettings, DisplayOffset,
ResolvedRoundingOptions, RoundingOptions, TemporalUnit, ToStringRoundingOptions, UnitGroup,
ResolvedRoundingOptions, RoundingOptions, TemporalUnit, ToStringRoundingOptions,
},
parsers::{parse_instant, IxdtfStringBuilder},
primitive::FiniteF64,
Expand Down Expand Up @@ -123,7 +123,6 @@ impl Instant {
let resolved_options = ResolvedRoundingOptions::from_diff_settings(
options,
op,
UnitGroup::Time,
TemporalUnit::Second,
TemporalUnit::Nanosecond,
)?;
Expand Down
3 changes: 1 addition & 2 deletions src/components/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
iso::IsoTime,
options::{
ArithmeticOverflow, DifferenceOperation, DifferenceSettings, ResolvedRoundingOptions,
RoundingIncrement, TemporalRoundingMode, TemporalUnit, ToStringRoundingOptions, UnitGroup,
RoundingIncrement, TemporalRoundingMode, TemporalUnit, ToStringRoundingOptions,
},
parsers::{parse_time, IxdtfStringBuilder},
primitive::FiniteF64,
Expand Down Expand Up @@ -127,7 +127,6 @@ impl PlainTime {
let resolved = ResolvedRoundingOptions::from_diff_settings(
settings,
op,
UnitGroup::Time,
TemporalUnit::Hour,
TemporalUnit::Nanosecond,
)?;
Expand Down
3 changes: 1 addition & 2 deletions src/components/zoneddatetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::{
ArithmeticOverflow, DifferenceOperation, DifferenceSettings, Disambiguation,
DisplayCalendar, DisplayOffset, DisplayTimeZone, OffsetDisambiguation,
ResolvedRoundingOptions, RoundingIncrement, TemporalRoundingMode, TemporalUnit,
ToStringRoundingOptions, UnitGroup,
ToStringRoundingOptions,
},
parsers::{self, IxdtfStringBuilder},
partial::{PartialDate, PartialTime},
Expand Down Expand Up @@ -271,7 +271,6 @@ impl ZonedDateTime {
let resolved_options = ResolvedRoundingOptions::from_diff_settings(
options,
op,
UnitGroup::DateTime,
TemporalUnit::Hour,
TemporalUnit::Nanosecond,
)?;
Expand Down
28 changes: 3 additions & 25 deletions src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,10 @@ impl ResolvedRoundingOptions {
pub(crate) fn from_diff_settings(
options: DifferenceSettings,
operation: DifferenceOperation,
unit_group: UnitGroup,
fallback_largest: TemporalUnit,
fallback_smallest: TemporalUnit,
) -> TemporalResult<Self> {
// 4. Let resolvedOptions be ? SnapshotOwnProperties(? GetOptionsObject(options), null).
let largest_unit = options
.largest_unit
.map(|unit| unit.assert_unit_group(unit_group))
.transpose()?;
// 5. Let settings be ? GetDifferenceSettings(operation, resolvedOptions, DATE, « », "day", "day").
let increment = options.increment.unwrap_or_default();
let rounding_mode = match operation {
Expand All @@ -199,7 +194,9 @@ impl ResolvedRoundingOptions {
};
let smallest_unit = options.smallest_unit.unwrap_or(fallback_smallest);
// Use the defaultlargestunit which is max smallestlargestdefault and smallestunit
let largest_unit = largest_unit.unwrap_or(smallest_unit.max(fallback_largest));
let largest_unit = options
.largest_unit
.unwrap_or(smallest_unit.max(fallback_largest));

// 11. If LargerOfTwoTemporalUnits(largestUnit, smallestUnit) is not largestUnit, throw a RangeError exception.
// 12. Let maximum be MaximumTemporalDurationRoundingIncrement(smallestUnit).
Expand Down Expand Up @@ -344,12 +341,6 @@ impl ResolvedRoundingOptions {

// ==== Options enums and methods ====

pub enum UnitGroup {
Date,
Time,
DateTime,
}

/// The relevant unit that should be used for the operation that
/// this option is provided as a value.
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
Expand Down Expand Up @@ -442,19 +433,6 @@ impl TemporalUnit {
Hour | Minute | Second | Millisecond | Microsecond | Nanosecond
)
}

#[inline]
pub fn assert_unit_group(self, group: UnitGroup) -> TemporalResult<Self> {
match group {
UnitGroup::Date if !self.is_calendar_unit() || self != TemporalUnit::Day => {
Err(TemporalError::range().with_message("Unit must be a date unit."))
}
UnitGroup::Time if !self.is_time_unit() => {
Err(TemporalError::range().with_message("Unit must be a time unit."))
}
_ => Ok(self),
}
}
}

impl From<usize> for TemporalUnit {
Expand Down
Loading