Rollup merge of #81333 - RalfJung:const-err-simplify, r=oli-obk

clean up some const error reporting around promoteds These are some error reporting simplifications enabled by rust-lang/rust#80579. Further simplifications are possible but could be blocked on making `const_err` a hard error. r? ``````@oli-obk``````
rust-lang · Jan 29, 2021 · e67b72d · e67b72d
2 parents c3d7dc9 + d6eb4f5
commit e67b72d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/constant.rs b/src/constant.rs
@@ -134,11 +134,9 @@ pub(crate) fn codegen_constant<'tcx>(
             {
                 Ok(const_val) => const_val,
                 Err(_) => {
-                    if promoted.is_none() {
-                        fx.tcx
-                            .sess
-                            .span_err(constant.span, "erroneous constant encountered");
-                    }
+                    fx.tcx
+                        .sess
+                        .span_err(constant.span, "erroneous constant encountered");
                     return crate::trap::trap_unreachable_ret_value(
                         fx,
                         fx.layout_of(const_.ty),