2016-04-07 10:46:48 -05:00
|
|
|
|
use rustc::hir::*;
|
2015-08-21 12:32:21 -05:00
|
|
|
|
use rustc::lint::*;
|
2017-06-10 21:57:25 -05:00
|
|
|
|
use rustc::ty::{self, Ty};
|
2015-12-22 18:14:10 -06:00
|
|
|
|
use std::cmp::Ordering;
|
2017-01-30 05:30:16 -06:00
|
|
|
|
use std::collections::Bound;
|
2016-02-12 11:35:44 -06:00
|
|
|
|
use syntax::ast::LitKind;
|
2015-11-24 22:57:50 -06:00
|
|
|
|
use syntax::codemap::Span;
|
2018-05-30 03:15:50 -05:00
|
|
|
|
use crate::utils::paths;
|
|
|
|
|
use crate::utils::{expr_block, in_external_macro, is_allowed, is_expn_of, match_qpath, match_type, multispan_sugg,
|
2018-02-04 06:41:54 -06:00
|
|
|
|
remove_blocks, snippet, span_lint_and_sugg, span_lint_and_then, span_note_and_lint, walk_ptrs_ty};
|
2018-05-30 03:15:50 -05:00
|
|
|
|
use crate::utils::sugg::Sugg;
|
|
|
|
|
use crate::consts::{constant, Constant};
|
2015-08-21 12:32:21 -05:00
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **What it does:** Checks for matches with a single arm where an `if let`
|
|
|
|
|
/// will usually suffice.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Why is this bad?** Just readability – `if let` nests less than a `match`.
|
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Known problems:** None.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
2016-07-15 17:25:44 -05:00
|
|
|
|
/// ```rust
|
2015-12-10 18:22:27 -06:00
|
|
|
|
/// match x {
|
2016-09-18 06:17:25 -05:00
|
|
|
|
/// Some(ref foo) => bar(foo),
|
2015-12-10 18:22:27 -06:00
|
|
|
|
/// _ => ()
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
|
pub SINGLE_MATCH,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
style,
|
2017-03-17 02:30:29 -05:00
|
|
|
|
"a match statement with a single nontrivial arm (i.e. where the other arm \
|
2016-08-06 03:18:36 -05:00
|
|
|
|
is `_ => {}`) instead of `if let`"
|
2016-02-05 17:13:29 -06:00
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **What it does:** Checks for matches with a two arms where an `if let` will
|
|
|
|
|
/// usually suffice.
|
2016-01-24 05:24:16 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Why is this bad?** Just readability – `if let` nests less than a `match`.
|
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Known problems:** Personal style preferences may differ.
|
2016-01-24 05:24:16 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
2016-07-15 17:25:44 -05:00
|
|
|
|
/// ```rust
|
2016-01-24 05:24:16 -06:00
|
|
|
|
/// match x {
|
2016-09-18 06:17:25 -05:00
|
|
|
|
/// Some(ref foo) => bar(foo),
|
2016-01-24 05:24:16 -06:00
|
|
|
|
/// _ => bar(other_ref),
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
|
pub SINGLE_MATCH_ELSE,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
pedantic,
|
2016-08-06 03:18:36 -05:00
|
|
|
|
"a match statement with a two arms where the second arm's pattern is a wildcard \
|
|
|
|
|
instead of `if let`"
|
2016-02-05 17:13:29 -06:00
|
|
|
|
}
|
2016-01-24 05:24:16 -06:00
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **What it does:** Checks for matches where all arms match a reference,
|
|
|
|
|
/// suggesting to remove the reference and deref the matched expression
|
|
|
|
|
/// instead. It also checks for `if let &foo = bar` blocks.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Why is this bad?** It just makes the code less readable. That reference
|
|
|
|
|
/// destructuring adds nothing to the code.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Known problems:** None.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
2016-07-15 17:25:44 -05:00
|
|
|
|
/// ```rust
|
2015-12-10 18:22:27 -06:00
|
|
|
|
/// match x {
|
|
|
|
|
/// &A(ref y) => foo(y),
|
|
|
|
|
/// &B => bar(),
|
|
|
|
|
/// _ => frob(&x),
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
|
pub MATCH_REF_PATS,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
style,
|
2016-08-06 03:18:36 -05:00
|
|
|
|
"a match or `if let` with all arms prefixed with `&` instead of deref-ing the match expression"
|
2016-02-05 17:13:29 -06:00
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **What it does:** Checks for matches where match expression is a `bool`. It
|
|
|
|
|
/// suggests to replace the expression with an `if...else` block.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Why is this bad?** It makes the code less readable.
|
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Known problems:** None.
|
2015-12-10 18:22:27 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
2016-07-15 17:25:44 -05:00
|
|
|
|
/// ```rust
|
2015-12-10 18:22:27 -06:00
|
|
|
|
/// let condition: bool = true;
|
|
|
|
|
/// match condition {
|
|
|
|
|
/// true => foo(),
|
|
|
|
|
/// false => bar(),
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
|
pub MATCH_BOOL,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
style,
|
2016-08-06 03:18:36 -05:00
|
|
|
|
"a match on a boolean expression instead of an `if..else` block"
|
2016-02-05 17:13:29 -06:00
|
|
|
|
}
|
2015-08-21 12:32:21 -05:00
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **What it does:** Checks for overlapping match arms.
|
2015-12-22 18:14:10 -06:00
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Why is this bad?** It is likely to be an error and if not, makes the code
|
|
|
|
|
/// less obvious.
|
2015-12-22 18:14:10 -06:00
|
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
|
/// **Known problems:** None.
|
2015-12-22 18:14:10 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
2016-07-15 17:25:44 -05:00
|
|
|
|
/// ```rust
|
2015-12-22 18:14:10 -06:00
|
|
|
|
/// let x = 5;
|
|
|
|
|
/// match x {
|
|
|
|
|
/// 1 ... 10 => println!("1 ... 10"),
|
|
|
|
|
/// 5 ... 15 => println!("5 ... 15"),
|
|
|
|
|
/// _ => (),
|
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
|
pub MATCH_OVERLAPPING_ARM,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
style,
|
2016-08-06 03:18:36 -05:00
|
|
|
|
"a match with overlapping arms"
|
2016-02-05 17:13:29 -06:00
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2017-02-11 07:42:42 -06:00
|
|
|
|
/// **What it does:** Checks for arm which matches all errors with `Err(_)`
|
|
|
|
|
/// and take drastic actions like `panic!`.
|
2017-02-11 00:57:50 -06:00
|
|
|
|
///
|
2017-02-11 07:42:42 -06:00
|
|
|
|
/// **Why is this bad?** It is generally a bad practice, just like
|
|
|
|
|
/// catching all exceptions in java with `catch(Exception)`
|
2017-02-11 00:57:50 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Known problems:** None.
|
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
|
|
|
|
/// ```rust
|
|
|
|
|
/// let x : Result(i32, &str) = Ok(3);
|
|
|
|
|
/// match x {
|
|
|
|
|
/// Ok(_) => println!("ok"),
|
2017-02-11 07:42:42 -06:00
|
|
|
|
/// Err(_) => panic!("err"),
|
2017-02-11 00:57:50 -06:00
|
|
|
|
/// }
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2017-02-11 00:57:50 -06:00
|
|
|
|
pub MATCH_WILD_ERR_ARM,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
style,
|
2017-02-11 07:42:42 -06:00
|
|
|
|
"a match with `Err(_)` arm and take drastic actions"
|
2017-02-11 00:57:50 -06:00
|
|
|
|
}
|
|
|
|
|
|
2017-12-19 16:22:16 -06:00
|
|
|
|
/// **What it does:** Checks for match which is used to add a reference to an
|
|
|
|
|
/// `Option` value.
|
|
|
|
|
///
|
2017-12-20 03:39:48 -06:00
|
|
|
|
/// **Why is this bad?** Using `as_ref()` or `as_mut()` instead is shorter.
|
2017-12-19 16:22:16 -06:00
|
|
|
|
///
|
|
|
|
|
/// **Known problems:** None.
|
|
|
|
|
///
|
|
|
|
|
/// **Example:**
|
|
|
|
|
/// ```rust
|
|
|
|
|
/// let x: Option<()> = None;
|
|
|
|
|
/// let r: Option<&()> = match x {
|
|
|
|
|
/// None => None,
|
|
|
|
|
/// Some(ref v) => Some(v),
|
|
|
|
|
/// };
|
|
|
|
|
/// ```
|
2018-03-28 08:24:26 -05:00
|
|
|
|
declare_clippy_lint! {
|
2017-12-19 16:22:16 -06:00
|
|
|
|
pub MATCH_AS_REF,
|
2018-03-28 08:24:26 -05:00
|
|
|
|
complexity,
|
2017-12-20 03:39:48 -06:00
|
|
|
|
"a match on an Option value instead of using `as_ref()` or `as_mut`"
|
2017-12-19 16:22:16 -06:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-21 12:32:21 -05:00
|
|
|
|
#[allow(missing_copy_implementations)]
|
|
|
|
|
pub struct MatchPass;
|
|
|
|
|
|
|
|
|
|
impl LintPass for MatchPass {
|
|
|
|
|
fn get_lints(&self) -> LintArray {
|
2017-08-09 02:30:56 -05:00
|
|
|
|
lint_array!(
|
|
|
|
|
SINGLE_MATCH,
|
|
|
|
|
MATCH_REF_PATS,
|
|
|
|
|
MATCH_BOOL,
|
|
|
|
|
SINGLE_MATCH_ELSE,
|
|
|
|
|
MATCH_OVERLAPPING_ARM,
|
2017-12-19 16:22:16 -06:00
|
|
|
|
MATCH_WILD_ERR_ARM,
|
|
|
|
|
MATCH_AS_REF
|
2017-08-09 02:30:56 -05:00
|
|
|
|
)
|
2015-08-21 12:32:21 -05:00
|
|
|
|
}
|
2015-09-18 21:53:04 -05:00
|
|
|
|
}
|
2015-08-21 12:32:21 -05:00
|
|
|
|
|
2016-12-07 06:13:40 -06:00
|
|
|
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MatchPass {
|
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
|
2016-01-03 22:26:12 -06:00
|
|
|
|
if in_external_macro(cx, expr.span) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2015-09-03 09:42:17 -05:00
|
|
|
|
if let ExprMatch(ref ex, ref arms, MatchSource::Normal) = expr.node {
|
2015-12-22 19:19:32 -06:00
|
|
|
|
check_single_match(cx, ex, arms, expr);
|
|
|
|
|
check_match_bool(cx, ex, arms, expr);
|
2015-12-23 04:25:44 -06:00
|
|
|
|
check_overlapping_arms(cx, ex, arms);
|
2017-02-11 00:57:50 -06:00
|
|
|
|
check_wild_err_arm(cx, ex, arms);
|
2017-12-19 16:22:16 -06:00
|
|
|
|
check_match_as_ref(cx, ex, arms, expr);
|
2015-12-22 19:19:32 -06:00
|
|
|
|
}
|
2018-02-04 06:41:54 -06:00
|
|
|
|
if let ExprMatch(ref ex, ref arms, _) = expr.node {
|
|
|
|
|
check_match_ref_pats(cx, ex, arms, expr);
|
2015-12-22 19:19:32 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-21 12:49:00 -05:00
|
|
|
|
|
2016-02-29 05:19:32 -06:00
|
|
|
|
#[cfg_attr(rustfmt, rustfmt_skip)]
|
2015-12-22 19:19:32 -06:00
|
|
|
|
fn check_single_match(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
|
2016-01-12 18:19:27 -06:00
|
|
|
|
if arms.len() == 2 &&
|
2016-02-29 05:19:32 -06:00
|
|
|
|
arms[0].pats.len() == 1 && arms[0].guard.is_none() &&
|
|
|
|
|
arms[1].pats.len() == 1 && arms[1].guard.is_none() {
|
2017-03-03 09:56:16 -06:00
|
|
|
|
let els = remove_blocks(&arms[1].body);
|
|
|
|
|
let els = if is_unit_expr(els) {
|
2016-02-24 10:38:57 -06:00
|
|
|
|
None
|
2018-05-17 04:21:15 -05:00
|
|
|
|
} else if let ExprBlock(_, _) = els.node {
|
2016-02-24 10:38:57 -06:00
|
|
|
|
// matches with blocks that contain statements are prettier as `if let + else`
|
2017-03-03 09:56:16 -06:00
|
|
|
|
Some(els)
|
2016-02-24 10:38:57 -06:00
|
|
|
|
} else {
|
|
|
|
|
// allow match arms with just expressions
|
|
|
|
|
return;
|
|
|
|
|
};
|
2017-01-13 10:04:56 -06:00
|
|
|
|
let ty = cx.tables.expr_ty(ex);
|
2017-08-11 07:11:46 -05:00
|
|
|
|
if ty.sty != ty::TyBool || is_allowed(cx, MATCH_BOOL, ex.id) {
|
2016-02-24 10:38:57 -06:00
|
|
|
|
check_single_match_single_pattern(cx, ex, arms, expr, els);
|
|
|
|
|
check_single_match_opt_like(cx, ex, arms, expr, ty, els);
|
|
|
|
|
}
|
2016-01-12 18:19:27 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-24 05:24:16 -06:00
|
|
|
|
fn check_single_match_single_pattern(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr, els: Option<&Expr>) {
|
2016-02-18 14:16:39 -06:00
|
|
|
|
if arms[1].pats[0].node == PatKind::Wild {
|
2017-03-03 08:44:23 -06:00
|
|
|
|
report_single_match_single_pattern(cx, ex, arms, expr, els);
|
2015-12-22 19:19:32 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-03 08:44:23 -06:00
|
|
|
|
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, "..")));
|
2017-08-09 02:30:56 -05:00
|
|
|
|
span_lint_and_sugg(
|
|
|
|
|
cx,
|
|
|
|
|
lint,
|
|
|
|
|
expr.span,
|
|
|
|
|
"you seem to be trying to use match for destructuring a single pattern. Consider using `if \
|
2017-09-05 04:33:04 -05:00
|
|
|
|
let`",
|
2017-08-09 02:30:56 -05:00
|
|
|
|
"try this",
|
|
|
|
|
format!(
|
|
|
|
|
"if let {} = {} {}{}",
|
|
|
|
|
snippet(cx, arms[0].pats[0].span, ".."),
|
|
|
|
|
snippet(cx, ex.span, ".."),
|
|
|
|
|
expr_block(cx, &arms[0].body, None, ".."),
|
|
|
|
|
els_str
|
|
|
|
|
),
|
|
|
|
|
);
|
2017-03-03 08:44:23 -06:00
|
|
|
|
}
|
|
|
|
|
|
2017-06-10 23:46:26 -05:00
|
|
|
|
fn check_single_match_opt_like(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr, ty: Ty, els: Option<&Expr>) {
|
2016-01-24 05:24:16 -06:00
|
|
|
|
// list of candidate Enums we know will never get any more members
|
2017-08-09 02:30:56 -05:00
|
|
|
|
let candidates = &[
|
|
|
|
|
(&paths::COW, "Borrowed"),
|
|
|
|
|
(&paths::COW, "Cow::Borrowed"),
|
|
|
|
|
(&paths::COW, "Cow::Owned"),
|
|
|
|
|
(&paths::COW, "Owned"),
|
|
|
|
|
(&paths::OPTION, "None"),
|
|
|
|
|
(&paths::RESULT, "Err"),
|
|
|
|
|
(&paths::RESULT, "Ok"),
|
|
|
|
|
];
|
2016-01-12 18:19:27 -06:00
|
|
|
|
|
|
|
|
|
let path = match arms[1].pats[0].node {
|
2016-05-27 07:24:28 -05:00
|
|
|
|
PatKind::TupleStruct(ref path, ref inner, _) => {
|
2016-01-24 05:24:16 -06:00
|
|
|
|
// contains any non wildcard patterns? e.g. Err(err)
|
2016-02-24 10:38:57 -06:00
|
|
|
|
if inner.iter().any(|pat| pat.node != PatKind::Wild) {
|
2016-01-24 05:24:16 -06:00
|
|
|
|
return;
|
|
|
|
|
}
|
2017-01-03 22:40:42 -06:00
|
|
|
|
print::to_string(print::NO_ANN, |s| s.print_qpath(path, false))
|
2016-12-20 11:21:30 -06:00
|
|
|
|
},
|
2017-08-01 02:11:05 -05:00
|
|
|
|
PatKind::Binding(BindingAnnotation::Unannotated, _, ident, None) => ident.node.to_string(),
|
2017-01-03 22:40:42 -06:00
|
|
|
|
PatKind::Path(ref path) => print::to_string(print::NO_ANN, |s| s.print_qpath(path, false)),
|
2016-01-30 06:48:39 -06:00
|
|
|
|
_ => return,
|
2016-01-12 18:19:27 -06:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for &(ty_path, pat_path) in candidates {
|
2017-03-09 03:58:31 -06:00
|
|
|
|
if path == *pat_path && match_type(cx, ty, ty_path) {
|
2017-03-03 08:44:23 -06:00
|
|
|
|
report_single_match_single_pattern(cx, ex, arms, expr, els);
|
2016-01-12 18:19:27 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-22 19:19:32 -06:00
|
|
|
|
fn check_match_bool(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
|
|
|
|
|
// type of expression == bool
|
2017-01-13 10:04:56 -06:00
|
|
|
|
if cx.tables.expr_ty(ex).sty == ty::TyBool {
|
2017-08-09 02:30:56 -05:00
|
|
|
|
span_lint_and_then(
|
|
|
|
|
cx,
|
|
|
|
|
MATCH_BOOL,
|
|
|
|
|
expr.span,
|
|
|
|
|
"you seem to be trying to match on a boolean expression",
|
|
|
|
|
move |db| {
|
|
|
|
|
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 {
|
|
|
|
|
match lit.node {
|
|
|
|
|
LitKind::Bool(true) => Some((&*arms[0].body, &*arms[1].body)),
|
|
|
|
|
LitKind::Bool(false) => Some((&*arms[1].body, &*arms[0].body)),
|
|
|
|
|
_ => None,
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
None
|
2016-07-03 12:13:01 -05:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
|
|
|
|
|
2017-08-09 02:30:56 -05:00
|
|
|
|
if let Some((true_expr, false_expr)) = exprs {
|
|
|
|
|
let sugg = match (is_unit_expr(true_expr), is_unit_expr(false_expr)) {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
(false, false) => Some(format!(
|
|
|
|
|
"if {} {} else {}",
|
|
|
|
|
snippet(cx, ex.span, "b"),
|
|
|
|
|
expr_block(cx, true_expr, None, ".."),
|
|
|
|
|
expr_block(cx, false_expr, None, "..")
|
|
|
|
|
)),
|
|
|
|
|
(false, true) => Some(format!(
|
|
|
|
|
"if {} {}",
|
|
|
|
|
snippet(cx, ex.span, "b"),
|
|
|
|
|
expr_block(cx, true_expr, None, "..")
|
|
|
|
|
)),
|
2017-08-09 02:30:56 -05:00
|
|
|
|
(true, false) => {
|
|
|
|
|
let test = Sugg::hir(cx, ex, "..");
|
|
|
|
|
Some(format!("if {} {}", !test, expr_block(cx, false_expr, None, "..")))
|
|
|
|
|
},
|
|
|
|
|
(true, true) => None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if let Some(sugg) = sugg {
|
|
|
|
|
db.span_suggestion(expr.span, "consider using an if/else expression", sugg);
|
|
|
|
|
}
|
2016-04-14 13:14:03 -05:00
|
|
|
|
}
|
2015-10-21 01:24:56 -05:00
|
|
|
|
}
|
2017-08-09 02:30:56 -05:00
|
|
|
|
},
|
|
|
|
|
);
|
2015-12-22 19:19:32 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2017-09-13 08:34:04 -05:00
|
|
|
|
fn check_overlapping_arms<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ex: &'tcx Expr, arms: &'tcx [Arm]) {
|
2017-01-13 10:04:56 -06:00
|
|
|
|
if arms.len() >= 2 && cx.tables.expr_ty(ex).is_integral() {
|
2018-03-13 05:38:11 -05:00
|
|
|
|
let ranges = all_ranges(cx, arms);
|
2016-03-15 14:09:53 -05:00
|
|
|
|
let type_ranges = type_ranges(&ranges);
|
|
|
|
|
if !type_ranges.is_empty() {
|
|
|
|
|
if let Some((start, end)) = overlapping(&type_ranges) {
|
2017-08-09 02:30:56 -05:00
|
|
|
|
span_note_and_lint(
|
|
|
|
|
cx,
|
|
|
|
|
MATCH_OVERLAPPING_ARM,
|
|
|
|
|
start.span,
|
|
|
|
|
"some ranges overlap",
|
|
|
|
|
end.span,
|
|
|
|
|
"overlaps with this",
|
|
|
|
|
);
|
2016-03-15 14:09:53 -05:00
|
|
|
|
}
|
2015-08-21 12:32:21 -05:00
|
|
|
|
}
|
2015-12-22 19:19:32 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-11 00:57:50 -06:00
|
|
|
|
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 {
|
|
|
|
|
if let PatKind::TupleStruct(ref path, ref inner, _) = arm.pats[0].node {
|
|
|
|
|
let path_str = print::to_string(print::NO_ANN, |s| s.print_qpath(path, false));
|
2017-10-23 14:18:02 -05:00
|
|
|
|
if_chain! {
|
|
|
|
|
if path_str == "Err";
|
|
|
|
|
if inner.iter().any(|pat| pat.node == PatKind::Wild);
|
2018-05-17 04:21:15 -05:00
|
|
|
|
if let ExprBlock(ref block, _) = arm.body.node;
|
2017-10-23 14:18:02 -05:00
|
|
|
|
if is_panic_block(block);
|
|
|
|
|
then {
|
|
|
|
|
// `Err(_)` arm with `panic!` found
|
|
|
|
|
span_note_and_lint(cx,
|
|
|
|
|
MATCH_WILD_ERR_ARM,
|
|
|
|
|
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 \
|
|
|
|
|
or use unreachable macro");
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-02-11 00:57:50 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-11 07:42:42 -06:00
|
|
|
|
// If the block contains only a `panic!` macro (as expression or statement)
|
2017-03-31 17:14:04 -05:00
|
|
|
|
fn is_panic_block(block: &Block) -> bool {
|
2017-02-11 00:57:50 -06:00
|
|
|
|
match (&block.expr, block.stmts.len(), block.stmts.first()) {
|
2017-02-11 07:47:26 -06:00
|
|
|
|
(&Some(ref exp), 0, _) => {
|
2017-03-31 17:14:04 -05:00
|
|
|
|
is_expn_of(exp.span, "panic").is_some() && is_expn_of(exp.span, "unreachable").is_none()
|
2017-02-11 07:47:26 -06:00
|
|
|
|
},
|
2017-02-11 19:16:37 -06:00
|
|
|
|
(&None, 1, Some(stmt)) => {
|
2017-03-31 17:14:04 -05:00
|
|
|
|
is_expn_of(stmt.span, "panic").is_some() && is_expn_of(stmt.span, "unreachable").is_none()
|
2017-02-11 07:47:26 -06:00
|
|
|
|
},
|
|
|
|
|
_ => false,
|
2017-02-11 00:57:50 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-04 06:41:54 -06:00
|
|
|
|
fn check_match_ref_pats(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
|
2015-12-22 19:19:32 -06:00
|
|
|
|
if has_only_ref_pats(arms) {
|
2018-02-04 06:41:54 -06:00
|
|
|
|
let mut suggs = Vec::new();
|
|
|
|
|
let (title, msg) = if let ExprAddrOf(Mutability::MutImmutable, ref inner) = ex.node {
|
|
|
|
|
suggs.push((ex.span, Sugg::hir(cx, inner, "..").to_string()));
|
|
|
|
|
(
|
2017-09-05 04:33:04 -05:00
|
|
|
|
"you don't need to add `&` to both the expression and the patterns",
|
2018-02-04 06:41:54 -06:00
|
|
|
|
"try",
|
|
|
|
|
)
|
2015-12-22 19:19:32 -06:00
|
|
|
|
} else {
|
2018-02-04 06:41:54 -06:00
|
|
|
|
suggs.push((ex.span, Sugg::hir(cx, ex, "..").deref().to_string()));
|
|
|
|
|
(
|
2017-08-09 02:30:56 -05:00
|
|
|
|
"you don't need to add `&` to all patterns",
|
2018-02-04 06:41:54 -06:00
|
|
|
|
"instead of prefixing all patterns with `&`, you can dereference the expression",
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
suggs.extend(arms.iter().flat_map(|a| &a.pats).filter_map(|p| {
|
|
|
|
|
if let PatKind::Ref(ref refp, _) = p.node {
|
|
|
|
|
Some((p.span, snippet(cx, refp.span, "..").to_string()))
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
span_lint_and_then(cx, MATCH_REF_PATS, expr.span, title, |db| {
|
|
|
|
|
multispan_sugg(db, msg.to_owned(), suggs);
|
|
|
|
|
});
|
2015-08-21 12:32:21 -05:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-19 16:22:16 -06:00
|
|
|
|
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() {
|
2017-12-20 03:39:48 -06:00
|
|
|
|
let arm_ref: Option<BindingAnnotation> = if is_none_arm(&arms[0]) {
|
|
|
|
|
is_ref_some_arm(&arms[1])
|
|
|
|
|
} else if is_none_arm(&arms[1]) {
|
|
|
|
|
is_ref_some_arm(&arms[0])
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
|
|
|
|
if let Some(rb) = arm_ref {
|
|
|
|
|
let suggestion = if rb == BindingAnnotation::Ref { "as_ref" } else { "as_mut" };
|
2017-12-19 16:22:16 -06:00
|
|
|
|
span_lint_and_sugg(
|
|
|
|
|
cx,
|
|
|
|
|
MATCH_AS_REF,
|
|
|
|
|
expr.span,
|
2017-12-20 03:39:48 -06:00
|
|
|
|
&format!("use {}() instead", suggestion),
|
2017-12-19 16:22:16 -06:00
|
|
|
|
"try this",
|
2017-12-20 03:39:48 -06:00
|
|
|
|
format!("{}.{}()", snippet(cx, ex.span, "_"), suggestion)
|
2017-12-19 16:22:16 -06:00
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-19 11:48:29 -05:00
|
|
|
|
/// Get all arms that are unbounded `PatRange`s.
|
2017-11-04 14:55:56 -05:00
|
|
|
|
fn all_ranges<'a, 'tcx>(
|
|
|
|
|
cx: &LateContext<'a, 'tcx>,
|
|
|
|
|
arms: &'tcx [Arm],
|
2018-03-13 05:38:11 -05:00
|
|
|
|
) -> Vec<SpannedRange<Constant>> {
|
2015-12-22 18:14:10 -06:00
|
|
|
|
arms.iter()
|
2016-06-21 06:51:44 -05:00
|
|
|
|
.flat_map(|arm| {
|
2017-08-09 02:30:56 -05:00
|
|
|
|
if let Arm {
|
|
|
|
|
ref pats,
|
|
|
|
|
guard: None,
|
|
|
|
|
..
|
|
|
|
|
} = *arm
|
|
|
|
|
{
|
|
|
|
|
pats.iter()
|
|
|
|
|
} else {
|
|
|
|
|
[].iter()
|
|
|
|
|
}.filter_map(|pat| {
|
2018-03-13 05:38:11 -05:00
|
|
|
|
if let PatKind::Range(ref lhs, ref rhs, ref range_end) = pat.node {
|
2018-05-13 06:16:31 -05:00
|
|
|
|
let lhs = constant(cx, cx.tables, lhs)?.0;
|
|
|
|
|
let rhs = constant(cx, cx.tables, rhs)?.0;
|
2018-03-13 05:38:11 -05:00
|
|
|
|
let rhs = match *range_end {
|
|
|
|
|
RangeEnd::Included => Bound::Included(rhs),
|
|
|
|
|
RangeEnd::Excluded => Bound::Excluded(rhs),
|
|
|
|
|
};
|
|
|
|
|
return Some(SpannedRange { span: pat.span, node: (lhs, rhs) });
|
2017-10-23 14:18:02 -05:00
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2018-03-13 05:38:11 -05:00
|
|
|
|
if let PatKind::Lit(ref value) = pat.node {
|
2018-05-13 06:16:31 -05:00
|
|
|
|
let value = constant(cx, cx.tables, value)?.0;
|
2018-03-13 05:38:11 -05:00
|
|
|
|
return Some(SpannedRange { span: pat.span, node: (value.clone(), Bound::Included(value)) });
|
2017-10-23 14:18:02 -05:00
|
|
|
|
}
|
2015-12-22 19:06:18 -06:00
|
|
|
|
|
2017-08-09 02:30:56 -05:00
|
|
|
|
None
|
|
|
|
|
})
|
2015-12-22 18:14:10 -06:00
|
|
|
|
})
|
|
|
|
|
.collect()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Eq, PartialEq)]
|
2015-12-23 10:48:30 -06:00
|
|
|
|
pub struct SpannedRange<T> {
|
|
|
|
|
pub span: Span,
|
2017-01-30 05:30:16 -06:00
|
|
|
|
pub node: (T, Bound<T>),
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-13 05:38:11 -05:00
|
|
|
|
type TypedRanges = Vec<SpannedRange<u128>>;
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
2017-08-09 02:30:56 -05:00
|
|
|
|
/// Get all `Int` ranges or all `Uint` ranges. Mixed types are an error anyway
|
|
|
|
|
/// and other types than
|
2015-12-22 18:14:10 -06:00
|
|
|
|
/// `Uint` and `Int` probably don't make sense.
|
2018-03-13 05:38:11 -05:00
|
|
|
|
fn type_ranges(ranges: &[SpannedRange<Constant>]) -> TypedRanges {
|
2017-08-09 02:30:56 -05:00
|
|
|
|
ranges
|
|
|
|
|
.iter()
|
2017-01-30 05:30:16 -06:00
|
|
|
|
.filter_map(|range| match range.node {
|
2017-11-04 14:55:56 -05:00
|
|
|
|
(
|
2018-03-13 05:38:11 -05:00
|
|
|
|
Constant::Int(start),
|
|
|
|
|
Bound::Included(Constant::Int(end)),
|
2017-11-04 14:55:56 -05:00
|
|
|
|
) => Some(SpannedRange {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
span: range.span,
|
|
|
|
|
node: (start, Bound::Included(end)),
|
|
|
|
|
}),
|
2017-11-04 14:55:56 -05:00
|
|
|
|
(
|
2018-03-13 05:38:11 -05:00
|
|
|
|
Constant::Int(start),
|
|
|
|
|
Bound::Excluded(Constant::Int(end)),
|
2017-11-04 14:55:56 -05:00
|
|
|
|
) => Some(SpannedRange {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
span: range.span,
|
|
|
|
|
node: (start, Bound::Excluded(end)),
|
|
|
|
|
}),
|
2017-11-04 14:55:56 -05:00
|
|
|
|
(
|
2018-03-13 05:38:11 -05:00
|
|
|
|
Constant::Int(start),
|
2017-11-04 14:55:56 -05:00
|
|
|
|
Bound::Unbounded,
|
|
|
|
|
) => Some(SpannedRange {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
span: range.span,
|
|
|
|
|
node: (start, Bound::Unbounded),
|
|
|
|
|
}),
|
2017-01-30 05:30:16 -06:00
|
|
|
|
_ => None,
|
2016-12-20 11:21:30 -06:00
|
|
|
|
})
|
|
|
|
|
.collect()
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-21 12:32:21 -05:00
|
|
|
|
fn is_unit_expr(expr: &Expr) -> bool {
|
|
|
|
|
match expr.node {
|
|
|
|
|
ExprTup(ref v) if v.is_empty() => true,
|
2018-05-17 04:21:15 -05:00
|
|
|
|
ExprBlock(ref b, _) if b.stmts.is_empty() && b.expr.is_none() => true,
|
2015-08-21 12:32:21 -05:00
|
|
|
|
_ => false,
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-21 12:49:00 -05:00
|
|
|
|
|
2017-12-19 16:22:16 -06:00
|
|
|
|
// Checks if arm has the form `None => None`
|
|
|
|
|
fn is_none_arm(arm: &Arm) -> bool {
|
|
|
|
|
match arm.pats[0].node {
|
|
|
|
|
PatKind::Path(ref path) if match_qpath(path, &paths::OPTION_NONE) => true,
|
|
|
|
|
_ => false,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Checks if arm has the form `Some(ref v) => Some(v)` (checks for `ref` and `ref mut`)
|
2017-12-20 03:39:48 -06:00
|
|
|
|
fn is_ref_some_arm(arm: &Arm) -> Option<BindingAnnotation> {
|
2017-12-19 16:22:16 -06:00
|
|
|
|
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 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 match_qpath(some_path, &paths::OPTION_SOME) && args.len() == 1;
|
|
|
|
|
if let ExprPath(ref qpath) = args[0].node;
|
|
|
|
|
if let &QPath::Resolved(_, ref path2) = qpath;
|
2017-12-20 03:39:48 -06:00
|
|
|
|
if path2.segments.len() == 1 && ident.node == path2.segments[0].name;
|
2017-12-19 16:22:16 -06:00
|
|
|
|
then {
|
2017-12-20 03:39:48 -06:00
|
|
|
|
return Some(rb)
|
2017-12-19 16:22:16 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-12-20 03:39:48 -06:00
|
|
|
|
None
|
2017-12-19 16:22:16 -06:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-21 12:49:00 -05:00
|
|
|
|
fn has_only_ref_pats(arms: &[Arm]) -> bool {
|
2016-01-03 22:26:12 -06:00
|
|
|
|
let mapped = arms.iter()
|
2016-12-20 11:21:30 -06:00
|
|
|
|
.flat_map(|a| &a.pats)
|
|
|
|
|
.map(|p| {
|
|
|
|
|
match p.node {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
PatKind::Ref(..) => Some(true), // &-patterns
|
2016-12-20 11:21:30 -06:00
|
|
|
|
PatKind::Wild => Some(false), // an "anything" wildcard is also fine
|
2017-09-05 04:33:04 -05:00
|
|
|
|
_ => None, // any other pattern is not fine
|
2016-12-20 11:21:30 -06:00
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.collect::<Option<Vec<bool>>>();
|
2015-09-17 00:24:11 -05:00
|
|
|
|
// look for Some(v) where there's at least one true element
|
|
|
|
|
mapped.map_or(false, |v| v.iter().any(|el| *el))
|
2015-08-21 12:49:00 -05:00
|
|
|
|
}
|
2015-11-24 11:47:17 -06:00
|
|
|
|
|
2015-12-23 10:48:30 -06:00
|
|
|
|
pub fn overlapping<T>(ranges: &[SpannedRange<T>]) -> Option<(&SpannedRange<T>, &SpannedRange<T>)>
|
2017-08-09 02:30:56 -05:00
|
|
|
|
where
|
|
|
|
|
T: Copy + Ord,
|
2016-01-03 22:26:12 -06:00
|
|
|
|
{
|
2015-12-22 18:14:10 -06:00
|
|
|
|
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
|
|
|
|
enum Kind<'a, T: 'a> {
|
|
|
|
|
Start(T, &'a SpannedRange<T>),
|
2017-01-30 05:30:16 -06:00
|
|
|
|
End(Bound<T>, &'a SpannedRange<T>),
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a, T: Copy> Kind<'a, T> {
|
|
|
|
|
fn range(&self) -> &'a SpannedRange<T> {
|
|
|
|
|
match *self {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
Kind::Start(_, r) | Kind::End(_, r) => r,
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-30 05:30:16 -06:00
|
|
|
|
fn value(self) -> Bound<T> {
|
2015-12-22 18:14:10 -06:00
|
|
|
|
match self {
|
2017-01-30 05:30:16 -06:00
|
|
|
|
Kind::Start(t, _) => Bound::Included(t),
|
2016-04-14 13:14:03 -05:00
|
|
|
|
Kind::End(t, _) => t,
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a, T: Copy + Ord> PartialOrd for Kind<'a, T> {
|
|
|
|
|
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
|
|
|
|
Some(self.cmp(other))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a, T: Copy + Ord> Ord for Kind<'a, T> {
|
|
|
|
|
fn cmp(&self, other: &Self) -> Ordering {
|
2017-01-30 05:30:16 -06:00
|
|
|
|
match (self.value(), other.value()) {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
(Bound::Included(a), Bound::Included(b)) | (Bound::Excluded(a), Bound::Excluded(b)) => a.cmp(&b),
|
2017-01-31 01:08:54 -06:00
|
|
|
|
// Range patterns cannot be unbounded (yet)
|
2017-09-05 04:33:04 -05:00
|
|
|
|
(Bound::Unbounded, _) | (_, Bound::Unbounded) => unimplemented!(),
|
|
|
|
|
(Bound::Included(a), Bound::Excluded(b)) => match a.cmp(&b) {
|
|
|
|
|
Ordering::Equal => Ordering::Greater,
|
|
|
|
|
other => other,
|
2017-01-30 05:30:16 -06:00
|
|
|
|
},
|
2017-09-05 04:33:04 -05:00
|
|
|
|
(Bound::Excluded(a), Bound::Included(b)) => match a.cmp(&b) {
|
|
|
|
|
Ordering::Equal => Ordering::Less,
|
|
|
|
|
other => other,
|
2017-01-30 05:30:16 -06:00
|
|
|
|
},
|
|
|
|
|
}
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-03 22:26:12 -06:00
|
|
|
|
let mut values = Vec::with_capacity(2 * ranges.len());
|
2015-12-22 18:14:10 -06:00
|
|
|
|
|
|
|
|
|
for r in ranges {
|
2016-04-26 10:05:39 -05:00
|
|
|
|
values.push(Kind::Start(r.node.0, r));
|
|
|
|
|
values.push(Kind::End(r.node.1, r));
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
values.sort();
|
|
|
|
|
|
|
|
|
|
for (a, b) in values.iter().zip(values.iter().skip(1)) {
|
|
|
|
|
match (a, b) {
|
2017-09-05 04:33:04 -05:00
|
|
|
|
(&Kind::Start(_, ra), &Kind::End(_, rb)) => if ra.node != rb.node {
|
|
|
|
|
return Some((ra, rb));
|
2016-12-20 11:21:30 -06:00
|
|
|
|
},
|
2017-01-30 05:30:16 -06:00
|
|
|
|
(&Kind::End(a, _), &Kind::Start(b, _)) if a != Bound::Included(b) => (),
|
2016-04-26 10:05:39 -05:00
|
|
|
|
_ => return Some((a.range(), b.range())),
|
2015-12-22 18:14:10 -06:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
None
|
|
|
|
|
}
|