//! lint on blocks unnecessarily using >= with a + 1 or - 1
-use rustc::lint::*;
+use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
+use rustc::{declare_tool_lint, lint_array};
+use rustc_errors::Applicability;
use syntax::ast::*;
-use utils::{snippet_opt, span_lint_and_then};
+use crate::utils::{snippet_opt, span_lint_and_then};
-/// **What it does:** Checks for usage of `x >= y + 1` or `x - 1 >= y` (and `<=`) in a block
-///
-///
-/// **Why is this bad?** Readability -- better to use `> y` instead of `>= y + 1`.
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust
-/// x >= y + 1
-/// ```
-///
-/// Could be written:
-///
-/// ```rust
-/// x > y
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for usage of `x >= y + 1` or `x - 1 >= y` (and `<=`) in a block
+ ///
+ ///
+ /// **Why is this bad?** Readability -- better to use `> y` instead of `>= y + 1`.
+ ///
+ /// **Known problems:** None.
+ ///
+ /// **Example:**
+ /// ```rust
+ /// x >= y + 1
+ /// ```
+ ///
+ /// Could be written:
+ ///
+ /// ```rust
+ /// x > y
+ /// ```
pub INT_PLUS_ONE,
complexity,
"instead of using x >= y + 1, use x > y"
fn get_lints(&self) -> LintArray {
lint_array!(INT_PLUS_ONE)
}
+
+ fn name(&self) -> &'static str {
+ "IntPlusOne"
+ }
}
// cases:
}
impl IntPlusOne {
- #[allow(cast_sign_loss)]
+ #[allow(clippy::cast_sign_loss)]
fn check_lit(&self, lit: &Lit, target_value: i128) -> bool {
if let LitKind::Int(value, ..) = lit.node {
return value == (target_value as u128);
false
}
- fn check_binop(&self, cx: &EarlyContext, binop: BinOpKind, lhs: &Expr, rhs: &Expr) -> Option<String> {
+ fn check_binop(&self, cx: &EarlyContext<'_>, binop: BinOpKind, lhs: &Expr, rhs: &Expr) -> Option<String> {
match (binop, &lhs.node, &rhs.node) {
// case where `x - 1 >= ...` or `-1 + x >= ...`
(BinOpKind::Ge, &ExprKind::Binary(ref lhskind, ref lhslhs, ref lhsrhs), _) => {
fn generate_recommendation(
&self,
- cx: &EarlyContext,
+ cx: &EarlyContext<'_>,
binop: BinOpKind,
node: &Expr,
other_side: &Expr,
None
}
- fn emit_warning(&self, cx: &EarlyContext, block: &Expr, recommendation: String) {
- span_lint_and_then(cx, INT_PLUS_ONE, block.span, "Unnecessary `>= y + 1` or `x - 1 >=`", |db| {
- db.span_suggestion(block.span, "change `>= y + 1` to `> y` as shown", recommendation);
- });
+ fn emit_warning(&self, cx: &EarlyContext<'_>, block: &Expr, recommendation: String) {
+ span_lint_and_then(
+ cx,
+ INT_PLUS_ONE,
+ block.span,
+ "Unnecessary `>= y + 1` or `x - 1 >=`",
+ |db| {
+ db.span_suggestion(
+ block.span,
+ "change `>= y + 1` to `> y` as shown",
+ recommendation,
+ Applicability::MachineApplicable, // snippet
+ );
+ },
+ );
}
}
impl EarlyLintPass for IntPlusOne {
- fn check_expr(&mut self, cx: &EarlyContext, item: &Expr) {
+ fn check_expr(&mut self, cx: &EarlyContext<'_>, item: &Expr) {
if let ExprKind::Binary(ref kind, ref lhs, ref rhs) = item.node {
if let Some(ref rec) = self.check_binop(cx, kind.node, lhs, rhs) {
self.emit_warning(cx, item, rec.clone());