mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-30 16:39:26 +00:00
Don't panic
This commit is contained in:
parent
746991572f
commit
b1a0abe404
1 changed files with 13 additions and 7 deletions
|
@ -2,6 +2,7 @@ use rustc::lint::*;
|
||||||
use rustc_front::hir::*;
|
use rustc_front::hir::*;
|
||||||
use rustc::middle::ty;
|
use rustc::middle::ty;
|
||||||
use syntax::ast::Lit_::LitBool;
|
use syntax::ast::Lit_::LitBool;
|
||||||
|
use syntax::codemap::Span;
|
||||||
|
|
||||||
use utils::{snippet, span_lint, span_help_and_lint, in_external_macro, expr_block};
|
use utils::{snippet, span_lint, span_help_and_lint, in_external_macro, expr_block};
|
||||||
|
|
||||||
|
@ -113,12 +114,12 @@ impl LateLintPass for MatchPass {
|
||||||
// check preconditions for MATCH_REF_PATS
|
// check preconditions for MATCH_REF_PATS
|
||||||
if has_only_ref_pats(arms) {
|
if has_only_ref_pats(arms) {
|
||||||
if let ExprAddrOf(Mutability::MutImmutable, ref inner) = ex.node {
|
if let ExprAddrOf(Mutability::MutImmutable, ref inner) = ex.node {
|
||||||
let template = match_template(source, "", &snippet(cx, inner.span, ".."));
|
let template = match_template(cx, expr.span, source, "", inner);
|
||||||
span_lint(cx, MATCH_REF_PATS, expr.span, &format!(
|
span_lint(cx, MATCH_REF_PATS, expr.span, &format!(
|
||||||
"you don't need to add `&` to both the expression \
|
"you don't need to add `&` to both the expression \
|
||||||
and the patterns: use `{}`", template));
|
and the patterns: use `{}`", template));
|
||||||
} else {
|
} else {
|
||||||
let template = match_template(source, "*", &snippet(cx, ex.span, ".."));
|
let template = match_template(cx, expr.span, source, "*", ex);
|
||||||
span_lint(cx, MATCH_REF_PATS, expr.span, &format!(
|
span_lint(cx, MATCH_REF_PATS, expr.span, &format!(
|
||||||
"instead of prefixing all patterns with `&`, you can dereference the \
|
"instead of prefixing all patterns with `&`, you can dereference the \
|
||||||
expression: `{}`", template));
|
expression: `{}`", template));
|
||||||
|
@ -146,19 +147,24 @@ fn has_only_ref_pats(arms: &[Arm]) -> bool {
|
||||||
mapped.map_or(false, |v| v.iter().any(|el| *el))
|
mapped.map_or(false, |v| v.iter().any(|el| *el))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn match_template(source: MatchSource, op: &str, expr: &str) -> String {
|
fn match_template(cx: &LateContext,
|
||||||
|
span: Span,
|
||||||
|
source: MatchSource,
|
||||||
|
op: &str,
|
||||||
|
expr: &Expr) -> String {
|
||||||
|
let expr_snippet = snippet(cx, expr.span, "..");
|
||||||
match source {
|
match source {
|
||||||
MatchSource::Normal => {
|
MatchSource::Normal => {
|
||||||
format!("match {}{} {{ ...", op, expr)
|
format!("match {}{} {{ ...", op, expr_snippet)
|
||||||
}
|
}
|
||||||
MatchSource::IfLetDesugar { .. } => {
|
MatchSource::IfLetDesugar { .. } => {
|
||||||
format!("if let ... = {}{} {{", op, expr)
|
format!("if let ... = {}{} {{", op, expr_snippet)
|
||||||
}
|
}
|
||||||
MatchSource::WhileLetDesugar => {
|
MatchSource::WhileLetDesugar => {
|
||||||
format!("while let ... = {}{} {{", op, expr)
|
format!("while let ... = {}{} {{", op, expr_snippet)
|
||||||
}
|
}
|
||||||
MatchSource::ForLoopDesugar => {
|
MatchSource::ForLoopDesugar => {
|
||||||
panic!("for loop desugared to match with &-patterns!")
|
cx.sess().span_bug(span, "for loop desugared to match with &-patterns!")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue