diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-10 01:41:06 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-05-15 16:40:42 +0000 |
| commit | 41501c74490570c24b38f55484981f22eebf0d39 (patch) | |
| tree | a8b0913b9e2fd80a3cadd75246d25400f77c67e2 /compiler/rustc_infer/src | |
| parent | 6d0b6c0d2cb6eefc8e7b247c3f15b53bd9b0d2ae (diff) | |
| download | rust-41501c74490570c24b38f55484981f22eebf0d39.tar.gz rust-41501c74490570c24b38f55484981f22eebf0d39.zip | |
Rename super_relate_* to structurally_relate_*
Diffstat (limited to 'compiler/rustc_infer/src')
4 files changed, 7 insertions, 7 deletions
diff --git a/compiler/rustc_infer/src/infer/combine.rs b/compiler/rustc_infer/src/infer/combine.rs index 4ed4164bd27..9559bfab6da 100644 --- a/compiler/rustc_infer/src/infer/combine.rs +++ b/compiler/rustc_infer/src/infer/combine.rs @@ -145,7 +145,7 @@ impl<'tcx> InferCtxt<'tcx> { Ok(a) } - _ => ty::relate::super_relate_tys(relation, a, b), + _ => ty::relate::structurally_relate_tys(relation, a, b), } } @@ -245,7 +245,7 @@ impl<'tcx> InferCtxt<'tcx> { _ => {} } - ty::relate::super_relate_consts(relation, a, b) + ty::relate::structurally_relate_consts(relation, a, b) } /// Unifies the const variable `target_vid` with the given constant. diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs index ce70f39cc40..ad4f5058b5e 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs @@ -2723,7 +2723,7 @@ impl<'tcx> TypeRelation<'tcx> for SameTypeModuloInfer<'_, 'tcx> { | (ty::Infer(ty::InferTy::TyVar(_)), _) | (_, ty::Infer(ty::InferTy::TyVar(_))) => Ok(a), (ty::Infer(_), _) | (_, ty::Infer(_)) => Err(TypeError::Mismatch), - _ => relate::super_relate_tys(self, a, b), + _ => relate::structurally_relate_tys(self, a, b), } } diff --git a/compiler/rustc_infer/src/infer/generalize.rs b/compiler/rustc_infer/src/infer/generalize.rs index aa3e3153379..3eeb55ae744 100644 --- a/compiler/rustc_infer/src/infer/generalize.rs +++ b/compiler/rustc_infer/src/infer/generalize.rs @@ -306,7 +306,7 @@ where } } - _ => relate::super_relate_tys(self, t, t), + _ => relate::structurally_relate_tys(self, t, t), }?; self.cache.insert(t, g); @@ -422,7 +422,7 @@ where Err(TypeError::Mismatch) } } - _ => relate::super_relate_consts(self, c, c), + _ => relate::structurally_relate_consts(self, c, c), } } diff --git a/compiler/rustc_infer/src/infer/outlives/test_type_match.rs b/compiler/rustc_infer/src/infer/outlives/test_type_match.rs index 75ce0f83fd6..cd2462d3c31 100644 --- a/compiler/rustc_infer/src/infer/outlives/test_type_match.rs +++ b/compiler/rustc_infer/src/infer/outlives/test_type_match.rs @@ -187,7 +187,7 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> { } else if pattern == value { Ok(pattern) } else { - relate::super_relate_tys(self, pattern, value) + relate::structurally_relate_tys(self, pattern, value) } } @@ -201,7 +201,7 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> { if pattern == value { Ok(pattern) } else { - relate::super_relate_consts(self, pattern, value) + relate::structurally_relate_consts(self, pattern, value) } } |
