From 94867fbbb8bb0562ee0d6263668610fb858429dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Tue, 3 Mar 2020 15:13:25 +0100
Subject: [PATCH] use question mark operator

---
 clippy_lints/src/consts.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/clippy_lints/src/consts.rs b/clippy_lints/src/consts.rs
index ceda5d1a7c37..ec8ba70bf741 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))