Bump MSRV to 1.53

Author: jhpratt

.github/workflows/build.yaml

@@ -32,7 +32,7 @@ jobs:
     if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) || github.event_name == 'push' }}
     strategy:
       matrix:
-        rust: ["1.51", stable]
+        rust: ["1.53", stable]
         target:
           - name: NetBSD
             triple: x86_64-unknown-netbsd
@@ -152,7 +152,7 @@ jobs:
     if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) || github.event_name == 'push' }}
     strategy:
       matrix:
-        rust: ["1.51", stable]
+        rust: ["1.53", stable]
         os:
           - { name: Ubuntu, value: ubuntu-20.04, has_local_offset: true }
           - { name: Windows, value: windows-latest, has_local_offset: true }

.github/workflows/powerset.yaml

@@ -100,7 +100,7 @@ jobs:
           args: |
             check
             --no-dev-deps
-            --version-range 1.51..
+            --version-range 1.53..
             --clean-per-version
             --feature-powerset
             --optional-deps
@@ -116,7 +116,7 @@ jobs:
           args: |
             check
             --no-dev-deps
-            --version-range 1.51..
+            --version-range 1.53..
             --clean-per-version
             --feature-powerset
             --optional-deps

README.md

@@ -1,6 +1,6 @@
 # time
 
