-//! lint on if expressions with an else if, but without a final else branch
+//! Lint on if expressions with an else if, but without a final else branch.
-use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass, in_external_macro, LintContext};
-use rustc::{declare_lint, lint_array};
-use syntax::ast::*;
+use rustc_ast::ast::{Expr, ExprKind};
+use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
+use rustc_middle::lint::in_external_macro;
+use rustc_session::{declare_lint_pass, declare_tool_lint};
-use crate::utils::span_lint_and_sugg;
+use crate::utils::span_lint_and_help;
-/// **What it does:** Checks for usage of if expressions with an `else if` branch,
-/// but without a final `else` branch.
-///
-/// **Why is this bad?** Some coding guidelines require this (e.g. MISRA-C:2004 Rule 14.10).
-///
-/// **Known problems:** None.
-///
-/// **Example:**
-/// ```rust
-/// if x.is_positive() {
-/// a();
-/// } else if x.is_negative() {
-/// b();
-/// }
-/// ```
-///
-/// Could be written:
-///
-/// ```rust
-/// if x.is_positive() {
-/// a();
-/// } else if x.is_negative() {
-/// b();
-/// } else {
-/// // we don't care about zero
-/// }
-/// ```
declare_clippy_lint! {
+ /// **What it does:** Checks for usage of if expressions with an `else if` branch,
+ /// but without a final `else` branch.
+ ///
+ /// **Why is this bad?** Some coding guidelines require this (e.g., MISRA-C:2004 Rule 14.10).
+ ///
+ /// **Known problems:** None.
+ ///
+ /// **Example:**
+ /// ```rust
+ /// # fn a() {}
+ /// # fn b() {}
+ /// # let x: i32 = 1;
+ /// if x.is_positive() {
+ /// a();
+ /// } else if x.is_negative() {
+ /// b();
+ /// }
+ /// ```
+ ///
+ /// Could be written:
+ ///
+ /// ```rust
+ /// # fn a() {}
+ /// # fn b() {}
+ /// # let x: i32 = 1;
+ /// if x.is_positive() {
+ /// a();
+ /// } else if x.is_negative() {
+ /// b();
+ /// } else {
+ /// // We don't care about zero.
+ /// }
+ /// ```
pub ELSE_IF_WITHOUT_ELSE,
restriction,
- "if expression with an `else if`, but without a final `else` branch"
+ "`if` expression with an `else if`, but without a final `else` branch"
}
-#[derive(Copy, Clone)]
-pub struct ElseIfWithoutElse;
-
-impl LintPass for ElseIfWithoutElse {
- fn get_lints(&self) -> LintArray {
- lint_array!(ELSE_IF_WITHOUT_ELSE)
- }
-}
+declare_lint_pass!(ElseIfWithoutElse => [ELSE_IF_WITHOUT_ELSE]);
impl EarlyLintPass for ElseIfWithoutElse {
fn check_expr(&mut self, cx: &EarlyContext<'_>, mut item: &Expr) {
return;
}
- while let ExprKind::If(_, _, Some(ref els)) = item.node {
- if let ExprKind::If(_, _, None) = els.node {
- span_lint_and_sugg(
+ while let ExprKind::If(_, _, Some(ref els)) = item.kind {
+ if let ExprKind::If(_, _, None) = els.kind {
+ span_lint_and_help(
cx,
ELSE_IF_WITHOUT_ELSE,
els.span,
- "if expression with an `else if`, but without a final `else`",
+ "`if` expression with an `else if`, but without a final `else`",
+ None,
"add an `else` block here",
- "".to_string()
);
}