-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
New lint: manual_midpoint
#13851
Merged
Merged
New lint: manual_midpoint
#13851
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
use clippy_utils::diagnostics::span_lint_and_sugg; | ||
use clippy_utils::msrvs::{self, Msrv}; | ||
use clippy_utils::sugg::Sugg; | ||
use clippy_utils::{is_float_literal, is_integer_literal}; | ||
use rustc_ast::BinOpKind; | ||
use rustc_errors::Applicability; | ||
use rustc_hir::{Expr, ExprKind}; | ||
use rustc_lint::LateContext; | ||
use rustc_middle::ty::{self, Ty}; | ||
|
||
use super::MANUAL_MIDPOINT; | ||
|
||
pub(super) fn check<'tcx>( | ||
cx: &LateContext<'tcx>, | ||
expr: &'tcx Expr<'_>, | ||
op: BinOpKind, | ||
left: &'tcx Expr<'_>, | ||
right: &'tcx Expr<'_>, | ||
msrv: &Msrv, | ||
) { | ||
if !left.span.from_expansion() | ||
&& !right.span.from_expansion() | ||
&& op == BinOpKind::Div | ||
&& (is_integer_literal(right, 2) || is_float_literal(right, 2.0)) | ||
&& let Some((ll_expr, lr_expr)) = add_operands(left) | ||
&& add_operands(ll_expr).is_none() && add_operands(lr_expr).is_none() | ||
&& let left_ty = cx.typeck_results().expr_ty_adjusted(ll_expr) | ||
&& let right_ty = cx.typeck_results().expr_ty_adjusted(lr_expr) | ||
&& left_ty == right_ty | ||
// Do not lint on `(_+1)/2` and `(1+_)/2`, it is likely a `div_ceil()` operation | ||
&& !is_integer_literal(ll_expr, 1) && !is_integer_literal(lr_expr, 1) | ||
&& is_midpoint_implemented(left_ty, msrv) | ||
{ | ||
let mut app = Applicability::MachineApplicable; | ||
let left_sugg = Sugg::hir_with_context(cx, ll_expr, expr.span.ctxt(), "..", &mut app); | ||
let right_sugg = Sugg::hir_with_context(cx, lr_expr, expr.span.ctxt(), "..", &mut app); | ||
let sugg = format!("{left_ty}::midpoint({left_sugg}, {right_sugg})"); | ||
span_lint_and_sugg( | ||
cx, | ||
MANUAL_MIDPOINT, | ||
expr.span, | ||
"manual implementation of `midpoint` which can overflow", | ||
format!("use `{left_ty}::midpoint` instead"), | ||
sugg, | ||
app, | ||
); | ||
} | ||
} | ||
|
||
/// Return the left and right operands if `expr` represents an addition | ||
fn add_operands<'e, 'tcx>(expr: &'e Expr<'tcx>) -> Option<(&'e Expr<'tcx>, &'e Expr<'tcx>)> { | ||
match expr.kind { | ||
ExprKind::Binary(op, left, right) if op.node == BinOpKind::Add => Some((left, right)), | ||
_ => None, | ||
} | ||
} | ||
|
||
fn is_midpoint_implemented(ty: Ty<'_>, msrv: &Msrv) -> bool { | ||
match ty.kind() { | ||
ty::Uint(_) | ty::Float(_) => msrv.meets(msrvs::UINT_FLOAT_MIDPOINT), | ||
ty::Int(_) => msrv.meets(msrvs::INT_MIDPOINT), | ||
_ => false, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#![warn(clippy::manual_midpoint)] | ||
|
||
macro_rules! mac { | ||
($a: expr, $b: expr) => { | ||
($a + $b) / 2 | ||
}; | ||
} | ||
|
||
macro_rules! add { | ||
($a: expr, $b: expr) => { | ||
($a + $b) | ||
}; | ||
} | ||
|
||
macro_rules! two { | ||
() => { | ||
2 | ||
}; | ||
} | ||
|
||
#[clippy::msrv = "1.84"] | ||
fn older_msrv() { | ||
let a: u32 = 10; | ||
let _ = (a + 5) / 2; | ||
} | ||
|
||
#[clippy::msrv = "1.85"] | ||
fn main() { | ||
let a: u32 = 10; | ||
let _ = u32::midpoint(a, 5); //~ ERROR: manual implementation of `midpoint` | ||
|
||
let f: f32 = 10.0; | ||
let _ = f32::midpoint(f, 5.0); //~ ERROR: manual implementation of `midpoint` | ||
|
||
let _: u32 = 5 + u32::midpoint(8, 8) + 2; //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = const { u32::midpoint(8, 8) }; //~ ERROR: manual implementation of `midpoint` | ||
let _: f64 = const { f64::midpoint(8.0f64, 8.) }; //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = u32::midpoint(u32::default(), u32::default()); //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = u32::midpoint(two!(), two!()); //~ ERROR: manual implementation of `midpoint` | ||
|
||
// Do not lint in presence of an addition with more than 2 operands | ||
let _: u32 = (10 + 20 + 30) / 2; | ||
|
||
// Do not lint if whole or part is coming from a macro | ||
let _ = mac!(10, 20); | ||
let _: u32 = add!(10u32, 20u32) / 2; | ||
let _: u32 = (10 + 20) / two!(); | ||
|
||
// Do not lint if a literal is not present | ||
let _ = (f + 5.0) / (1.0 + 1.0); | ||
|
||
// Do not lint on signed integer types | ||
let i: i32 = 10; | ||
let _ = (i + 5) / 2; | ||
|
||
// Do not lint on (x+1)/2 or (1+x)/2 as this looks more like a `div_ceil()` operation | ||
let _ = (i + 1) / 2; | ||
let _ = (1 + i) / 2; | ||
|
||
// But if we see (x+1.0)/2.0 or (x+1.0)/2.0, it is probably a midpoint operation | ||
let _ = f32::midpoint(f, 1.0); //~ ERROR: manual implementation of `midpoint` | ||
let _ = f32::midpoint(1.0, f); //~ ERROR: manual implementation of `midpoint` | ||
} | ||
|
||
#[clippy::msrv = "1.86"] | ||
fn older_signed_midpoint(i: i32) { | ||
// Do not lint | ||
let _ = (i + 10) / 2; | ||
} | ||
|
||
#[clippy::msrv = "1.87"] | ||
fn signed_midpoint(i: i32) { | ||
let _ = i32::midpoint(i, 10); //~ ERROR: manual implementation of `midpoint` | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#![warn(clippy::manual_midpoint)] | ||
|
||
macro_rules! mac { | ||
($a: expr, $b: expr) => { | ||
($a + $b) / 2 | ||
}; | ||
} | ||
|
||
macro_rules! add { | ||
($a: expr, $b: expr) => { | ||
($a + $b) | ||
}; | ||
} | ||
|
||
macro_rules! two { | ||
() => { | ||
2 | ||
}; | ||
} | ||
|
||
#[clippy::msrv = "1.84"] | ||
fn older_msrv() { | ||
let a: u32 = 10; | ||
let _ = (a + 5) / 2; | ||
} | ||
|
||
#[clippy::msrv = "1.85"] | ||
fn main() { | ||
let a: u32 = 10; | ||
let _ = (a + 5) / 2; //~ ERROR: manual implementation of `midpoint` | ||
|
||
let f: f32 = 10.0; | ||
let _ = (f + 5.0) / 2.0; //~ ERROR: manual implementation of `midpoint` | ||
|
||
samueltardieu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
let _: u32 = 5 + (8 + 8) / 2 + 2; //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = const { (8 + 8) / 2 }; //~ ERROR: manual implementation of `midpoint` | ||
let _: f64 = const { (8.0f64 + 8.) / 2. }; //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = (u32::default() + u32::default()) / 2; //~ ERROR: manual implementation of `midpoint` | ||
let _: u32 = (two!() + two!()) / 2; //~ ERROR: manual implementation of `midpoint` | ||
|
||
// Do not lint in presence of an addition with more than 2 operands | ||
let _: u32 = (10 + 20 + 30) / 2; | ||
|
||
// Do not lint if whole or part is coming from a macro | ||
let _ = mac!(10, 20); | ||
let _: u32 = add!(10u32, 20u32) / 2; | ||
let _: u32 = (10 + 20) / two!(); | ||
|
||
// Do not lint if a literal is not present | ||
let _ = (f + 5.0) / (1.0 + 1.0); | ||
|
||
// Do not lint on signed integer types | ||
let i: i32 = 10; | ||
let _ = (i + 5) / 2; | ||
|
||
// Do not lint on (x+1)/2 or (1+x)/2 as this looks more like a `div_ceil()` operation | ||
let _ = (i + 1) / 2; | ||
let _ = (1 + i) / 2; | ||
|
||
// But if we see (x+1.0)/2.0 or (x+1.0)/2.0, it is probably a midpoint operation | ||
let _ = (f + 1.0) / 2.0; //~ ERROR: manual implementation of `midpoint` | ||
let _ = (1.0 + f) / 2.0; //~ ERROR: manual implementation of `midpoint` | ||
} | ||
|
||
#[clippy::msrv = "1.86"] | ||
fn older_signed_midpoint(i: i32) { | ||
// Do not lint | ||
let _ = (i + 10) / 2; | ||
} | ||
|
||
#[clippy::msrv = "1.87"] | ||
fn signed_midpoint(i: i32) { | ||
let _ = (i + 10) / 2; //~ ERROR: manual implementation of `midpoint` | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting choice of form, I would have probably use the method syntax (ie.
.midpoint(..)
) instead, as to not have to much shifts from the original code, but that works as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel that linting
(a + b) / 2
asa.midpoint(b)
introduces an asymmetry betweena
andb
whileu32::midpoint(a, b)
doesn't. But I'm not opposed to this change.What do others think? Please upvote if you prefer
a.midpoint(b)
and downvote if you preferu32::midpoint(a, b)
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't pick between the 2 because the first one is more convenirnt but the second one is more readable...
Well, by writing this comment I realized I prefer more readable code so let's go for 2.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I initially preferred
a.midpoint(b)
but having thought more about it, the latter has some other advantages:u32::midpoint(a, b)
doesn't require parentheses in some cases where the LHS is an expression with low precedence like(a + b + c) / 2
, and it also sidesteps type inference issues in cases likewhere
10.midpoint(5)
would not compile. So the current suggestion LGTM