From 51e15ac7099c00efb425219cf17c8e412d1e14d7 Mon Sep 17 00:00:00 2001
From: Alan Egerton <eggyal@gmail.com>
Date: Sat, 27 Nov 2021 11:53:00 +0000
Subject: [PATCH] Remove erroneous merge conflict

---
 compiler/rustc_middle/src/ty/subst.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compiler/rustc_middle/src/ty/subst.rs b/compiler/rustc_middle/src/ty/subst.rs
index 0767224ad92..ffa495ce480 100644
--- a/compiler/rustc_middle/src/ty/subst.rs
+++ b/compiler/rustc_middle/src/ty/subst.rs
@@ -513,10 +513,6 @@ impl<'a, 'tcx> TypeFolder<'tcx> for SubstFolder<'a, 'tcx> {
         &mut self,
         c: &'tcx ty::Const<'tcx>,
     ) -> Result<&'tcx ty::Const<'tcx>, Self::Error> {
-        if !c.potentially_needs_subst() {
-            return Ok(c);
-        }
-
         if let ty::ConstKind::Param(p) = c.val {
             Ok(self.const_for_param(p, c))
         } else {