Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c1b336c

Browse files
committedJun 21, 2024
Auto merge of rust-lang#126650 - compiler-errors:renames, r=lcnr
Rename a bunch of things in the new solver and `rustc_type_ir` * Renames `interner()` to `cx()` in the solver and `TypeFolder`. * Renames `Infcx` generic param to `D` * Moves `infcx.rs` to `delegate.rs` r? lcnr
2 parents 5ced3da + db638ab commit c1b336c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+538
-566
lines changed
 

‎compiler/rustc_middle/src/ty/normalize_erasing_regions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl<'tcx> NormalizeAfterErasingRegionsFolder<'tcx> {
173173
}
174174

175175
impl<'tcx> TypeFolder<TyCtxt<'tcx>> for NormalizeAfterErasingRegionsFolder<'tcx> {
176-
fn interner(&self) -> TyCtxt<'tcx> {
176+
fn cx(&self) -> TyCtxt<'tcx> {
177177
self.tcx
178178
}
179179

@@ -211,7 +211,7 @@ impl<'tcx> TryNormalizeAfterErasingRegionsFolder<'tcx> {
211211
impl<'tcx> FallibleTypeFolder<TyCtxt<'tcx>> for TryNormalizeAfterErasingRegionsFolder<'tcx> {
212212
type Error = NormalizationError<'tcx>;
213213

214-
fn interner(&self) -> TyCtxt<'tcx> {
214+
fn cx(&self) -> TyCtxt<'tcx> {
215215
self.tcx
216216
}
217217

‎compiler/rustc_middle/src/ty/opaque_types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl<'tcx> ReverseMapper<'tcx> {
9595
}
9696

9797
impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReverseMapper<'tcx> {
98-
fn interner(&self) -> TyCtxt<'tcx> {
98+
fn cx(&self) -> TyCtxt<'tcx> {
9999
self.tcx
100100
}
101101

@@ -144,7 +144,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReverseMapper<'tcx> {
144144
)
145145
.emit();
146146

147-
ty::Region::new_error(self.interner(), e)
147+
ty::Region::new_error(self.cx(), e)
148148
}
149149
}
150150
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.