diff options
| author | Alan Egerton <eggyal@gmail.com> | 2021-11-27 11:53:00 +0000 |
|---|---|---|
| committer | Alan Egerton <eggyal@gmail.com> | 2021-11-27 11:53:00 +0000 |
| commit | 51e15ac7099c00efb425219cf17c8e412d1e14d7 (patch) | |
| tree | ac9cbb298965cc6a6b777b7b989be0d393522273 | |
| parent | 6db9605d85dafd6759b82a934ac833baf0cd9214 (diff) | |
| download | rust-51e15ac7099c00efb425219cf17c8e412d1e14d7.tar.gz rust-51e15ac7099c00efb425219cf17c8e412d1e14d7.zip | |
Remove erroneous merge conflict
| -rw-r--r-- | compiler/rustc_middle/src/ty/subst.rs | 4 |
1 files changed, 0 insertions, 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 { |