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 dcca6a3

Browse files
committedFeb 25, 2023
Auto merge of #108250 - nnethercote:rename-interner-funcs, r=compiler-errors
Rename interner funcs This PR cleans up some inconsistencies in interner naming. Best reviewed one commit at a time. r? `@compiler-errors`
2 parents 26c9868 + 08f28f9 commit dcca6a3

File tree

111 files changed

+450
-471
lines changed

Some content is hidden

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

111 files changed

+450
-471
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
14941494
assert!(root_place.projection.is_empty());
14951495
let proper_span = self.body.local_decls[root_place.local].source_info.span;
14961496

1497-
let root_place_projection = self.infcx.tcx.intern_place_elems(root_place.projection);
1497+
let root_place_projection = self.infcx.tcx.mk_place_elems(root_place.projection);
14981498

14991499
if self.access_place_error_reported.contains(&(
15001500
Place { local: root_place.local, projection: root_place_projection },

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2633,7 +2633,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
26332633
DefKind::InlineConst => substs.as_inline_const().parent_substs(),
26342634
other => bug!("unexpected item {:?}", other),
26352635
};
2636-
let parent_substs = tcx.intern_substs(parent_substs);
2636+
let parent_substs = tcx.mk_substs(parent_substs);
26372637

26382638
assert_eq!(typeck_root_substs.len(), parent_substs.len());
26392639
if let Err(_) = self.eq_substs(

0 commit comments

Comments
 (0)
Please sign in to comment.