about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2020-03-03 15:13:25 +0100
committerMatthias Krüger <matthias.krueger@famsik.de>2020-03-03 15:13:25 +0100
commit94867fbbb8bb0562ee0d6263668610fb858429dc (patch)
treeb1be105a5cbd40f5a3cbbe2d5fa82f8e8ddbfd97
parentd74229b97dfca686ebd56522340d501496d2d3f2 (diff)
downloadrust-94867fbbb8bb0562ee0d6263668610fb858429dc.tar.gz
rust-94867fbbb8bb0562ee0d6263668610fb858429dc.zip
use question mark operator
-rw-r--r--clippy_lints/src/consts.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs
index ceda5d1a7c3..ec8ba70bf74 100644
--- a/clippy_lints/src/consts.rs
+++ b/clippy_lints/src/consts.rs
@@ -231,13 +231,7 @@ 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) => {
-                        if let Some(n) = n.try_eval_usize(self.lcx.tcx, self.lcx.param_env) {
-                            n
-                        } else {
-                            return None;
-                        }
-                    },
+                    ty::Array(_, n) => n.try_eval_usize(self.lcx.tcx, self.lcx.param_env)?,
                     _ => span_bug!(e.span, "typeck error"),
                 };
                 self.expr(value).map(|v| Constant::Repeat(Box::new(v), n))