From 8e353bb8eabc761d8fd800a985a859dd635adaa2 Mon Sep 17 00:00:00 2001
From: Ellen <supbscripter@gmail.com>
Date: Wed, 3 Mar 2021 11:26:23 +0000
Subject: Fix tidy err and review

---
 .../src/traits/const_evaluatable.rs                      | 10 ++++------
 compiler/rustc_trait_selection/src/traits/fulfill.rs     | 16 ++++++----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
index 49575f2116f..6aaaa16abfd 100644
--- a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
+++ b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
@@ -161,12 +161,10 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
 
     debug!(?concrete, "is_const_evaluatable");
     match concrete {
-        Err(ErrorHandled::TooGeneric) => {
-            Err(match substs.has_infer_types_or_consts() {
-                true => NotConstEvaluatable::MentionsInfer,
-                false => NotConstEvaluatable::MentionsParam,
-            })
-        }
+        Err(ErrorHandled::TooGeneric) => Err(match substs.has_infer_types_or_consts() {
+            true => NotConstEvaluatable::MentionsInfer,
+            false => NotConstEvaluatable::MentionsParam,
+        }),
         Err(ErrorHandled::Linted) => {
             infcx.tcx.sess.delay_span_bug(span, "constant in type had error reported as lint");
             Err(NotConstEvaluatable::Error(ErrorReported))
diff --git a/compiler/rustc_trait_selection/src/traits/fulfill.rs b/compiler/rustc_trait_selection/src/traits/fulfill.rs
index ee6d957237b..4d555e74c6a 100644
--- a/compiler/rustc_trait_selection/src/traits/fulfill.rs
+++ b/compiler/rustc_trait_selection/src/traits/fulfill.rs
@@ -506,16 +506,12 @@ impl<'a, 'b, 'tcx> FulfillProcessor<'a, 'b, 'tcx> {
                             );
                             ProcessResult::Unchanged
                         }
-                        Err(NotConstEvaluatable::MentionsParam) => ProcessResult::Error(
-                            CodeSelectionError(SelectionError::NotConstEvaluatable(
-                                NotConstEvaluatable::MentionsParam,
-                            )),
-                        ),
-                        Err(NotConstEvaluatable::Error(e)) => {
-                            ProcessResult::Error(CodeSelectionError(
-                                SelectionError::NotConstEvaluatable(NotConstEvaluatable::Error(e)),
-                            ))
-                        }
+                        Err(
+                            e @ NotConstEvaluatable::MentionsParam
+                            | e @ NotConstEvaluatable::Error(_),
+                        ) => ProcessResult::Error(CodeSelectionError(
+                            SelectionError::NotConstEvaluatable(e),
+                        )),
                     }
                 }
 
-- 
cgit 1.4.1-3-g733a5