Use cast_signed/cast_unsigned from stdlib

Author: jhpratt

Cargo.lock

@@ -21,7 +21,7 @@ deranged = { version = "0.5.2", features = ["powerfmt"] }
 itoa = "1.0.1"
 js-sys = "0.3.58"
 libc = "0.2.98"
-num-conv = "0.1.0"
+num-conv = "0.2.0"
 num_threads = "0.1.2"
 powerfmt = { version = "0.2.0", default-features = false }
 quickcheck = { version = "1.0.3", default-features = false }

Cargo.toml

@@ -1482,9 +1482,19 @@ impl SubAssign<Duration> for StdDuration {
     }
 }
 
-/// Implement `Mul` (reflexively) and `Div` for `Duration` for various types.
+/// Given a value and whether it is signed, cast it to the signed version.
+macro_rules! cast_signed {
+    (@signed $val:ident) => {
+        $val
+    };
+    (@unsigned $val:ident) => {
+        $val.cast_signed()
+    };
+}
+
+/// Implement `Mul` (reflexively) and `Div` for `Duration` for various signed types.
 macro_rules! duration_mul_div_int {
-    ($($type:ty),+) => {$(
+    ($(@$signedness:ident $type:ty),+ $(,)?) => {$(
         impl Mul<$type> for Duration {
             type Output = Self;
 
@@ -1493,7 +1503,7 @@ macro_rules! duration_mul_div_int {
             fn mul(self, rhs: $type) -> Self::Output {
                 Self::nanoseconds_i128(
                     self.whole_nanoseconds()
-                        .checked_mul(rhs.cast_signed().extend::<i128>())
+                        .checked_mul(cast_signed!(@$signedness rhs).extend::<i128>())
                         .expect("overflow when multiplying duration")
                 )
             }
@@ -1516,13 +1526,21 @@ macro_rules! duration_mul_div_int {
             #[track_caller]
             fn div(self, rhs: $type) -> Self::Output {
                 Self::nanoseconds_i128(
-                    self.whole_nanoseconds() / rhs.cast_signed().extend::<i128>()
+                    self.whole_nanoseconds() / cast_signed!(@$signedness rhs).extend::<i128>()
                 )
             }
         }
     )+};
 }
-duration_mul_div_int![i8, i16, i32, u8, u16, u32];
+
+duration_mul_div_int! {
+    @signed i8,
+    @signed i16,
+    @signed i32,
+    @unsigned u8,
+    @unsigned u16,
+    @unsigned u32,
+}
 
 impl Mul<f32> for Duration {
     type Output = Self;

time/src/duration.rs

@@ -1,8 +1,5 @@
 use std::time::SystemTime;
 
-#[allow(unused_imports, reason = "MSRV of 1.87")]
-use num_conv::prelude::*;
-
 use crate::Duration;
 
 /// Sealed trait to prevent downstream implementations.

time/src/ext/systemtime.rs

@@ -2,9 +2,6 @@
 
 use std::io;
 
-#[allow(unused_imports, reason = "MSRV of 1.87")]
-use num_conv::prelude::*;
-
 use crate::convert::*;
 use crate::format_description::well_known::Iso8601;
 use crate::format_description::well_known::iso8601::{

time/src/formatting/iso8601.rs

@@ -4,9 +4,6 @@
 
 use core::num::NonZero;
 
-#[allow(unused_imports, reason = "MSRV of 1.87")]
-use num_conv::prelude::*;
-
 use crate::parsing::ParsedItem;
 use crate::parsing::combinator::{any_digit, ascii_char, exactly_n_digits, first_match, sign};
 use crate::{Month, Weekday};

time/src/parsing/combinator/rfc/iso8601.rs

@@ -1,8 +1,5 @@
 //! Parse parts of an ISO 8601-formatted value.
 
-#[allow(unused_imports, reason = "MSRV of 1.87")]
-use num_conv::prelude::*;
-
 use crate::convert::*;
 use crate::error;
 use crate::error::ParseFromDescription::{InvalidComponent, InvalidLiteral};