Skip to content

perf(time_subtraction): avoid querying type/diag name of lhs twice #16057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf(time_subtraction): avoid querying type/diag name of lhs twice #16057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions clippy_lints/src/time_subtraction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl LateLintPass<'_> for UncheckedTimeSubtraction {
);
} else {
// instant - duration
print_unchecked_duration_subtraction_sugg(cx, lhs, rhs, expr);
print_unchecked_duration_subtraction_sugg(cx, lhs, true, rhs, expr);
}
}
} else if lhs_ty.is_diag_item(cx, sym::Duration)
Expand All @@ -137,7 +137,7 @@ impl LateLintPass<'_> for UncheckedTimeSubtraction {
);
} else {
// duration - duration
print_unchecked_duration_subtraction_sugg(cx, lhs, rhs, expr);
print_unchecked_duration_subtraction_sugg(cx, lhs, false, rhs, expr);
}
}
}
Expand Down Expand Up @@ -188,13 +188,11 @@ fn print_manual_instant_elapsed_sugg(cx: &LateContext<'_>, expr: &Expr<'_>, sugg
fn print_unchecked_duration_subtraction_sugg(
cx: &LateContext<'_>,
left_expr: &Expr<'_>,
left_is_instant: bool,
right_expr: &Expr<'_>,
expr: &Expr<'_>,
) {
let typeck = cx.typeck_results();
let left_ty = typeck.expr_ty(left_expr);

let lint_msg = if left_ty.is_diag_item(cx, sym::Instant) {
let lint_msg = if left_is_instant {
"unchecked subtraction of a 'Duration' from an 'Instant'"
} else {
"unchecked subtraction between 'Duration' values"
Expand Down