normalization change and rebase

2022-03-08 15:05:50 +01:00
parent 8a811a1213
commit 26fe550670
49 changed files with 291 additions and 345 deletions
--- a/compiler/rustc_trait_selection/src/traits/query/normalize.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/normalize.rs
@@ -336,7 +336,7 @@ impl<'cx, 'tcx> FallibleTypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
    ) -> Result<mir::ConstantKind<'tcx>, Self::Error> {
        let constant_kind = match constant {
            mir::ConstantKind::Ty(c) => {
-                let const_folded = c.try_super_fold_with(self)?;
+                let const_folded = c.try_fold_with(self)?;
                match const_folded.val() {
                    ty::ConstKind::Value(cv) => {
                        // FIXME With Valtrees we need to convert `cv: ValTree`