-use crate::utils::{in_macro, snippet_opt, span_lint_and_then};
-use rustc::hir::{intravisit::FnKind, Body, ExprKind, FnDecl};
+use crate::utils::{in_macro, is_expn_of, snippet_opt, span_lint_and_then};
+use rustc::hir::{intravisit::FnKind, Body, ExprKind, FnDecl, MatchSource};
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::{declare_tool_lint, lint_array};
use rustc_errors::Applicability;
Self::expr_match(cx, else_expr);
}
},
- ExprKind::Match(_, arms, ..) => {
- for arm in arms {
- Self::expr_match(cx, &arm.body);
+ ExprKind::Match(.., arms, source) => {
+ let check_all_arms = match source {
+ MatchSource::IfLetDesugar {
+ contains_else_clause: has_else,
+ } => *has_else,
+ _ => true,
+ };
+
+ if check_all_arms {
+ for arm in arms {
+ Self::expr_match(cx, &arm.body);
+ }
+ } else {
+ Self::expr_match(cx, &arms.first().expect("if let doesn't have a single arm").body);
}
},
// skip if it already has a return statement
ExprKind::Ret(..) => (),
// everything else is missing `return`
- _ => Self::lint(cx, expr.span, expr.span, "add `return` as shown"),
+ _ => {
+ // make sure it's not just an unreachable expression
+ if is_expn_of(expr.span, "unreachable").is_none() {
+ Self::lint(cx, expr.span, expr.span, "add `return` as shown")
+ }
+ },
}
}
}
}
}
+#[allow(clippy::match_bool, clippy::needless_return)]
+fn test_match_with_unreachable(x: bool) -> bool {
+ match x {
+ true => return false,
+ false => unreachable!(),
+ }
+}
+
#[allow(clippy::never_loop)]
fn test_loop() -> bool {
loop {
}
}
+#[allow(clippy::redundant_pattern_matching)]
+fn test_loop_with_if_let() -> bool {
+ loop {
+ if let Some(x) = Some(true) {
+ return x;
+ }
+ }
+}
+
fn test_closure() {
#[rustfmt::skip]
let _ = || { true };
let _ = test_end_of_fn();
let _ = test_if_block();
let _ = test_match(true);
+ let _ = test_match_with_unreachable(true);
let _ = test_loop();
let _ = test_loop_with_block();
let _ = test_loop_with_nests();
+ let _ = test_loop_with_if_let();
test_closure();
}
| ^^^^ help: add `return` as shown: `return true`
error: missing return statement
- --> $DIR/implicit_return.rs:32:9
+ --> $DIR/implicit_return.rs:40:9
|
LL | break true;
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
error: missing return statement
- --> $DIR/implicit_return.rs:40:13
+ --> $DIR/implicit_return.rs:48:13
|
LL | break true;
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
error: missing return statement
- --> $DIR/implicit_return.rs:49:13
+ --> $DIR/implicit_return.rs:57:13
|
LL | break true;
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
error: missing return statement
- --> $DIR/implicit_return.rs:58:18
+ --> $DIR/implicit_return.rs:75:18
|
LL | let _ = || { true };
| ^^^^ help: add `return` as shown: `return true`
error: missing return statement
- --> $DIR/implicit_return.rs:59:16
+ --> $DIR/implicit_return.rs:76:16
|
LL | let _ = || true;
| ^^^^ help: add `return` as shown: `return true`