rename unchecked_duration_subtraction -> unchecked_time_subtraction

sharksforarms · sharksforarms · commit 1bd360ad8392 · 2025-02-08T14:03:11.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -952,7 +952,7 @@ Released 2023-04-20
 
 * Moved [`uninlined_format_args`] to `pedantic` (Now allow-by-default)
   [#10265](https://github.com/rust-lang/rust-clippy/pull/10265)
-* Moved [`unchecked_duration_subtraction`] to `pedantic` (Now allow-by-default)
+* Moved [`unchecked_time_subtraction`] to `pedantic` (Now allow-by-default)
   [#10194](https://github.com/rust-lang/rust-clippy/pull/10194)
 
 ### Enhancements
@@ -1203,7 +1203,7 @@ Released 2023-01-26
   [#9506](https://github.com/rust-lang/rust-clippy/pull/9506)
 * [`unnecessary_safety_doc`]
   [#9822](https://github.com/rust-lang/rust-clippy/pull/9822)
-* [`unchecked_duration_subtraction`]
+* [`unchecked_time_subtraction`]
   [#9570](https://github.com/rust-lang/rust-clippy/pull/9570)
 * [`manual_is_ascii_check`]
   [#9765](https://github.com/rust-lang/rust-clippy/pull/9765)
diff --git a/book/src/lint_configuration.md b/book/src/lint_configuration.md
@@ -779,7 +779,7 @@ The minimum rust version that the project supports. Defaults to the `rust-versio
 * [`transmute_ptr_to_ref`](https://rust-lang.github.io/rust-clippy/master/index.html#transmute_ptr_to_ref)
 * [`tuple_array_conversions`](https://rust-lang.github.io/rust-clippy/master/index.html#tuple_array_conversions)
 * [`type_repetition_in_bounds`](https://rust-lang.github.io/rust-clippy/master/index.html#type_repetition_in_bounds)
-* [`unchecked_duration_subtraction`](https://rust-lang.github.io/rust-clippy/master/index.html#unchecked_duration_subtraction)
+* [`unchecked_time_subtraction`](https://rust-lang.github.io/rust-clippy/master/index.html#unchecked_time_subtraction)
 * [`uninlined_format_args`](https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args)
 * [`unnecessary_lazy_evaluations`](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations)
 * [`unnested_or_patterns`](https://rust-lang.github.io/rust-clippy/master/index.html#unnested_or_patterns)
diff --git a/clippy_config/src/conf.rs b/clippy_config/src/conf.rs
@@ -648,7 +648,7 @@ define_Conf! {
         transmute_ptr_to_ref,
         tuple_array_conversions,
         type_repetition_in_bounds,
-        unchecked_duration_subtraction,
+        unchecked_time_subtraction,
         uninlined_format_args,
         unnecessary_lazy_evaluations,
         unnested_or_patterns,
diff --git a/clippy_lints/src/declared_lints.rs b/clippy_lints/src/declared_lints.rs
@@ -242,7 +242,7 @@ pub static LINTS: &[&crate::LintInfo] = &[
     crate::init_numbered_fields::INIT_NUMBERED_FIELDS_INFO,
     crate::inline_fn_without_body::INLINE_FN_WITHOUT_BODY_INFO,
     crate::instant_subtraction::MANUAL_INSTANT_ELAPSED_INFO,
-    crate::instant_subtraction::UNCHECKED_DURATION_SUBTRACTION_INFO,
+    crate::instant_subtraction::UNCHECKED_TIME_SUBTRACTION_INFO,
     crate::int_plus_one::INT_PLUS_ONE_INFO,
     crate::integer_division_remainder_used::INTEGER_DIVISION_REMAINDER_USED_INFO,
     crate::invalid_upcast_comparisons::INVALID_UPCAST_COMPARISONS_INFO,
diff --git a/clippy_lints/src/instant_subtraction.rs b/clippy_lints/src/instant_subtraction.rs
@@ -61,7 +61,7 @@ declare_clippy_lint! {
     /// let time_delta = Duration::from_secs(1).checked_sub(Duration::from_secs(5));
     /// ```
     #[clippy::version = "1.67.0"]
-    pub UNCHECKED_DURATION_SUBTRACTION,
+    pub UNCHECKED_TIME_SUBTRACTION,
     pedantic,
     "finds unchecked subtraction of a 'Duration' from an 'Instant' or 'Duration'"
 }
@@ -78,7 +78,7 @@ impl InstantSubtraction {
     }
 }
 
-impl_lint_pass!(InstantSubtraction => [MANUAL_INSTANT_ELAPSED, UNCHECKED_DURATION_SUBTRACTION]);
+impl_lint_pass!(InstantSubtraction => [MANUAL_INSTANT_ELAPSED, UNCHECKED_TIME_SUBTRACTION]);
 
 impl LateLintPass<'_> for InstantSubtraction {
     fn check_expr(&mut self, cx: &LateContext<'_>, expr: &'_ Expr<'_>) {
@@ -104,7 +104,7 @@ impl LateLintPass<'_> for InstantSubtraction {
                 && !expr.span.from_expansion()
                 && self.msrv.meets(msrvs::TRY_FROM)
             {
-                print_unchecked_duration_subtraction_sugg(cx, lhs, rhs, expr);
+                print_unchecked_time_subtraction_sugg(cx, lhs, rhs, expr);
             }
         }
     }
@@ -135,7 +135,7 @@ fn print_manual_instant_elapsed_sugg(cx: &LateContext<'_>, expr: &Expr<'_>, sugg
     );
 }
 
-fn print_unchecked_duration_subtraction_sugg(
+fn print_unchecked_time_subtraction_sugg(
     cx: &LateContext<'_>,
     left_expr: &Expr<'_>,
     right_expr: &Expr<'_>,
@@ -156,7 +156,7 @@ fn print_unchecked_duration_subtraction_sugg(
 
     span_lint_and_sugg(
         cx,
-        UNCHECKED_DURATION_SUBTRACTION,
+        UNCHECKED_TIME_SUBTRACTION,
         expr.span,
         format!("unchecked subtraction of 'Duration' from '{left_ty}'"),
         "try",
diff --git a/tests/ui/manual_instant_elapsed.fixed b/tests/ui/manual_instant_elapsed.fixed
@@ -1,6 +1,6 @@
 #![warn(clippy::manual_instant_elapsed)]
 #![allow(clippy::unnecessary_operation)]
-#![allow(clippy::unchecked_duration_subtraction)]
+#![allow(clippy::unchecked_time_subtraction)]
 #![allow(unused_variables)]
 #![allow(unused_must_use)]
 
diff --git a/tests/ui/manual_instant_elapsed.rs b/tests/ui/manual_instant_elapsed.rs
@@ -1,6 +1,6 @@
 #![warn(clippy::manual_instant_elapsed)]
 #![allow(clippy::unnecessary_operation)]
-#![allow(clippy::unchecked_duration_subtraction)]
+#![allow(clippy::unchecked_time_subtraction)]
 #![allow(unused_variables)]
 #![allow(unused_must_use)]
 
diff --git a/tests/ui/unchecked_time_subtraction.fixed b/tests/ui/unchecked_time_subtraction.fixed
@@ -1,4 +1,4 @@
-#![warn(clippy::unchecked_duration_subtraction)]
+#![warn(clippy::unchecked_time_subtraction)]
 
 use std::time::{Duration, Instant};
 
diff --git a/tests/ui/unchecked_time_subtraction.rs b/tests/ui/unchecked_time_subtraction.rs
@@ -1,4 +1,4 @@
-#![warn(clippy::unchecked_duration_subtraction)]
+#![warn(clippy::unchecked_time_subtraction)]
 
 use std::time::{Duration, Instant};
 
diff --git a/tests/ui/unchecked_time_subtraction.stderr b/tests/ui/unchecked_time_subtraction.stderr
@@ -1,44 +1,44 @@
 error: unchecked subtraction of 'Duration' from 'Instant'
-  --> tests/ui/unchecked_duration_subtraction.rs:10:13
+  --> tests/ui/unchecked_time_subtraction.rs:10:13
    |
 LL |     let _ = instant - duration;
    |             ^^^^^^^^^^^^^^^^^^ help: try: `instant.checked_sub(duration).unwrap()`
    |
-   = note: `-D clippy::unchecked-duration-subtraction` implied by `-D warnings`
-   = help: to override `-D warnings` add `#[allow(clippy::unchecked_duration_subtraction)]`
+   = note: `-D clippy::unchecked-time-subtraction` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(clippy::unchecked_time_subtraction)]`
 
 error: unchecked subtraction of 'Duration' from 'Instant'
-  --> tests/ui/unchecked_duration_subtraction.rs:12:13
+  --> tests/ui/unchecked_time_subtraction.rs:12:13
    |
 LL |     let _ = Instant::now() - Duration::from_secs(5);
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Instant::now().checked_sub(Duration::from_secs(5)).unwrap()`
 
 error: unchecked subtraction of 'Duration' from 'Instant'
-  --> tests/ui/unchecked_duration_subtraction.rs:14:13
+  --> tests/ui/unchecked_time_subtraction.rs:14:13
    |
 LL |     let _ = instant - Duration::from_secs(5);
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `instant.checked_sub(Duration::from_secs(5)).unwrap()`
 
 error: unchecked subtraction of 'Duration' from 'Instant'
-  --> tests/ui/unchecked_duration_subtraction.rs:16:13
+  --> tests/ui/unchecked_time_subtraction.rs:16:13
    |
 LL |     let _ = Instant::now() - duration;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Instant::now().checked_sub(duration).unwrap()`
 
 error: unchecked subtraction of 'Duration' from 'Duration'
-  --> tests/ui/unchecked_duration_subtraction.rs:18:13
+  --> tests/ui/unchecked_time_subtraction.rs:18:13
    |
 LL |     let _ = Duration::from_secs(1) - duration;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Duration::from_secs(1).checked_sub(duration).unwrap()`
 
 error: unchecked subtraction of 'Duration' from 'Duration'
-  --> tests/ui/unchecked_duration_subtraction.rs:20:13
+  --> tests/ui/unchecked_time_subtraction.rs:20:13
    |
 LL |     let _ = duration2 - duration;
    |             ^^^^^^^^^^^^^^^^^^^^ help: try: `duration2.checked_sub(duration).unwrap()`
 
 error: unchecked subtraction of 'Duration' from 'Duration'
-  --> tests/ui/unchecked_duration_subtraction.rs:22:13
+  --> tests/ui/unchecked_time_subtraction.rs:22:13
    |
 LL |     let _ = Instant::now().elapsed() - duration;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Instant::now().elapsed().checked_sub(duration).unwrap()`

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ declare_clippy_lint! {`
`61`	`61`	`/// let time_delta = Duration::from_secs(1).checked_sub(Duration::from_secs(5));`
`62`	`62`	/// ```
`63`	`63`	`#[clippy::version = "1.67.0"]`
`64`		`- pub UNCHECKED_DURATION_SUBTRACTION,`
	`64`	`+ pub UNCHECKED_TIME_SUBTRACTION,`
`65`	`65`	`pedantic,`
`66`	`66`	`"finds unchecked subtraction of a 'Duration' from an 'Instant' or 'Duration'"`
`67`	`67`	`}`
`@@ -78,7 +78,7 @@ impl InstantSubtraction {`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`-impl_lint_pass!(InstantSubtraction => [MANUAL_INSTANT_ELAPSED, UNCHECKED_DURATION_SUBTRACTION]);`
	`81`	`+impl_lint_pass!(InstantSubtraction => [MANUAL_INSTANT_ELAPSED, UNCHECKED_TIME_SUBTRACTION]);`
`82`	`82`
`83`	`83`	`impl LateLintPass<'_> for InstantSubtraction {`
`84`	`84`	`fn check_expr(&mut self, cx: &LateContext<'_>, expr: &'_ Expr<'_>) {`
`@@ -104,7 +104,7 @@ impl LateLintPass<'_> for InstantSubtraction {`
`104`	`104`	`&& !expr.span.from_expansion()`
`105`	`105`	`&& self.msrv.meets(msrvs::TRY_FROM)`
`106`	`106`	`{`
`107`		`- print_unchecked_duration_subtraction_sugg(cx, lhs, rhs, expr);`
	`107`	`+ print_unchecked_time_subtraction_sugg(cx, lhs, rhs, expr);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
`@@ -135,7 +135,7 @@ fn print_manual_instant_elapsed_sugg(cx: &LateContext<'_>, expr: &Expr<'_>, sugg`
`135`	`135`	`);`
`136`	`136`	`}`
`137`	`137`
`138`		`-fn print_unchecked_duration_subtraction_sugg(`
	`138`	`+fn print_unchecked_time_subtraction_sugg(`
`139`	`139`	`cx: &LateContext<'_>,`
`140`	`140`	`left_expr: &Expr<'_>,`
`141`	`141`	`right_expr: &Expr<'_>,`
`@@ -156,7 +156,7 @@ fn print_unchecked_duration_subtraction_sugg(`
`156`	`156`
`157`	`157`	`span_lint_and_sugg(`
`158`	`158`	`cx,`
`159`		`- UNCHECKED_DURATION_SUBTRACTION,`
	`159`	`+ UNCHECKED_TIME_SUBTRACTION,`
`160`	`160`	`expr.span,`
`161`	`161`	`format!("unchecked subtraction of 'Duration' from '{left_ty}'"),`
`162`	`162`	`"try",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![warn(clippy::unchecked_duration_subtraction)]`
	`1`	`+#![warn(clippy::unchecked_time_subtraction)]`
`2`	`2`
`3`	`3`	`use std::time::{Duration, Instant};`
`4`	`4`