-[![minimum rustc: 1.51](https://img.shields.io/badge/minimum%20rustc-1.51-yellowgreen?logo=rust&style=flat-square)](https://www.whatrustisit.com)
+[![minimum rustc: 1.53](https://img.shields.io/badge/minimum%20rustc-1.53-yellowgreen?logo=rust&style=flat-square)](https://www.whatrustisit.com)
 [![version](https://img.shields.io/crates/v/time?color=blue&logo=rust&style=flat-square)](https://crates.io/crates/time)
 [![build status](https://img.shields.io/github/workflow/status/time-rs/time/Build/main?style=flat-square)](https://github.com/time-rs/time/actions)
 [![codecov](https://codecov.io/gh/time-rs/time/branch/main/graph/badge.svg?token=yt4XSmQNKQ)](https://codecov.io/gh/time-rs/time)

src/duration.rs

@@ -602,8 +602,7 @@ impl Duration {
     /// assert_eq!(10.seconds().checked_div(-2), Some((-5).seconds()));
     /// assert_eq!(1.seconds().checked_div(0), None);
     /// ```
-    #[allow(clippy::missing_const_for_fn)] // requires Rust 1.52
-    pub fn checked_div(self, rhs: i32) -> Option<Self> {
+    pub const fn checked_div(self, rhs: i32) -> Option<Self> {
         let seconds = const_try_opt!(self.seconds.checked_div(rhs as i64));
         let carry = self.seconds - seconds * (rhs as i64);
         let extra_nanos = const_try_opt!((carry * 1_000_000_000).checked_div(rhs as i64));

src/format_description/modifier.rs

@@ -409,56 +409,37 @@ impl Modifiers {
                 break;
             }
 
-            #[allow(clippy::unnested_or_patterns)]
             match (component_name, modifier) {
-                (b"day", b"padding:space")
-                | (b"hour", b"padding:space")
-                | (b"minute", b"padding:space")
-                | (b"month", b"padding:space")
-                | (b"offset_hour", b"padding:space")
-                | (b"offset_minute", b"padding:space")
-                | (b"offset_second", b"padding:space")
-                | (b"ordinal", b"padding:space")
-                | (b"second", b"padding:space")
-                | (b"week_number", b"padding:space")
-                | (b"year", b"padding:space") => modifiers.padding = Some(Padding::Space),
-                (b"day", b"padding:zero")
-                | (b"hour", b"padding:zero")
-                | (b"minute", b"padding:zero")
-                | (b"month", b"padding:zero")
-                | (b"offset_hour", b"padding:zero")
-                | (b"offset_minute", b"padding:zero")
-                | (b"offset_second", b"padding:zero")
-                | (b"ordinal", b"padding:zero")
-                | (b"second", b"padding:zero")
-                | (b"week_number", b"padding:zero")
-                | (b"year", b"padding:zero") => modifiers.padding = Some(Padding::Zero),
-                (b"day", b"padding:none")
-                | (b"hour", b"padding:none")
-                | (b"minute", b"padding:none")
-                | (b"month", b"padding:none")
-                | (b"offset_hour", b"padding:none")
-                | (b"offset_minute", b"padding:none")
-                | (b"offset_second", b"padding:none")
-                | (b"ordinal", b"padding:none")
-                | (b"second", b"padding:none")
-                | (b"week_number", b"padding:none")
-                | (b"year", b"padding:none") => modifiers.padding = Some(Padding::None),
+                (
+                    b"day" | b"hour" | b"minute" | b"month" | b"offset_hour" | b"offset_minute"
+                    | b"offset_second" | b"ordinal" | b"second" | b"week_number" | b"year",
+                    b"padding:space",
+                ) => modifiers.padding = Some(Padding::Space),
+                (
+                    b"day" | b"hour" | b"minute" | b"month" | b"offset_hour" | b"offset_minute"
+                    | b"offset_second" | b"ordinal" | b"second" | b"week_number" | b"year",
+                    b"padding:zero",
+                ) => modifiers.padding = Some(Padding::Zero),
+                (
+                    b"day" | b"hour" | b"minute" | b"month" | b"offset_hour" | b"offset_minute"
+                    | b"offset_second" | b"ordinal" | b"second" | b"week_number" | b"year",
+                    b"padding:none",
+                ) => modifiers.padding = Some(Padding::None),
                 (b"hour", b"repr:24") => modifiers.hour_is_12_hour_clock = Some(false),
                 (b"hour", b"repr:12") => modifiers.hour_is_12_hour_clock = Some(true),
-                (b"month", b"case_sensitive:true")
-                | (b"period", b"case_sensitive:true")
-                | (b"weekday", b"case_sensitive:true") => modifiers.case_sensitive = Some(true),
-                (b"month", b"case_sensitive:false")
-                | (b"period", b"case_sensitive:false")
-                | (b"weekday", b"case_sensitive:false") => modifiers.case_sensitive = Some(false),
+                (b"month" | b"period" | b"weekday", b"case_sensitive:true") => {
+                    modifiers.case_sensitive = Some(true)
+                }
+                (b"month" | b"period" | b"weekday", b"case_sensitive:false") => {
+                    modifiers.case_sensitive = Some(false)
+                }
                 (b"month", b"repr:numerical") => modifiers.month_repr = Some(MonthRepr::Numerical),
                 (b"month", b"repr:long") => modifiers.month_repr = Some(MonthRepr::Long),
                 (b"month", b"repr:short") => modifiers.month_repr = Some(MonthRepr::Short),
-                (b"offset_hour", b"sign:automatic") | (b"year", b"sign:automatic") => {
+                (b"offset_hour" | b"year", b"sign:automatic") => {
                     modifiers.sign_is_mandatory = Some(false);
                 }
-                (b"offset_hour", b"sign:mandatory") | (b"year", b"sign:mandatory") => {
+                (b"offset_hour" | b"year", b"sign:mandatory") => {
                     modifiers.sign_is_mandatory = Some(true);
                 }
                 (b"period", b"case:upper") => modifiers.period_is_uppercase = Some(true),

src/formatting/mod.rs

@@ -342,10 +342,9 @@ fn fmt_hour(
         is_12_hour_clock,
     }: modifier::Hour,
 ) -> Result<usize, io::Error> {
-    #[allow(clippy::unnested_or_patterns)]
     let value = match (time.hour(), is_12_hour_clock) {
         (hour, false) => hour,
-        (0, true) | (12, true) => 12,
+        (0 | 12, true) => 12,
         (hour, true) if hour < 12 => hour,
         (hour, true) => hour - 12,
     };

src/lib.rs

@@ -90,7 +90,7 @@
     trivial_numeric_casts,
     unreachable_pub,
     unsafe_code,
-    // unsafe_op_in_unsafe_fn, // requires Rust 1.51
+    unsafe_op_in_unsafe_fn,
     unused_extern_crates
 )]
 #![warn(
@@ -102,6 +102,7 @@
     clippy::print_stdout,
     clippy::todo,
     clippy::unimplemented,
+    clippy::unnested_or_patterns,
     clippy::unwrap_in_result,
     clippy::unwrap_used,
     clippy::use_debug,
@@ -178,20 +179,6 @@ macro_rules! div_floor {
     }};
 }
 
-/// Euclidean remainder. Useful for `const` contexts.
-macro_rules! rem_euclid {
-    ($a:expr, $b:expr) => {{
-        let _a = $a;
-        let _b = $b;
-        let r = _a % _b;
-        if r < 0 {
-            if _b < 0 { r - _b } else { r + _b }
-        } else {
-            r
-        }
-    }};
-}
-
 /// Cascade an out-of-bounds value.
 macro_rules! cascade {
     (@ordinal ordinal) => {};

src/offset_date_time.rs

@@ -149,7 +149,7 @@ impl OffsetDateTime {
             UNIX_EPOCH_JULIAN_DAY + div_floor!(timestamp, 86_400) as i32,
         );
 
-        let seconds_within_day = rem_euclid!(timestamp, 86_400);
+        let seconds_within_day = timestamp.rem_euclid(86_400);
         let time = Time::__from_hms_nanos_unchecked(
             (seconds_within_day / 3_600) as _,
             ((seconds_within_day % 3_600) / 60) as _,
@@ -185,7 +185,7 @@ impl OffsetDateTime {
                 datetime.utc_datetime.hour(),
                 datetime.utc_datetime.minute(),
                 datetime.utc_datetime.second(),
-                rem_euclid!(timestamp, 1_000_000_000) as u32,
+                timestamp.rem_euclid(1_000_000_000) as u32,
             ))
             .assume_utc())
     }
@@ -280,7 +280,7 @@ impl OffsetDateTime {
         cascade!(minute in 0..60 => hour);
 
         Time::__from_hms_nanos_unchecked(
-            rem_euclid!(hour, 24) as _,
+            hour.rem_euclid(24) as _,
             minute as _,
             second as _,
             self.utc_datetime.nanosecond(),
@@ -591,7 +591,7 @@ impl OffsetDateTime {
 
         cascade!(second in 0..60 => minute);
         cascade!(minute in 0..60 => hour);
-        rem_euclid!(hour, 24) as _
+        hour.rem_euclid(24) as _
     }
 
     /// Get the minute within the hour in the stored offset.
@@ -613,7 +613,7 @@ impl OffsetDateTime {
         let mut minute = self.utc_datetime.minute() as i8 + self.offset.minutes_past_hour();
 
         cascade!(second in 0..60 => minute);
-        rem_euclid!(minute, 60) as _
+        minute.rem_euclid(60) as _
     }
 
     /// Get the second within the minute in the stored offset.
@@ -632,7 +632,7 @@ impl OffsetDateTime {
     /// ```
     pub const fn second(self) -> u8 {
         let second = self.utc_datetime.second() as i8 + self.offset.seconds_past_minute();
-        rem_euclid!(second, 60) as _
+        second.rem_euclid(60) as _
     }
 
     // Because a `UtcOffset` is limited in resolution to one second, any subsecond value will not

src/parsing/combinator/mod.rs

@@ -9,8 +9,7 @@ use crate::parsing::ParsedItem;
 /// Parse a "+" or "-" sign. Returns the ASCII byte representing the sign, if present.
 pub(crate) const fn sign(input: &[u8]) -> Option<ParsedItem<'_, u8>> {
     match input {
-        [b'-', remaining @ ..] => Some(ParsedItem(remaining, b'-')),
-        [b'+', remaining @ ..] => Some(ParsedItem(remaining, b'+')),
+        [sign @ (b'-' | b'+'), remaining @ ..] => Some(ParsedItem(remaining, *sign)),
         _ => None,
     }
 }

src/parsing/combinator/rfc/rfc2234.rs

@@ -7,7 +7,7 @@ use crate::parsing::ParsedItem;
 /// Consume exactly one space or tab.
 pub(crate) const fn wsp(input: &[u8]) -> Option<ParsedItem<'_, ()>> {
     match input {
-        [b' ', rest @ ..] | [b'\t', rest @ ..] => Some(ParsedItem(rest, ())),
+        [b' ' | b'\t', rest @ ..] => Some(ParsedItem(rest, ())),
         _ => None,
     }
 }