-use rustc::hir::*;
-use rustc::lint::*;
-use rustc::ty::{self, Ty};
+// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::consts::{constant, Constant};
+use crate::rustc::hir::*;
+use crate::rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
+use crate::rustc::ty::{self, Ty};
+use crate::rustc::{declare_tool_lint, lint_array};
+use crate::rustc_errors::Applicability;
+use crate::syntax::ast::LitKind;
+use crate::syntax::source_map::Span;
+use crate::utils::paths;
+use crate::utils::sugg::Sugg;
+use crate::utils::{
+ expr_block, in_macro, is_allowed, is_expn_of, match_qpath, match_type, multispan_sugg, remove_blocks, snippet,
+ snippet_with_applicability, span_lint_and_sugg, span_lint_and_then, span_note_and_lint, walk_ptrs_ty,
+};
+use if_chain::if_chain;
use std::cmp::Ordering;
use std::collections::Bound;
-use syntax::ast::LitKind;
-use syntax::codemap::Span;
-use utils::paths;
-use utils::{expr_block, in_external_macro, is_allowed, is_expn_of, match_qpath, match_type, multispan_sugg,
- remove_blocks, snippet, span_lint_and_sugg, span_lint_and_then, span_note_and_lint, walk_ptrs_ty};
-use utils::sugg::Sugg;
-use consts::{constant, Constant};
/// **What it does:** Checks for matches with a single arm where an `if let`
/// will usually suffice.
/// ```rust
/// match x {
/// Some(ref foo) => bar(foo),
-/// _ => ()
+/// _ => (),
/// }
/// ```
declare_clippy_lint! {
pub SINGLE_MATCH,
style,
- "a match statement with a single nontrivial arm (i.e. where the other arm \
- is `_ => {}`) instead of `if let`"
+ "a match statement with a single nontrivial arm (i.e. where the other arm is `_ => {}`) instead of `if let`"
}
/// **What it does:** Checks for matches with a two arms where an `if let` will
declare_clippy_lint! {
pub SINGLE_MATCH_ELSE,
pedantic,
- "a match statement with a two arms where the second arm's pattern is a wildcard \
- instead of `if let`"
+ "a match statement with a two arms where the second arm's pattern is a wildcard instead of `if let`"
}
/// **What it does:** Checks for matches where all arms match a reference,
/// false => bar(),
/// }
/// ```
+/// Use if/else instead:
+/// ```rust
+/// let condition: bool = true;
+/// if condition {
+/// foo();
+/// } else {
+/// bar();
+/// }
+/// ```
declare_clippy_lint! {
pub MATCH_BOOL,
style,
/// ```rust
/// let x = 5;
/// match x {
-/// 1 ... 10 => println!("1 ... 10"),
-/// 5 ... 15 => println!("5 ... 15"),
+/// 1...10 => println!("1 ... 10"),
+/// 5...15 => println!("5 ... 15"),
/// _ => (),
/// }
/// ```
///
/// **Example:**
/// ```rust
-/// let x : Result(i32, &str) = Ok(3);
+/// let x: Result(i32, &str) = Ok(3);
/// match x {
/// Ok(_) => println!("ok"),
/// Err(_) => panic!("err"),
/// ```rust
/// let x: Option<()> = None;
/// let r: Option<&()> = match x {
-/// None => None,
-/// Some(ref v) => Some(v),
+/// None => None,
+/// Some(ref v) => Some(v),
/// };
/// ```
declare_clippy_lint! {
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MatchPass {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
- if in_external_macro(cx, expr.span) {
+ if in_external_macro(cx.sess(), expr.span) {
return;
}
- if let ExprMatch(ref ex, ref arms, MatchSource::Normal) = expr.node {
+ if let ExprKind::Match(ref ex, ref arms, MatchSource::Normal) = expr.node {
check_single_match(cx, ex, arms, expr);
check_match_bool(cx, ex, arms, expr);
check_overlapping_arms(cx, ex, arms);
check_wild_err_arm(cx, ex, arms);
check_match_as_ref(cx, ex, arms, expr);
}
- if let ExprMatch(ref ex, ref arms, _) = expr.node {
+ if let ExprKind::Match(ref ex, ref arms, _) = expr.node {
check_match_ref_pats(cx, ex, arms, expr);
}
}
}
-#[cfg_attr(rustfmt, rustfmt_skip)]
-fn check_single_match(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
+#[rustfmt::skip]
+fn check_single_match(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Expr) {
if arms.len() == 2 &&
arms[0].pats.len() == 1 && arms[0].guard.is_none() &&
arms[1].pats.len() == 1 && arms[1].guard.is_none() {
let els = remove_blocks(&arms[1].body);
let els = if is_unit_expr(els) {
None
- } else if let ExprBlock(_, _) = els.node {
+ } else if let ExprKind::Block(_, _) = els.node {
// matches with blocks that contain statements are prettier as `if let + else`
Some(els)
} else {
return;
};
let ty = cx.tables.expr_ty(ex);
- if ty.sty != ty::TyBool || is_allowed(cx, MATCH_BOOL, ex.id) {
+ if ty.sty != ty::Bool || is_allowed(cx, MATCH_BOOL, ex.id) {
check_single_match_single_pattern(cx, ex, arms, expr, els);
check_single_match_opt_like(cx, ex, arms, expr, ty, els);
}
}
}
-fn check_single_match_single_pattern(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr, els: Option<&Expr>) {
- if arms[1].pats[0].node == PatKind::Wild {
+fn check_single_match_single_pattern(
+ cx: &LateContext<'_, '_>,
+ ex: &Expr,
+ arms: &[Arm],
+ expr: &Expr,
+ els: Option<&Expr>,
+) {
+ if is_wild(&arms[1].pats[0]) {
report_single_match_single_pattern(cx, ex, arms, expr, els);
}
}
-fn report_single_match_single_pattern(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr, els: Option<&Expr>) {
- let lint = if els.is_some() {
- SINGLE_MATCH_ELSE
- } else {
- SINGLE_MATCH
- };
- let els_str = els.map_or(String::new(), |els| format!(" else {}", expr_block(cx, els, None, "..")));
+fn report_single_match_single_pattern(
+ cx: &LateContext<'_, '_>,
+ ex: &Expr,
+ arms: &[Arm],
+ expr: &Expr,
+ els: Option<&Expr>,
+) {
+ let lint = if els.is_some() { SINGLE_MATCH_ELSE } else { SINGLE_MATCH };
+ let els_str = els.map_or(String::new(), |els| {
+ format!(" else {}", expr_block(cx, els, None, ".."))
+ });
span_lint_and_sugg(
cx,
lint,
snippet(cx, arms[0].pats[0].span, ".."),
snippet(cx, ex.span, ".."),
expr_block(cx, &arms[0].body, None, ".."),
- els_str
+ els_str,
),
+ Applicability::HasPlaceholders,
);
}
-fn check_single_match_opt_like(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr, ty: Ty, els: Option<&Expr>) {
+fn check_single_match_opt_like(
+ cx: &LateContext<'_, '_>,
+ ex: &Expr,
+ arms: &[Arm],
+ expr: &Expr,
+ ty: Ty<'_>,
+ els: Option<&Expr>,
+) {
// list of candidate Enums we know will never get any more members
let candidates = &[
(&paths::COW, "Borrowed"),
let path = match arms[1].pats[0].node {
PatKind::TupleStruct(ref path, ref inner, _) => {
// contains any non wildcard patterns? e.g. Err(err)
- if inner.iter().any(|pat| pat.node != PatKind::Wild) {
+ if !inner.iter().all(is_wild) {
return;
}
print::to_string(print::NO_ANN, |s| s.print_qpath(path, false))
},
- PatKind::Binding(BindingAnnotation::Unannotated, _, ident, None) => ident.node.to_string(),
+ PatKind::Binding(BindingAnnotation::Unannotated, _, ident, None) => ident.to_string(),
PatKind::Path(ref path) => print::to_string(print::NO_ANN, |s| s.print_qpath(path, false)),
_ => return,
};
}
}
-fn check_match_bool(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
+fn check_match_bool(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Expr) {
// type of expression == bool
- if cx.tables.expr_ty(ex).sty == ty::TyBool {
+ if cx.tables.expr_ty(ex).sty == ty::Bool {
span_lint_and_then(
cx,
MATCH_BOOL,
if arms.len() == 2 && arms[0].pats.len() == 1 {
// no guards
let exprs = if let PatKind::Lit(ref arm_bool) = arms[0].pats[0].node {
- if let ExprLit(ref lit) = arm_bool.node {
+ if let ExprKind::Lit(ref lit) = arm_bool.node {
match lit.node {
LitKind::Bool(true) => Some((&*arms[0].body, &*arms[1].body)),
LitKind::Bool(false) => Some((&*arms[1].body, &*arms[0].body)),
};
if let Some(sugg) = sugg {
- db.span_suggestion(expr.span, "consider using an if/else expression", sugg);
+ db.span_suggestion_with_applicability(
+ expr.span,
+ "consider using an if/else expression",
+ sugg,
+ Applicability::HasPlaceholders,
+ );
}
}
}
}
}
-fn check_wild_err_arm(cx: &LateContext, ex: &Expr, arms: &[Arm]) {
+fn is_wild(pat: &impl std::ops::Deref<Target = Pat>) -> bool {
+ match pat.node {
+ PatKind::Wild => true,
+ _ => false,
+ }
+}
+
+fn check_wild_err_arm(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm]) {
let ex_ty = walk_ptrs_ty(cx.tables.expr_ty(ex));
if match_type(cx, ex_ty, &paths::RESULT) {
for arm in arms {
let path_str = print::to_string(print::NO_ANN, |s| s.print_qpath(path, false));
if_chain! {
if path_str == "Err";
- if inner.iter().any(|pat| pat.node == PatKind::Wild);
- if let ExprBlock(ref block, _) = arm.body.node;
+ if inner.iter().any(is_wild);
+ if let ExprKind::Block(ref block, _) = arm.body.node;
if is_panic_block(block);
then {
// `Err(_)` arm with `panic!` found
arm.pats[0].span,
"Err(_) will match all errors, maybe not a good idea",
arm.pats[0].span,
- "to remove this warning, match each error seperately \
+ "to remove this warning, match each error separately \
or use unreachable macro");
}
}
}
}
-fn check_match_ref_pats(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
+fn check_match_ref_pats(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Expr) {
if has_only_ref_pats(arms) {
let mut suggs = Vec::new();
- let (title, msg) = if let ExprAddrOf(Mutability::MutImmutable, ref inner) = ex.node {
+ let (title, msg) = if let ExprKind::AddrOf(Mutability::MutImmutable, ref inner) = ex.node {
suggs.push((ex.span, Sugg::hir(cx, inner, "..").to_string()));
(
"you don't need to add `&` to both the expression and the patterns",
}));
span_lint_and_then(cx, MATCH_REF_PATS, expr.span, title, |db| {
- multispan_sugg(db, msg.to_owned(), suggs);
+ if !in_macro(expr.span) {
+ multispan_sugg(db, msg.to_owned(), suggs);
+ }
});
}
}
-fn check_match_as_ref(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
- if arms.len() == 2 &&
- arms[0].pats.len() == 1 && arms[0].guard.is_none() &&
- arms[1].pats.len() == 1 && arms[1].guard.is_none() {
+fn check_match_as_ref(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Expr) {
+ if arms.len() == 2
+ && arms[0].pats.len() == 1
+ && arms[0].guard.is_none()
+ && arms[1].pats.len() == 1
+ && arms[1].guard.is_none()
+ {
let arm_ref: Option<BindingAnnotation> = if is_none_arm(&arms[0]) {
is_ref_some_arm(&arms[1])
} else if is_none_arm(&arms[1]) {
None
};
if let Some(rb) = arm_ref {
- let suggestion = if rb == BindingAnnotation::Ref { "as_ref" } else { "as_mut" };
+ let suggestion = if rb == BindingAnnotation::Ref {
+ "as_ref"
+ } else {
+ "as_mut"
+ };
+ let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(
cx,
MATCH_AS_REF,
expr.span,
&format!("use {}() instead", suggestion),
"try this",
- format!("{}.{}()", snippet(cx, ex.span, "_"), suggestion)
+ format!(
+ "{}.{}()",
+ snippet_with_applicability(cx, ex.span, "_", &mut applicability),
+ suggestion
+ ),
+ applicability,
)
}
}
}
/// Get all arms that are unbounded `PatRange`s.
-fn all_ranges<'a, 'tcx>(
- cx: &LateContext<'a, 'tcx>,
- arms: &'tcx [Arm],
-) -> Vec<SpannedRange<Constant>> {
+fn all_ranges<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, arms: &'tcx [Arm]) -> Vec<SpannedRange<Constant>> {
arms.iter()
.flat_map(|arm| {
if let Arm {
- ref pats,
- guard: None,
- ..
+ ref pats, guard: None, ..
} = *arm
{
pats.iter()
} else {
[].iter()
- }.filter_map(|pat| {
+ }
+ .filter_map(|pat| {
if let PatKind::Range(ref lhs, ref rhs, ref range_end) = pat.node {
- let lhs = constant(cx, lhs)?.0;
- let rhs = constant(cx, rhs)?.0;
+ let lhs = constant(cx, cx.tables, lhs)?.0;
+ let rhs = constant(cx, cx.tables, rhs)?.0;
let rhs = match *range_end {
RangeEnd::Included => Bound::Included(rhs),
RangeEnd::Excluded => Bound::Excluded(rhs),
};
- return Some(SpannedRange { span: pat.span, node: (lhs, rhs) });
+ return Some(SpannedRange {
+ span: pat.span,
+ node: (lhs, rhs),
+ });
}
if let PatKind::Lit(ref value) = pat.node {
- let value = constant(cx, value)?.0;
- return Some(SpannedRange { span: pat.span, node: (value.clone(), Bound::Included(value)) });
+ let value = constant(cx, cx.tables, value)?.0;
+ return Some(SpannedRange {
+ span: pat.span,
+ node: (value.clone(), Bound::Included(value)),
+ });
}
None
ranges
.iter()
.filter_map(|range| match range.node {
- (
- Constant::Int(start),
- Bound::Included(Constant::Int(end)),
- ) => Some(SpannedRange {
+ (Constant::Int(start), Bound::Included(Constant::Int(end))) => Some(SpannedRange {
span: range.span,
node: (start, Bound::Included(end)),
}),
- (
- Constant::Int(start),
- Bound::Excluded(Constant::Int(end)),
- ) => Some(SpannedRange {
+ (Constant::Int(start), Bound::Excluded(Constant::Int(end))) => Some(SpannedRange {
span: range.span,
node: (start, Bound::Excluded(end)),
}),
- (
- Constant::Int(start),
- Bound::Unbounded,
- ) => Some(SpannedRange {
+ (Constant::Int(start), Bound::Unbounded) => Some(SpannedRange {
span: range.span,
node: (start, Bound::Unbounded),
}),
fn is_unit_expr(expr: &Expr) -> bool {
match expr.node {
- ExprTup(ref v) if v.is_empty() => true,
- ExprBlock(ref b, _) if b.stmts.is_empty() && b.expr.is_none() => true,
+ ExprKind::Tup(ref v) if v.is_empty() => true,
+ ExprKind::Block(ref b, _) if b.stmts.is_empty() && b.expr.is_none() => true,
_ => false,
}
}
if_chain! {
if let PatKind::TupleStruct(ref path, ref pats, _) = arm.pats[0].node;
if pats.len() == 1 && match_qpath(path, &paths::OPTION_SOME);
- if let PatKind::Binding(rb, _, ref ident, _) = pats[0].node;
+ if let PatKind::Binding(rb, _, ident, _) = pats[0].node;
if rb == BindingAnnotation::Ref || rb == BindingAnnotation::RefMut;
- if let ExprCall(ref e, ref args) = remove_blocks(&arm.body).node;
- if let ExprPath(ref some_path) = e.node;
+ if let ExprKind::Call(ref e, ref args) = remove_blocks(&arm.body).node;
+ if let ExprKind::Path(ref some_path) = e.node;
if match_qpath(some_path, &paths::OPTION_SOME) && args.len() == 1;
- if let ExprPath(ref qpath) = args[0].node;
+ if let ExprKind::Path(ref qpath) = args[0].node;
if let &QPath::Resolved(_, ref path2) = qpath;
- if path2.segments.len() == 1 && ident.node == path2.segments[0].name;
+ if path2.segments.len() == 1 && ident.name == path2.segments[0].ident.name;
then {
return Some(rb)
}
}
fn has_only_ref_pats(arms: &[Arm]) -> bool {
- let mapped = arms.iter()
+ let mapped = arms
+ .iter()
.flat_map(|a| &a.pats)
.map(|p| {
match p.node {
for (a, b) in values.iter().zip(values.iter().skip(1)) {
match (a, b) {
- (&Kind::Start(_, ra), &Kind::End(_, rb)) => if ra.node != rb.node {
- return Some((ra, rb));
+ (&Kind::Start(_, ra), &Kind::End(_, rb)) => {
+ if ra.node != rb.node {
+ return Some((ra, rb));
+ }
},
(&Kind::End(a, _), &Kind::Start(b, _)) if a != Bound::Included(b) => (),
_ => return Some((a.range(), b.range())),
projects / rust.git / blobdiff