X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=clippy_lints%2Fsrc%2Fformatting.rs;h=b10e83c0ea819e5c1c891d310d6a3b7cd3288a72;hb=9f6b5de7deaf4dc9e7917370ad09ab85dc23997c;hp=d31b15cba9e299a98e5e38549ac250897ec77fbf;hpb=1837cbce6c27a638efed277dd86b1ab1a142c612;p=rust.git diff --git a/clippy_lints/src/formatting.rs b/clippy_lints/src/formatting.rs index d31b15cba9e..b10e83c0ea8 100644 --- a/clippy_lints/src/formatting.rs +++ b/clippy_lints/src/formatting.rs @@ -1,9 +1,12 @@ -use crate::utils::{differing_macro_contexts, snippet_opt, span_help_and_lint, span_note_and_lint}; +use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_note}; +use clippy_utils::differing_macro_contexts; +use clippy_utils::source::snippet_opt; use if_chain::if_chain; -use rustc::declare_lint_pass; -use rustc::lint::{in_external_macro, EarlyContext, EarlyLintPass, LintArray, LintPass}; -use rustc_session::declare_tool_lint; -use syntax::ast::*; +use rustc_ast::ast::{BinOpKind, Block, Expr, ExprKind, StmtKind, UnOp}; +use rustc_lint::{EarlyContext, EarlyLintPass}; +use rustc_middle::lint::in_external_macro; +use rustc_session::{declare_lint_pass, declare_tool_lint}; +use rustc_span::source_map::Span; declare_clippy_lint! { /// **What it does:** Checks for use of the non-existent `=*`, `=!` and `=-` @@ -111,12 +114,8 @@ impl EarlyLintPass for Formatting { fn check_block(&mut self, cx: &EarlyContext<'_>, block: &Block) { for w in block.stmts.windows(2) { - match (&w[0].kind, &w[1].kind) { - (&StmtKind::Expr(ref first), &StmtKind::Expr(ref second)) - | (&StmtKind::Expr(ref first), &StmtKind::Semi(ref second)) => { - check_missing_else(cx, first, second); - }, - _ => (), + if let (StmtKind::Expr(first), StmtKind::Expr(second) | StmtKind::Semi(second)) = (&w[0].kind, &w[1].kind) { + check_missing_else(cx, first, second); } } } @@ -139,7 +138,7 @@ fn check_assign(cx: &EarlyContext<'_>, expr: &Expr) { let op = UnOp::to_string(op); let eqop_span = lhs.span.between(sub_rhs.span); if eq_snippet.ends_with('=') { - span_note_and_lint( + span_lint_and_note( cx, SUSPICIOUS_ASSIGNMENT_FORMATTING, eqop_span, @@ -148,7 +147,7 @@ fn check_assign(cx: &EarlyContext<'_>, expr: &Expr) { really are doing `.. = ({op} ..)`", op = op ), - eqop_span, + None, &format!("to remove this lint, use either `{op}=` or `= {op}`", op = op), ); } @@ -177,7 +176,7 @@ fn check_unop(cx: &EarlyContext<'_>, expr: &Expr) { then { let unop_str = UnOp::to_string(op); let eqop_span = lhs.span.between(un_rhs.span); - span_help_and_lint( + span_lint_and_help( cx, SUSPICIOUS_UNARY_OP_FORMATTING, eqop_span, @@ -187,6 +186,7 @@ fn check_unop(cx: &EarlyContext<'_>, expr: &Expr) { binop = binop_str, unop = unop_str ), + None, &format!( "put a space between `{binop}` and `{unop}` and remove the space after `{unop}`", binop = binop_str, @@ -220,12 +220,12 @@ fn check_else(cx: &EarlyContext<'_>, expr: &Expr) { let else_desc = if is_if(else_) { "if" } else { "{..}" }; then { - span_note_and_lint( + span_lint_and_note( cx, SUSPICIOUS_ELSE_FORMATTING, else_span, &format!("this is an `else {}` but the formatting might hide it", else_desc), - else_span, + None, &format!( "to remove this lint, remove the `else` or remove the new line between \ `else` and `{}`", @@ -242,26 +242,31 @@ fn has_unary_equivalent(bin_op: BinOpKind) -> bool { bin_op == BinOpKind::And || bin_op == BinOpKind::Mul || bin_op == BinOpKind::Sub } +fn indentation(cx: &EarlyContext<'_>, span: Span) -> usize { + cx.sess.source_map().lookup_char_pos(span.lo()).col.0 +} + /// Implementation of the `POSSIBLE_MISSING_COMMA` lint for array fn check_array(cx: &EarlyContext<'_>, expr: &Expr) { if let ExprKind::Array(ref array) = expr.kind { for element in array { - if let ExprKind::Binary(ref op, ref lhs, _) = element.kind { - if has_unary_equivalent(op.node) && !differing_macro_contexts(lhs.span, op.span) { - let space_span = lhs.span.between(op.span); - if let Some(space_snippet) = snippet_opt(cx, space_span) { - let lint_span = lhs.span.with_lo(lhs.span.hi()); - if space_snippet.contains('\n') { - span_note_and_lint( - cx, - POSSIBLE_MISSING_COMMA, - lint_span, - "possibly missing a comma here", - lint_span, - "to remove this lint, add a comma or write the expr in a single line", - ); - } - } + if_chain! { + if let ExprKind::Binary(ref op, ref lhs, _) = element.kind; + if has_unary_equivalent(op.node) && !differing_macro_contexts(lhs.span, op.span); + let space_span = lhs.span.between(op.span); + if let Some(space_snippet) = snippet_opt(cx, space_span); + let lint_span = lhs.span.with_lo(lhs.span.hi()); + if space_snippet.contains('\n'); + if indentation(cx, op.span) <= indentation(cx, lhs.span); + then { + span_lint_and_note( + cx, + POSSIBLE_MISSING_COMMA, + lint_span, + "possibly missing a comma here", + None, + "to remove this lint, add a comma or write the expr in a single line", + ); } } } @@ -285,12 +290,12 @@ fn check_missing_else(cx: &EarlyContext<'_>, first: &Expr, second: &Expr) { ("an `else {..}`", "the next block") }; - span_note_and_lint( + span_lint_and_note( cx, SUSPICIOUS_ELSE_FORMATTING, else_span, &format!("this looks like {} but the `else` is missing", looks_like), - else_span, + None, &format!( "to remove this lint, add the missing `else` or add a new line before {}", next_thing, @@ -302,18 +307,10 @@ fn check_missing_else(cx: &EarlyContext<'_>, first: &Expr, second: &Expr) { } fn is_block(expr: &Expr) -> bool { - if let ExprKind::Block(..) = expr.kind { - true - } else { - false - } + matches!(expr.kind, ExprKind::Block(..)) } /// Check if the expression is an `if` or `if let` fn is_if(expr: &Expr) -> bool { - if let ExprKind::If(..) = expr.kind { - true - } else { - false - } + matches!(expr.kind, ExprKind::If(..)) }