-use crate::utils::{differing_macro_contexts, snippet_opt, span_lint_and_help, span_note_and_lint};
+use crate::utils::{differing_macro_contexts, snippet_opt, span_lint_and_help, span_lint_and_note};
use if_chain::if_chain;
-use rustc::lint::in_external_macro;
+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;
-use syntax::ast::*;
declare_clippy_lint! {
/// **What it does:** Checks for use of the non-existent `=*`, `=!` and `=-`
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);
}
}
}
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,
really are doing `.. = ({op} ..)`",
op = op
),
- eqop_span,
+ None,
&format!("to remove this lint, use either `{op}=` or `= {op}`", op = op),
);
}
binop = binop_str,
unop = unop_str
),
+ None,
&format!(
"put a space between `{binop}` and `{unop}` and remove the space after `{unop}`",
binop = binop_str,
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 `{}`",
if space_snippet.contains('\n');
if indentation(cx, op.span) <= indentation(cx, lhs.span);
then {
- span_note_and_lint(
+ span_lint_and_note(
cx,
POSSIBLE_MISSING_COMMA,
lint_span,
"possibly missing a comma here",
- lint_span,
+ None,
"to remove this lint, add a comma or write the expr in a single line",
);
}
("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,
}
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(..))
}