diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
| commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
| tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/time/src/parsing/iso8601.rs | |
| parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
| download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip | |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/time/src/parsing/iso8601.rs')
| -rw-r--r-- | vendor/time/src/parsing/iso8601.rs | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/vendor/time/src/parsing/iso8601.rs b/vendor/time/src/parsing/iso8601.rs index 21c89bab3..1afee4e31 100644 --- a/vendor/time/src/parsing/iso8601.rs +++ b/vendor/time/src/parsing/iso8601.rs @@ -1,5 +1,6 @@ //! Parse parts of an ISO 8601-formatted value. +use crate::convert::*; use crate::error; use crate::error::ParseFromDescription::{InvalidComponent, InvalidLiteral}; use crate::format_description::well_known::iso8601::EncodedConfig; @@ -124,12 +125,16 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> { *parsed = parsed .with_hour_24(hour) .ok_or(InvalidComponent("hour"))? - .with_minute((fractional_part * 60.0) as _) + .with_minute((fractional_part * Second.per(Minute) as f64) as _) .ok_or(InvalidComponent("minute"))? - .with_second((fractional_part * 3600.0 % 60.) as _) + .with_second( + (fractional_part * Second.per(Hour) as f64 % Minute.per(Hour) as f64) + as _, + ) .ok_or(InvalidComponent("second"))? .with_subsecond( - (fractional_part * 3_600. * 1_000_000_000. % 1_000_000_000.) as _, + (fractional_part * Nanosecond.per(Hour) as f64 + % Nanosecond.per(Second) as f64) as _, ) .ok_or(InvalidComponent("subsecond"))?; return Ok(input); @@ -157,10 +162,11 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> { *parsed = parsed .with_minute(minute) .ok_or(InvalidComponent("minute"))? - .with_second((fractional_part * 60.) as _) + .with_second((fractional_part * Second.per(Minute) as f64) as _) .ok_or(InvalidComponent("second"))? .with_subsecond( - (fractional_part * 60. * 1_000_000_000. % 1_000_000_000.) as _, + (fractional_part * Nanosecond.per(Minute) as f64 + % Nanosecond.per(Second) as f64) as _, ) .ok_or(InvalidComponent("subsecond"))?; return Ok(input); @@ -200,9 +206,11 @@ impl<const CONFIG: EncodedConfig> Iso8601<CONFIG> { let (input, second, subsecond) = match float(input) { Some(ParsedItem(input, (second, None))) => (input, second, 0), - Some(ParsedItem(input, (second, Some(fractional_part)))) => { - (input, second, round(fractional_part * 1_000_000_000.) as _) - } + Some(ParsedItem(input, (second, Some(fractional_part)))) => ( + input, + second, + round(fractional_part * Nanosecond.per(Second) as f64) as _, + ), None if extended_kind.is_extended() => { return Err(error::Parse::ParseFromDescription(InvalidComponent( "second", |