Skip to content

Cleanup const fn unwrap workaround #4

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.

Sign up for GitHub

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

Merged
extrawurst merged 1 commit into from
Dec 14, 2024
Merged

Cleanup const fn unwrap workaround #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,15 @@ fn spawn_logline(commands: &mut Commands, parent: Entity, event: &LogEvent) -> E
TextSpan::new(
event
.timestamp
.format(&iso8601::Iso8601::<{ iso8601_with_two_digit_secs() }> {})
.format(&iso8601::Iso8601::<
{
iso8601::Config::DEFAULT
.set_time_precision(iso8601::TimePrecision::Second {
decimal_digits: Some(NonZero::new(2).unwrap()),
})
.encode()
},
> {})
.unwrap_or("timestamp error".to_string()),
),
TextFont::from_font_size(LOG_LINE_FONT_SIZE),
Expand Down Expand Up @@ -586,18 +594,3 @@ fn on_level_filter_chip(
}
}
}

/// ISO 8601 Config with two decimal digits for seconds.
const fn iso8601_with_two_digit_secs() -> u128 {
// This is a hack to get around .unwrap() not being stable as a const fn
const TWO: NonZero<u8> = match NonZero::new(2) {
Some(two) => two,
None => unreachable!(),
};

iso8601::Config::DEFAULT
.set_time_precision(iso8601::TimePrecision::Second {
decimal_digits: Some(TWO),
})
.encode()
}
Loading