Skip to content

Commit

Permalink
tidy: rename DigitalDurationFormat -> DigitalDuration
Browse files Browse the repository at this point in the history
  • Loading branch information
kartva committed Aug 20, 2024
1 parent c351054 commit 01a3642
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions components/experimental/src/duration/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ pub struct FormattedDuration<'l> {

/// Exists to allow creating lists of heterogeneous [`Writeable`]s to pass to [`ListFormatter`].
/// The (Unit, FixedDecimal) pair is used to crerate [`FormattedUnit`]s.
type HeterogenousToFormatter = Either<DigitalDurationFormatter, (Unit, FixedDecimal)>;
type HeterogenousToFormatter = Either<DigitalDuration, (Unit, FixedDecimal)>;

/// Describes a formatted duration.
#[derive(Default)]
struct DigitalDurationFormatter {
struct DigitalDuration {
hours: Option<FixedDecimal>,
add_hour_minute_separator: bool,
minutes: Option<FixedDecimal>,
add_minute_second_separator: bool,
seconds: Option<FixedDecimal>,
}

impl DigitalDurationFormatter {
impl DigitalDuration {
fn format<'l>(&'l self, fmt: &'l DurationFormatter) -> FormattedDigitalDuration<'l> {
FormattedDigitalDuration {
fmt,
Expand Down Expand Up @@ -135,7 +135,7 @@ impl<'a> FormattedDuration<'a> {
/// Formats numeric hours to [`DigitalDurationFormatter`]. Requires hours formatting style to be either Numeric or TwoDigit.
fn format_numeric_hours(
&self,
formatted_digital_duration: &mut DigitalDurationFormatter,
formatted_digital_duration: &mut DigitalDuration,
sign_displayed: &mut bool,
) {
// 1. Let hoursStyle be durationFormat.[[HoursStyle]].
Expand Down Expand Up @@ -174,7 +174,7 @@ impl<'a> FormattedDuration<'a> {
/// Formats numeric minutes to sink. Requires minutes formatting style to be either Numeric or TwoDigit.
fn format_numeric_minutes(
&self,
formatted_digital_duration: &mut DigitalDurationFormatter,
formatted_digital_duration: &mut DigitalDuration,
sign_displayed: &mut bool,
) {
// 1. Let result be a new empty List.
Expand Down Expand Up @@ -257,7 +257,7 @@ impl<'a> FormattedDuration<'a> {
fn format_numeric_seconds(
&self,
mut second_fd: FixedDecimal,
formatted_digital_duration: &mut DigitalDurationFormatter,
formatted_digital_duration: &mut DigitalDuration,
sign_displayed: &mut bool,
) {
// 1. Let secondsStyle be durationFormat.[[SecondsStyle]].
Expand Down Expand Up @@ -331,7 +331,7 @@ impl<'a> FormattedDuration<'a> {
&self,
first_numeric_unit: Unit,
sign_displayed: &mut bool,
) -> DigitalDurationFormatter {
) -> DigitalDuration {
// 1. Assert: firstNumericUnit is "hours", "minutes", or "seconds".
debug_assert!(matches!(
first_numeric_unit,
Expand Down Expand Up @@ -391,7 +391,7 @@ impl<'a> FormattedDuration<'a> {
}
}

let mut formatted_digital_duration = DigitalDurationFormatter::default();
let mut formatted_digital_duration = DigitalDuration::default();

// 16. If hoursFormatted is true, then
if hours_formatted {
Expand Down

0 comments on commit 01a3642

Please sign in to comment.