dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply review comments

This commit is contained in:
Yuki Okushi 2020-01-11 23:21:09 +09:00
parent 39947992b5
commit 3bdf404076
1 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
clippy_lints/src/matches.rs
View File

@ -716,41 +716,22 @@ fn all_ranges<'a, 'tcx>(
} = *arm
{
if let PatKind::Range(ref lhs, ref rhs, range_end) = pat.kind {
match (lhs, rhs) {
(Some(lhs), Some(rhs)) => {
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),
});
},
(None, Some(rhs)) => {
let lhs = miri_to_const(ty.numeric_min_val(cx.tcx)?)?;
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),
});
},
(Some(lhs), None) => {
let lhs = constant(cx, cx.tables, lhs)?.0;
let rhs = miri_to_const(ty.numeric_max_val(cx.tcx)?)?;
return Some(SpannedRange {
span: pat.span,
node: (lhs, Bound::Excluded(rhs)),
});
},
_ => return None,
}
let lhs = match lhs {
Some(lhs) => constant(cx, cx.tables, lhs)?.0,
None => miri_to_const(ty.numeric_min_val(cx.tcx)?)?,
};
let rhs = match rhs {
Some(rhs) => constant(cx, cx.tables, rhs)?.0,
None => miri_to_const(ty.numeric_max_val(cx.tcx)?)?,
};
let rhs = match range_end {
RangeEnd::Included => Bound::Included(rhs),
RangeEnd::Excluded => Bound::Excluded(rhs),
};
return Some(SpannedRange {
span: pat.span,
node: (lhs, rhs),
});
}
if let PatKind::Lit(ref value) = pat.kind {