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.

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

Make as_millis_unsigned & as_seconds_unsigned const #60

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Make as_millis_unsigned & as_seconds_unsigned const #60

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
23 changes: 13 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,11 +1067,8 @@ impl Duration {
/// Returns the number of non-negative whole milliseconds in the Duration
/// instance.
#[must_use]
pub fn as_millis_unsigned(&self) -> u64 {
#[allow(clippy::cast_sign_loss)]
{
max(self.0, 0) as u64
}
pub const fn as_millis_unsigned(&self) -> u64 {
as_unsigned(self.0)
}

/// Returns the number of whole seconds in the Duration instance.
Expand All @@ -1083,11 +1080,8 @@ impl Duration {
/// Returns the number of non-negative whole seconds in the Duration
/// instance.
#[must_use]
pub fn as_seconds_unsigned(&self) -> u64 {
#[allow(clippy::cast_sign_loss)]
{
max(0, self.0 / 1000) as u64
}
pub const fn as_seconds_unsigned(&self) -> u64 {
as_unsigned(self.0 / 1000)
}

/// Returns the number of whole minutes in the Duration instance.
Expand Down Expand Up @@ -1549,6 +1543,15 @@ impl Display for DurationParseError {
}
}

/// Work-around for `max` in `std` not being const
const fn as_unsigned(x: i64) -> u64 {
if x >= 0 {
x as u64
} else {
0
}
}

const REGEX: &str = r"^(?P<sign>-)?((?P<h>\d+)h)?((?P<m>\d+)m)?((?P<s>\d+)s)?((?P<ms>\d+)ms)?$";

#[cfg(test)]
Expand Down
Loading