Skip to content

Commit 06ae3b7

Browse files
nnethercotennethercote
committed
Move some Map methods onto TyCtxt.
The end goal is to eliminate `Map` altogether. I added a `hir_` prefix to all of them, that seemed simplest. The exception is `module_items` which became `hir_module_free_items` because there was already a `hir_module_items`.
1 parent d505699 commit 06ae3b7

File tree

193 files changed

+455
-466
lines changed

Some content is hidden

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

193 files changed

+455
-466
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ fn compute_hir_hash(
402402
.iter_enumerated()
403403
.filter_map(|(def_id, info)| {
404404
let info = info.as_owner()?;
405-
let def_path_hash = tcx.hir().def_path_hash(def_id);
405+
let def_path_hash = tcx.hir_def_path_hash(def_id);
406406
Some((def_path_hash, info))
407407
})
408408
.collect();
@@ -492,7 +492,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
492492
"adding a def'n for node-id {:?} and def kind {:?} but a previous def'n exists: {:?}",
493493
node_id,
494494
def_kind,
495-
self.tcx.hir().def_key(self.local_def_id(node_id)),
495+
self.tcx.hir_def_key(self.local_def_id(node_id)),
496496
);
497497

498498
let def_id = self.tcx.at(span).create_def(parent, name, def_kind).def_id();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
14431443
let Some(hir_generics) = tcx
14441444
.typeck_root_def_id(self.mir_def_id().to_def_id())
14451445
.as_local()
1446-
.and_then(|def_id| tcx.hir().get_generics(def_id))
1446+
.and_then(|def_id| tcx.hir_get_generics(def_id))
14471447
else {
14481448
return;
14491449
};
@@ -2112,7 +2112,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
21122112
let tcx = self.infcx.tcx;
21132113
let body_id = tcx.hir_node(self.mir_hir_id()).body_id()?;
21142114
let mut expr_finder = FindExprBySpan::new(span, tcx);
2115-
expr_finder.visit_expr(tcx.hir().body(body_id).value);
2115+
expr_finder.visit_expr(tcx.hir_body(body_id).value);
21162116
expr_finder.result
21172117
}
21182118

