From 25ed5d5db295e1fbf27e511c9159e67c22b08f43 Mon Sep 17 00:00:00 2001
From: Boxy <supbscripter@gmail.com>
Date: Thu, 6 Oct 2022 07:00:38 +0100
Subject: [PATCH] reviews

---
 .../rustc_hir_analysis/src/check/check.rs     |  1 -
 .../src/check/compare_method.rs               | 85 ++++++++++---------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/compiler/rustc_hir_analysis/src/check/check.rs b/compiler/rustc_hir_analysis/src/check/check.rs
index c47fdaefd60..f331354a044 100644
--- a/compiler/rustc_hir_analysis/src/check/check.rs
+++ b/compiler/rustc_hir_analysis/src/check/check.rs
@@ -1044,7 +1044,6 @@ fn check_impl_items_against_trait<'tcx>(
         let impl_item_full = tcx.hir().impl_item(impl_item.id);
         match impl_item_full.kind {
             hir::ImplItemKind::Const(..) => {
-                // Find associated const definition.
                 let _ = tcx.compare_assoc_const_impl_item_with_trait_item((
                     impl_item.id.def_id.def_id,
                     ty_impl_item.trait_item_def_id.unwrap(),
diff --git a/compiler/rustc_hir_analysis/src/check/compare_method.rs b/compiler/rustc_hir_analysis/src/check/compare_method.rs
index 75e56cd4be7..d006948c587 100644
--- a/compiler/rustc_hir_analysis/src/check/compare_method.rs
+++ b/compiler/rustc_hir_analysis/src/check/compare_method.rs
@@ -1349,53 +1349,54 @@ pub(crate) fn raw_compare_const_impl<'tcx>(
 
         debug!("compare_const_impl: trait_ty={:?}", trait_ty);
 
-        let maybe_error_reported = infcx
+        let err = infcx
             .at(&cause, param_env)
             .sup(trait_ty, impl_ty)
-            .map(|ok| ocx.register_infer_ok_obligations(ok))
-            .map_err(|terr| {
-                debug!(
-                    "checking associated const for compatibility: impl ty {:?}, trait ty {:?}",
-                    impl_ty, trait_ty
-                );
+            .map(|ok| ocx.register_infer_ok_obligations(ok));
 
-                // Locate the Span containing just the type of the offending impl
-                match tcx.hir().expect_impl_item(impl_const_item_def).kind {
-                    ImplItemKind::Const(ref ty, _) => cause.span = ty.span,
-                    _ => bug!("{:?} is not a impl const", impl_const_item),
+        if let Err(terr) = err {
+            debug!(
+                "checking associated const for compatibility: impl ty {:?}, trait ty {:?}",
+                impl_ty, trait_ty
+            );
+
+            // Locate the Span containing just the type of the offending impl
+            match tcx.hir().expect_impl_item(impl_const_item_def).kind {
+                ImplItemKind::Const(ref ty, _) => cause.span = ty.span,
+                _ => bug!("{:?} is not a impl const", impl_const_item),
+            }
+
+            let mut diag = struct_span_err!(
+                tcx.sess,
+                cause.span,
+                E0326,
+                "implemented const `{}` has an incompatible type for trait",
+                trait_const_item.name
+            );
+
+            let trait_c_span = trait_const_item_def.as_local().map(|trait_c_def_id| {
+                // Add a label to the Span containing just the type of the const
+                match tcx.hir().expect_trait_item(trait_c_def_id).kind {
+                    TraitItemKind::Const(ref ty, _) => ty.span,
+                    _ => bug!("{:?} is not a trait const", trait_const_item),
                 }
-
-                let mut diag = struct_span_err!(
-                    tcx.sess,
-                    cause.span,
-                    E0326,
-                    "implemented const `{}` has an incompatible type for trait",
-                    trait_const_item.name
-                );
-
-                let trait_c_span = trait_const_item_def.as_local().map(|trait_c_def_id| {
-                    // Add a label to the Span containing just the type of the const
-                    match tcx.hir().expect_trait_item(trait_c_def_id).kind {
-                        TraitItemKind::Const(ref ty, _) => ty.span,
-                        _ => bug!("{:?} is not a trait const", trait_const_item),
-                    }
-                });
-
-                infcx.note_type_err(
-                    &mut diag,
-                    &cause,
-                    trait_c_span.map(|span| (span, "type in trait".to_owned())),
-                    Some(infer::ValuePairs::Terms(ExpectedFound {
-                        expected: trait_ty.into(),
-                        found: impl_ty.into(),
-                    })),
-                    terr,
-                    false,
-                    false,
-                );
-                diag.emit()
             });
 
+            infcx.note_type_err(
+                &mut diag,
+                &cause,
+                trait_c_span.map(|span| (span, "type in trait".to_owned())),
+                Some(infer::ValuePairs::Terms(ExpectedFound {
+                    expected: trait_ty.into(),
+                    found: impl_ty.into(),
+                })),
+                terr,
+                false,
+                false,
+            );
+            return Err(diag.emit());
+        };
+
         // Check that all obligations are satisfied by the implementation's
         // version.
         let errors = ocx.select_all_or_error();
@@ -1407,7 +1408,7 @@ pub(crate) fn raw_compare_const_impl<'tcx>(
         let outlives_environment = OutlivesEnvironment::new(param_env);
         infcx
             .check_region_obligations_and_report_errors(impl_const_item_def, &outlives_environment);
-        maybe_error_reported
+        Ok(())
     })
 }