Skip to content

Commit

Permalink
Fix missing parenthesis in suboptimal floating point help
Browse files Browse the repository at this point in the history
  • Loading branch information
llogiq committed Oct 27, 2023
1 parent 2f0f4dd commit 1ed1001
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
22 changes: 5 additions & 17 deletions clippy_lints/src/floating_point_arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@ fn check_powi(cx: &LateContext<'_>, expr: &Expr<'_>, receiver: &Expr<'_>, args:
let maybe_neg_sugg = |expr, hir_id| {
let sugg = Sugg::hir(cx, expr, "..");
if matches!(op, BinOpKind::Sub) && hir_id == rhs.hir_id {
format!("-{}", sugg.maybe_par())
-sugg
} else {
sugg.to_string()
sugg
}
};

Expand Down Expand Up @@ -470,25 +470,13 @@ fn check_mul_add(cx: &LateContext<'_>, expr: &Expr<'_>) {

let maybe_neg_sugg = |expr| {
let sugg = Sugg::hir(cx, expr, "..");
if let BinOpKind::Sub = op {
format!("-{sugg}")
} else {
sugg.to_string()
}
if let BinOpKind::Sub = op { -sugg } else { sugg }
};

let (recv, arg1, arg2) = if let Some((inner_lhs, inner_rhs)) = is_float_mul_expr(cx, lhs) {
(
inner_lhs,
Sugg::hir(cx, inner_rhs, "..").to_string(),
maybe_neg_sugg(rhs),
)
(inner_lhs, Sugg::hir(cx, inner_rhs, ".."), maybe_neg_sugg(rhs))
} else if let Some((inner_lhs, inner_rhs)) = is_float_mul_expr(cx, rhs) {
(
inner_lhs,
maybe_neg_sugg(inner_rhs),
Sugg::hir(cx, lhs, "..").to_string(),
)
(inner_lhs, maybe_neg_sugg(inner_rhs), Sugg::hir(cx, lhs, ".."))
} else {
return;
};
Expand Down
5 changes: 4 additions & 1 deletion clippy_utils/src/sugg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,10 @@ forward_binop_impls_to_ref!(impl Sub, sub for Sugg<'_>, type Output = Sugg<'stat
impl Neg for Sugg<'_> {
type Output = Sugg<'static>;
fn neg(self) -> Sugg<'static> {
make_unop("-", self)
match &self {
Self::BinOp(AssocOp::As, ..) => Sugg::MaybeParen(format!("-({self})").into()),
_ => make_unop("-", self),
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions tests/ui/floating_point_mul_add.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ fn main() {

let _ = a.mul_add(a, b).sqrt();

let u = 1usize;
let _ = b.mul_add(-(u as f64), a);

// Cases where the lint shouldn't be applied
let _ = (a * a + b * b).sqrt();
}
3 changes: 3 additions & 0 deletions tests/ui/floating_point_mul_add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ fn main() {

let _ = (a * a + b).sqrt();

let u = 1usize;
let _ = a - (b * u as f64);

// Cases where the lint shouldn't be applied
let _ = (a * a + b * b).sqrt();
}
8 changes: 7 additions & 1 deletion tests/ui/floating_point_mul_add.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,11 @@ error: multiply and add expressions can be calculated more efficiently and accur
LL | let _ = (a * a + b).sqrt();
| ^^^^^^^^^^^ help: consider using: `a.mul_add(a, b)`

error: aborting due to 12 previous errors
error: multiply and add expressions can be calculated more efficiently and accurately
--> $DIR/floating_point_mul_add.rs:37:13
|
LL | let _ = a - (b * u as f64);
| ^^^^^^^^^^^^^^^^^^ help: consider using: `b.mul_add(-(u as f64), a)`

error: aborting due to 13 previous errors

0 comments on commit 1ed1001

Please sign in to comment.