@@ -3205,7 +3205,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
32053205
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
32063206
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
32073207
&& let Some(id) = self.infcx.tcx.hir_node(scope_data.lint_root).body_id()
3208-
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir().body(id).value.kind
3208+
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir_body(id).value.kind
32093209
{
32103210
for stmt in block.stmts {
32113211
let mut visitor = NestedStatementVisitor {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ impl<'tcx> BorrowExplanation<'tcx> {
7575

7676
if let Some(span) = borrow_span {
7777
let def_id = body.source.def_id();
78-
if let Some(node) = tcx.hir().get_if_local(def_id)
78+
if let Some(node) = tcx.hir_get_if_local(def_id)
7979
&& let Some(body_id) = node.body_id()
8080
{
81-
let body = tcx.hir().body(body_id);
81+
let body = tcx.hir_body(body_id);
8282
let mut expr_finder = FindExprBySpan::new(span, tcx);
8383
expr_finder.visit_expr(body.value);
8484
if let Some(mut expr) = expr_finder.result {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
12191219
.tcx
12201220
.typeck_root_def_id(self.mir_def_id().to_def_id())
12211221
.as_local()
1222-
.and_then(|def_id| self.infcx.tcx.hir().get_generics(def_id))
1222+
.and_then(|def_id| self.infcx.tcx.hir_get_generics(def_id))
12231223
&& let spans = hir_generics
12241224
.predicates
12251225
.iter()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
347347
// Find the closure that captured the binding.
348348
let mut expr_finder = FindExprBySpan::new(args_span, tcx);
349349
expr_finder.include_closures = true;
350-
expr_finder.visit_expr(tcx.hir().body(body_id).value);
350+
expr_finder.visit_expr(tcx.hir_body(body_id).value);
351351
let Some(closure_expr) = expr_finder.result else { return };
352352
let ExprKind::Closure(closure) = closure_expr.kind else { return };
353353
// We'll only suggest cloning the binding if it's a `move` closure.
@@ -357,7 +357,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
357357
let use_span = use_spans.var_or_use();
358358
let mut expr_finder = FindExprBySpan::new(use_span, tcx);
359359
expr_finder.include_closures = true;
360-
expr_finder.visit_expr(tcx.hir().body(body_id).value);
360+
expr_finder.visit_expr(tcx.hir_body(body_id).value);
361361
let Some(use_expr) = expr_finder.result else { return };
362362
let parent = tcx.parent_hir_node(use_expr.hir_id);
363363
if let Node::Expr(expr) = parent

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -935,11 +935,12 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
935935
fn expected_fn_found_fn_mut_call(&self, err: &mut Diag<'_>, sp: Span, act: &str) {
936936
err.span_label(sp, format!("cannot {act}"));
937937

938-
let hir = self.infcx.tcx.hir();
938+
let tcx = self.infcx.tcx;
939+
let hir = tcx.hir();
939940
let closure_id = self.mir_hir_id();
940-
let closure_span = self.infcx.tcx.def_span(self.mir_def_id());
941-
let fn_call_id = self.infcx.tcx.parent_hir_id(closure_id);
942-
let node = self.infcx.tcx.hir_node(fn_call_id);
941+
let closure_span = tcx.def_span(self.mir_def_id());
942+
let fn_call_id = tcx.parent_hir_id(closure_id);
943+
let node = tcx.hir_node(fn_call_id);
943944
let def_id = hir.enclosing_body_owner(fn_call_id);
944945
let mut look_at_return = true;
945946

@@ -950,7 +951,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
950951
return None;
951952
};
952953

953-
let typeck_results = self.infcx.tcx.typeck(def_id);
954+
let typeck_results = tcx.typeck(def_id);
954955

955956
match kind {
956957
hir::ExprKind::Call(expr, args) => {
@@ -979,7 +980,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
979980
.map(|(pos, _)| pos)
980981
.next();
981982

982-
let arg = match hir.get_if_local(callee_def_id) {
983+
let arg = match tcx.hir_get_if_local(callee_def_id) {
983984
Some(
984985
hir::Node::Item(hir::Item {
985986
ident, kind: hir::ItemKind::Fn { sig, .. }, ..
@@ -1021,7 +1022,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
10211022
if look_at_return && hir.get_fn_id_for_return_block(closure_id).is_some() {
10221023
// ...otherwise we are probably in the tail expression of the function, point at the
10231024
// return type.
1024-
match self.infcx.tcx.hir_node_by_def_id(hir.get_parent_item(fn_call_id).def_id) {
1025+
match tcx.hir_node_by_def_id(hir.get_parent_item(fn_call_id).def_id) {
10251026
hir::Node::Item(hir::Item {
10261027
ident, kind: hir::ItemKind::Fn { sig, .. }, ..
10271028
})
@@ -1049,9 +1050,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
10491050

10501051
fn suggest_using_iter_mut(&self, err: &mut Diag<'_>) {
10511052
let source = self.body.source;
1052-
let hir = self.infcx.tcx.hir();
10531053
if let InstanceKind::Item(def_id) = source.instance
1054-
&& let Some(Node::Expr(hir::Expr { hir_id, kind, .. })) = hir.get_if_local(def_id)
1054+
&& let Some(Node::Expr(hir::Expr { hir_id, kind, .. })) =
1055+
self.infcx.tcx.hir_get_if_local(def_id)
10551056
&& let ExprKind::Closure(hir::Closure { kind: hir::ClosureKind::Closure, .. }) = kind
10561057
&& let Node::Expr(expr) = self.infcx.tcx.parent_hir_node(*hir_id)
10571058
{

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
207207
lower_bound: RegionVid,
208208
) {
209209
let mut suggestions = vec![];
210-
let hir = self.infcx.tcx.hir();
210+
let tcx = self.infcx.tcx;
211211

212212
// find generic associated types in the given region 'lower_bound'
213213
let gat_id_and_generics = self
@@ -216,12 +216,9 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
216216
.map(|placeholder| {
217217
if let Some(id) = placeholder.bound.kind.get_id()
218218
&& let Some(placeholder_id) = id.as_local()
219-
&& let gat_hir_id = self.infcx.tcx.local_def_id_to_hir_id(placeholder_id)
220-
&& let Some(generics_impl) = self
221-
.infcx
222-
.tcx
223-
.parent_hir_node(self.infcx.tcx.parent_hir_id(gat_hir_id))
224-
.generics()
219+
&& let gat_hir_id = tcx.local_def_id_to_hir_id(placeholder_id)
220+
&& let Some(generics_impl) =
221+
tcx.parent_hir_node(tcx.parent_hir_id(gat_hir_id)).generics()
225222
{
226223
Some((gat_hir_id, generics_impl))
227224
} else {
@@ -242,7 +239,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
242239
};
243240
if bound_generic_params
244241
.iter()
245-
.rfind(|bgp| self.infcx.tcx.local_def_id_to_hir_id(bgp.def_id) == *gat_hir_id)
242+
.rfind(|bgp| tcx.local_def_id_to_hir_id(bgp.def_id) == *gat_hir_id)
246243
.is_some()
247244
{
248245
for bound in *bounds {
@@ -258,7 +255,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
258255
return;
259256
};
260257
diag.span_note(*trait_span, fluent::borrowck_limitations_implies_static);
261-
let Some(generics_fn) = hir.get_generics(self.body.source.def_id().expect_local())
258+
let Some(generics_fn) = tcx.hir_get_generics(self.body.source.def_id().expect_local())
262259
else {
263260
return;
264261
};
@@ -1156,7 +1153,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
11561153

11571154
if ocx.select_all_or_error().is_empty() && count > 0 {
11581155
diag.span_suggestion_verbose(
1159-
tcx.hir().body(*body).value.peel_blocks().span.shrink_to_lo(),
1156+
tcx.hir_body(*body).value.peel_blocks().span.shrink_to_lo(),
11601157
fluent::borrowck_dereference_suggestion,
11611158
"*".repeat(count),
11621159
Applicability::MachineApplicable,

‎compiler/rustc_codegen_cranelift/src/driver/jit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ pub(crate) fn run_jit(tcx: TyCtxt<'_>, codegen_mode: CodegenMode, jit_args: Vec<
122122
crate::constant::codegen_static(tcx, &mut jit_module, def_id);
123123
}
124124
MonoItem::GlobalAsm(item_id) => {
125-
let item = tcx.hir().item(item_id);
125+
let item = tcx.hir_item(item_id);
126126
tcx.dcx().span_fatal(item.span, "Global asm is not supported in JIT mode");
127127
}
128128
}

‎compiler/rustc_codegen_cranelift/src/global_asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_target::asm::InlineAsmArch;
1515
use crate::prelude::*;
1616

1717
pub(crate) fn codegen_global_asm_item(tcx: TyCtxt<'_>, global_asm: &mut String, item_id: ItemId) {
18-
let item = tcx.hir().item(item_id);
18+
let item = tcx.hir_item(item_id);
1919
if let rustc_hir::ItemKind::GlobalAsm(asm) = item.kind {
2020
let is_x86 =
2121
matches!(tcx.sess.asm_arch.unwrap(), InlineAsmArch::X86 | InlineAsmArch::X86_64);

‎compiler/rustc_codegen_ssa/src/mono_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
3535
cx.codegen_static(def_id);
3636
}
3737
MonoItem::GlobalAsm(item_id) => {
38-
let item = cx.tcx().hir().item(item_id);
38+
let item = cx.tcx().hir_item(item_id);
3939
if let hir::ItemKind::GlobalAsm(asm) = item.kind {
4040
let operands: Vec<_> = asm
4141
.operands

0 commit comments

Comments
 (0)