2021-03-16 00:55:45 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_help;
|
2020-11-13 18:13:50 +00:00
|
|
|
use rustc_ast::ast::{Block, Expr, ExprKind, Stmt, StmtKind};
|
|
|
|
use rustc_ast::visit::{walk_expr, Visitor};
|
|
|
|
use rustc_lint::{EarlyContext, EarlyLintPass};
|
|
|
|
use rustc_middle::lint::in_external_macro;
|
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
|
|
|
|
|
|
|
declare_clippy_lint! {
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for `else` blocks that can be removed without changing semantics.
|
2020-11-13 18:13:50 +00:00
|
|
|
///
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// The `else` block adds unnecessary indentation and verbosity.
|
2020-11-13 18:13:50 +00:00
|
|
|
///
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### Known problems
|
|
|
|
/// Some may prefer to keep the `else` block for clarity.
|
2020-11-13 18:13:50 +00:00
|
|
|
///
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### Example
|
2020-11-13 18:13:50 +00:00
|
|
|
/// ```rust
|
|
|
|
/// fn my_func(count: u32) {
|
|
|
|
/// if count == 0 {
|
|
|
|
/// print!("Nothing to do");
|
|
|
|
/// return;
|
|
|
|
/// } else {
|
|
|
|
/// print!("Moving on...");
|
|
|
|
/// }
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// Use instead:
|
|
|
|
/// ```rust
|
|
|
|
/// fn my_func(count: u32) {
|
|
|
|
/// if count == 0 {
|
|
|
|
/// print!("Nothing to do");
|
|
|
|
/// return;
|
|
|
|
/// }
|
|
|
|
/// print!("Moving on...");
|
|
|
|
/// }
|
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "1.50.0"]
|
2020-11-13 18:13:50 +00:00
|
|
|
pub REDUNDANT_ELSE,
|
|
|
|
pedantic,
|
|
|
|
"`else` branch that can be removed without changing semantics"
|
|
|
|
}
|
|
|
|
|
|
|
|
declare_lint_pass!(RedundantElse => [REDUNDANT_ELSE]);
|
|
|
|
|
|
|
|
impl EarlyLintPass for RedundantElse {
|
|
|
|
fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
|
|
|
|
if in_external_macro(cx.sess, stmt.span) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Only look at expressions that are a whole statement
|
|
|
|
let expr: &Expr = match &stmt.kind {
|
|
|
|
StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr,
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
// if else
|
|
|
|
let (mut then, mut els): (&Block, &Expr) = match &expr.kind {
|
|
|
|
ExprKind::If(_, then, Some(els)) => (then, els),
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
loop {
|
|
|
|
if !BreakVisitor::default().check_block(then) {
|
|
|
|
// then block does not always break
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
match &els.kind {
|
|
|
|
// else if else
|
|
|
|
ExprKind::If(_, next_then, Some(next_els)) => {
|
|
|
|
then = next_then;
|
|
|
|
els = next_els;
|
|
|
|
continue;
|
|
|
|
},
|
|
|
|
// else if without else
|
|
|
|
ExprKind::If(..) => return,
|
|
|
|
// done
|
|
|
|
_ => break,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
span_lint_and_help(
|
|
|
|
cx,
|
|
|
|
REDUNDANT_ELSE,
|
|
|
|
els.span,
|
|
|
|
"redundant else block",
|
|
|
|
None,
|
|
|
|
"remove the `else` block and move the contents out",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Call `check` functions to check if an expression always breaks control flow
|
|
|
|
#[derive(Default)]
|
|
|
|
struct BreakVisitor {
|
|
|
|
is_break: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'ast> Visitor<'ast> for BreakVisitor {
|
|
|
|
fn visit_block(&mut self, block: &'ast Block) {
|
|
|
|
self.is_break = match block.stmts.as_slice() {
|
|
|
|
[.., last] => self.check_stmt(last),
|
|
|
|
_ => false,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
fn visit_expr(&mut self, expr: &'ast Expr) {
|
|
|
|
self.is_break = match expr.kind {
|
|
|
|
ExprKind::Break(..) | ExprKind::Continue(..) | ExprKind::Ret(..) => true,
|
|
|
|
ExprKind::Match(_, ref arms) => arms.iter().all(|arm| self.check_expr(&arm.body)),
|
|
|
|
ExprKind::If(_, ref then, Some(ref els)) => self.check_block(then) && self.check_expr(els),
|
|
|
|
ExprKind::If(_, _, None)
|
|
|
|
// ignore loops for simplicity
|
|
|
|
| ExprKind::While(..) | ExprKind::ForLoop(..) | ExprKind::Loop(..) => false,
|
|
|
|
_ => {
|
|
|
|
walk_expr(self, expr);
|
|
|
|
return;
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl BreakVisitor {
|
|
|
|
fn check<T>(&mut self, item: T, visit: fn(&mut Self, T)) -> bool {
|
|
|
|
visit(self, item);
|
|
|
|
std::mem::replace(&mut self.is_break, false)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_block(&mut self, block: &Block) -> bool {
|
|
|
|
self.check(block, Self::visit_block)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_expr(&mut self, expr: &Expr) -> bool {
|
|
|
|
self.check(expr, Self::visit_expr)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_stmt(&mut self, stmt: &Stmt) -> bool {
|
|
|
|
self.check(stmt, Self::visit_stmt)
|
|
|
|
}
|
|
|
|
}
|