Skip to content

Commit 61b7ffb

Browse files
pitdickerpitdicker
committed
Deny leap second if secs != 59 in from_hms_nano_opt 
1 parent 202af6c commit 61b7ffb

File tree

2 files changed

+32
-25
lines changed

2 files changed

+32
-25
lines changed

‎src/naive/date.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,8 @@ impl NaiveDate {
867867

868868
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and millisecond.
869869
///
870-
/// The millisecond part can exceed 1,000
871-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
870+
/// The millisecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
871+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
872872
///
873873
/// # Panics
874874
///
@@ -882,8 +882,8 @@ impl NaiveDate {
882882

883883
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and millisecond.
884884
///
885-
/// The millisecond part can exceed 1,000
886-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
885+
/// The millisecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
886+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
887887
///
888888
/// # Errors
889889
///
@@ -917,8 +917,8 @@ impl NaiveDate {
917917

918918
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and microsecond.
919919
///
920-
/// The microsecond part can exceed 1,000,000
921-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
920+
/// The microsecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
921+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
922922
///
923923
/// # Panics
924924
///
@@ -946,8 +946,8 @@ impl NaiveDate {
946946

947947
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and microsecond.
948948
///
949-
/// The microsecond part can exceed 1,000,000
950-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
949+
/// The microsecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
950+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
951951
///
952952
/// # Errors
953953
///
@@ -981,8 +981,8 @@ impl NaiveDate {
981981

982982
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and nanosecond.
983983
///
984-
/// The nanosecond part can exceed 1,000,000,000
985-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
984+
/// The nanosecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
985+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
986986
///
987987
/// # Panics
988988
///
@@ -996,8 +996,8 @@ impl NaiveDate {
996996

997997
/// Makes a new `NaiveDateTime` from the current date, hour, minute, second and nanosecond.
998998
///
999-
/// The nanosecond part can exceed 1,000,000,000
1000-
/// in order to represent the [leap second](./struct.NaiveTime.html#leap-second-handling).
999+
/// The nanosecond part is allowed to exceed 1,000,000,000 in order to represent a [leap second](
1000+
/// ./struct.NaiveTime.html#leap-second-handling), but only when `sec == 59`.
10011001
///
10021002
/// # Errors
10031003
///

‎src/naive/time/mod.rs

+20-13
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ mod tests;
177177
/// For such cases the human-readable representation is ambiguous and would be read back to the next
178178
/// non-leap second.
179179
///
180+
/// A `NaiveTime` with a leap second that is not on a minute boundary can only be created from a
181+
/// [`DateTime`](crate::DateTime) with fractional minutes as offset, or using
182+
/// [`Timelike::with_nanosecond()`].
183+
///
180184
/// ```
181185
/// use chrono::{FixedOffset, NaiveDate, TimeZone};
182186
///
@@ -239,8 +243,8 @@ impl NaiveTime {
239243

240244
/// Makes a new `NaiveTime` from hour, minute and second.
241245
///
242-
/// No [leap second](#leap-second-handling) is allowed here;
243-
/// use `NaiveTime::from_hms_*_opt` methods with a subsecond parameter instead.
246+
/// The millisecond part is allowed to exceed 1,000,000,000 in order to represent a
247+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
244248
///
245249
/// # Errors
246250
///
@@ -282,8 +286,8 @@ impl NaiveTime {
282286

283287
/// Makes a new `NaiveTime` from hour, minute, second and millisecond.
284288
///
285-
/// The millisecond part can exceed 1,000
286-
/// in order to represent the [leap second](#leap-second-handling).
289+
/// The millisecond part is allowed to exceed 1,000,000,000 in order to represent a
290+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
287291
///
288292
/// # Errors
289293
///
@@ -318,8 +322,8 @@ impl NaiveTime {
318322

319323
/// Makes a new `NaiveTime` from hour, minute, second and microsecond.
320324
///
321-
/// The microsecond part can exceed 1,000,000
322-
/// in order to represent the [leap second](#leap-second-handling).
325+
/// The microsecond part is allowed to exceed 1,000,000,000 in order to represent a
326+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
323327
///
324328
/// # Panics
325329
///
@@ -333,8 +337,8 @@ impl NaiveTime {
333337

334338
/// Makes a new `NaiveTime` from hour, minute, second and microsecond.
335339
///
336-
/// The microsecond part can exceed 1,000,000
337-
/// in order to represent the [leap second](#leap-second-handling).
340+
/// The microsecond part is allowed to exceed 1,000,000,000 in order to represent a
341+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
338342
///
339343
/// # Errors
340344
///
@@ -369,8 +373,8 @@ impl NaiveTime {
369373

370374
/// Makes a new `NaiveTime` from hour, minute, second and nanosecond.
371375
///
372-
/// The nanosecond part can exceed 1,000,000,000
373-
/// in order to represent the [leap second](#leap-second-handling).
376+
/// The nanosecond part is allowed to exceed 1,000,000,000 in order to represent a
377+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
374378
///
375379
/// # Panics
376380
///
@@ -384,8 +388,8 @@ impl NaiveTime {
384388

385389
/// Makes a new `NaiveTime` from hour, minute, second and nanosecond.
386390
///
387-
/// The nanosecond part can exceed 1,000,000,000
388-
/// in order to represent the [leap second](#leap-second-handling).
391+
/// The nanosecond part is allowed to exceed 1,000,000,000 in order to represent a
392+
/// [leap second](#leap-second-handling), but only when `sec == 59`.
389393
///
390394
/// # Errors
391395
///
@@ -409,7 +413,10 @@ impl NaiveTime {
409413
#[inline]
410414
#[must_use]
411415
pub const fn from_hms_nano_opt(hour: u32, min: u32, sec: u32, nano: u32) -> Option<NaiveTime> {
412-
if hour >= 24 || min >= 60 || sec >= 60 || nano >= 2_000_000_000 {
416+
if (hour >= 24 || min >= 60 || sec >= 60)
417+
|| (nano >= 1_000_000_000 && sec != 59)
418+
|| nano >= 2_000_000_000
419+
{
413420
return None;
414421
}
415422
let secs = hour * 3600 + min * 60 + sec;

0 commit comments

Comments
 (0)