nits

2 files changed, 6 insertions, 5 deletions

diff --git a/compiler/rustc_borrowck/src/renumber.rs b/compiler/rustc_borrowck/src/renumber.rs
index 09035dcefa1..63b2088f7fc 100644
--- a/compiler/rustc_borrowck/src/renumber.rs
+++ b/compiler/rustc_borrowck/src/renumber.rs
@@ -38,6 +38,11 @@ where
     })
 }
 
+// FIXME(valtrees): This function is necessary because `fold_regions`
+// panics for mir constants in the visitor.
+//
+// Once `visit_mir_constant` is removed we can also remove this function
+// and just use `renumber_regions`.
 fn renumber_regions_in_mir_constant<'tcx>(
     infcx: &InferCtxt<'_, 'tcx>,
     value: ConstantKind<'tcx>,
diff --git a/compiler/rustc_borrowck/src/type_check/mod.rs b/compiler/rustc_borrowck/src/type_check/mod.rs
index 6854e0e8878..500f9ae08c5 100644
--- a/compiler/rustc_borrowck/src/type_check/mod.rs
+++ b/compiler/rustc_borrowck/src/type_check/mod.rs
@@ -1816,12 +1816,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
     fn check_operand(&mut self, op: &Operand<'tcx>, location: Location) {
         if let Operand::Constant(constant) = op {
             let maybe_uneval = match constant.literal {
-                ConstantKind::Ty(ct) => match ct.kind() {
-                    ty::ConstKind::Unevaluated(uv) => Some(uv.expand()),
-                    _ => None,
-                },
+                ConstantKind::Val(..) | ConstantKind::Ty(_) => None,
                 ConstantKind::Unevaluated(uv, _) => Some(uv),
-                ConstantKind::Val(..) => None,
             };
 
             if let Some(uv) = maybe_uneval {