nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove erroneous merge conflict

Browse Source
This commit is contained in:
Alan Egerton 2021-11-27 11:53:00 +00:00
parent 6db9605d85
commit 51e15ac709
No known key found for this signature in database
GPG Key ID: 07CAC3CCA7E0643F
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_middle/src/ty/subst.rs
View File

@ -513,10 +513,6 @@ impl<'a, 'tcx> TypeFolder<'tcx> for SubstFolder<'a, 'tcx> {
&mut self, &mut self,
c: &'tcx ty::Const<'tcx>, c: &'tcx ty::Const<'tcx>,
) -> Result<&'tcx ty::Const<'tcx>, Self::Error> { ) -> Result<&'tcx ty::Const<'tcx>, Self::Error> {
if !c.potentially_needs_subst() {
return Ok(c);
}
if let ty::ConstKind::Param(p) = c.val { if let ty::ConstKind::Param(p) = c.val {
Ok(self.const_for_param(p, c)) Ok(self.const_for_param(p, c))
} else { } else {