squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Use try_eval_usize over eval_usize

Browse source
This commit is contained in:
Yuki Okushi 2020-03-03 05:53:41 +09:00
parent b96c3ca811
commit 3d44ad2e32
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clippy_lints/src/consts.rs
View file

@ -231,7 +231,13 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
ExprKind::Tup(ref tup) => self.multi(tup).map(Constant::Tuple),
ExprKind::Repeat(ref value, _) => {
let n = match self.tables.expr_ty(e).kind {
ty::Array(_, n) => n.eval_usize(self.lcx.tcx, self.lcx.param_env),
ty::Array(_, n) => {
if let Some(n) = n.try_eval_usize(self.lcx.tcx, self.lcx.param_env) {
n
} else {
return None;
}
},
_ => span_bug!(e.span, "typeck error"),
};
self.expr(value).map(|v| Constant::Repeat(Box::new(v), n))

6
clippy_lints/src/indexing_slicing.rs
View file

@ -92,7 +92,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for IndexingSlicing {
if let Some(range) = higher::range(cx, index) {
// Ranged indexes, i.e., &x[n..m], &x[n..], &x[..n] and &x[..]
if let ty::Array(_, s) = ty.kind {
let size: u128 = s.eval_usize(cx.tcx, cx.param_env).into();
let size: u128 = if let Some(size) = s.try_eval_usize(cx.tcx, cx.param_env) {
size.into()
} else {
return;
};
let const_range = to_const_range(cx, range, size);

8
clippy_lints/src/methods/mod.rs
View file

@ -2324,7 +2324,13 @@ fn derefs_to_slice<'a, 'tcx>(
ty::Slice(_) => true,
ty::Adt(def, _) if def.is_box() => may_slice(cx, ty.boxed_ty()),
ty::Adt(..) => is_type_diagnostic_item(cx, ty, Symbol::intern("vec_type")),
ty::Array(_, size) => size.eval_usize(cx.tcx, cx.param_env) < 32,
ty::Array(_, size) => {
if let Some(size) = size.try_eval_usize(cx.tcx, cx.param_env) {
size < 32
} else {
false
}
},
ty::Ref(_, inner, _) => may_slice(cx, inner),
_ => false,
}