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

Jump to bottom

Use µs not us #42

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use µs not us #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe7862
Add parsing of 'µ' as prefix for micro.
RobertGauld Sep 25, 2023
388146a
Change us in display to µs
RobertGauld Sep 25, 2023
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
13 changes: 7 additions & 6 deletions src/duration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl fmt::Display for Error {
write!(
f,
"unknown time unit {:?}, \
supported units: ns, us, ms, sec, min, hours, days, \
supported units: ns, us/µs, ms, sec, min, hours, days, \
weeks, months, years (and few variations)",
unit
)
Expand Down Expand Up @@ -125,7 +125,7 @@ impl<'a> Parser<'a> {
{
let (mut sec, nsec) = match &self.src[start..end] {
"nanos" | "nsec" | "ns" => (0u64, n),
"usec" | "us" => (0u64, n.mul(1000)?),
"usec" | "us" | "µs" => (0u64, n.mul(1000)?),
"millis" | "msec" | "ms" => (0u64, n.mul(1_000_000)?),
"seconds" | "second" | "secs" | "sec" | "s" => (n, 0),
"minutes" | "minute" | "min" | "mins" | "m"
Expand Down Expand Up @@ -165,7 +165,7 @@ impl<'a> Parser<'a> {
.ok_or(Error::NumberOverflow)?;
}
c if c.is_whitespace() => {}
'a'..='z' | 'A'..='Z' => {
'a'..='z' | 'A'..='Z' | 'µ' => {
break;
}
_ => {
Expand Down Expand Up @@ -208,7 +208,7 @@ impl<'a> Parser<'a> {
/// span is an integer number and a suffix. Supported suffixes:
///
/// * `nsec`, `ns` -- nanoseconds
/// * `usec`, `us` -- microseconds
/// * `usec`, `us`, `µs` -- microseconds
/// * `msec`, `ms` -- milliseconds
/// * `seconds`, `second`, `sec`, `s`
/// * `minutes`, `minute`, `min`, `m`
Expand Down Expand Up @@ -324,7 +324,7 @@ impl fmt::Display for FormattedDuration {
item(f, started, "m", minutes as u32)?;
item(f, started, "s", seconds as u32)?;
item(f, started, "ms", millis)?;
item(f, started, "us", micros)?;
item(f, started, "µs", micros)?;
item(f, started, "ns", nanosec)?;
Ok(())
}
Expand All @@ -347,6 +347,7 @@ mod test {
assert_eq!(parse_duration("33ns"), Ok(Duration::new(0, 33)));
assert_eq!(parse_duration("3usec"), Ok(Duration::new(0, 3000)));
assert_eq!(parse_duration("78us"), Ok(Duration::new(0, 78000)));
assert_eq!(parse_duration("163µs"), Ok(Duration::new(0, 163000)));
assert_eq!(parse_duration("31msec"), Ok(Duration::new(0, 31_000_000)));
assert_eq!(parse_duration("31millis"), Ok(Duration::new(0, 31_000_000)));
assert_eq!(parse_duration("6ms"), Ok(Duration::new(0, 6_000_000)));
Expand Down Expand Up @@ -450,7 +451,7 @@ mod test {
"time unit needed, for example 1sec or 1ms");
assert_eq!(parse_duration("10nights").unwrap_err().to_string(),
"unknown time unit \"nights\", supported units: \
ns, us, ms, sec, min, hours, days, weeks, months, \
ns, us/µs, ms, sec, min, hours, days, weeks, months, \
years (and few variations)");
}
}