Skip to content

Commit 67727aa

Browse files
cjgillotcjgillot
committed
Reduce use of local_def_id_to_hir_id.
1 parent ebcc847 commit 67727aa

File tree

39 files changed

+182
-237
lines changed

39 files changed

+182
-237
lines changed

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
409409
let generics = tcx.generics_of(self.mir_def_id());
410410
let param = generics.type_param(&param_ty, tcx);
411411
if let Some(generics) = tcx
412-
.hir()
413-
.get_generics(tcx.typeck_root_def_id(self.mir_def_id().to_def_id()))
412+
.typeck_root_def_id(self.mir_def_id().to_def_id())
413+
.as_local()
414+
.and_then(|def_id| tcx.hir().get_generics(def_id))
414415
{
415416
suggest_constraining_type_param(
416417
tcx,

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

+31-35
Original file line numberDiff line numberDiff line change
@@ -628,42 +628,39 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
628628
};
629629
(
630630
true,
631-
td.as_local().and_then(|tld| {
632-
let h = hir_map.local_def_id_to_hir_id(tld);
633-
match hir_map.find(h) {
634-
Some(Node::Item(hir::Item {
635-
kind: hir::ItemKind::Trait(_, _, _, _, items),
636-
..
637-
})) => {
638-
let mut f_in_trait_opt = None;
639-
for hir::TraitItemRef { id: fi, kind: k, .. } in *items {
640-
let hi = fi.hir_id();
641-
if !matches!(k, hir::AssocItemKind::Fn { .. }) {
642-
continue;
643-
}
644-
if hir_map.name(hi) != hir_map.name(my_hir) {
645-
continue;
646-
}
647-
f_in_trait_opt = Some(hi);
648-
break;
631+
td.as_local().and_then(|tld| match hir_map.find_by_def_id(tld) {
632+
Some(Node::Item(hir::Item {
633+
kind: hir::ItemKind::Trait(_, _, _, _, items),
634+
..
635+
})) => {
636+
let mut f_in_trait_opt = None;
637+
for hir::TraitItemRef { id: fi, kind: k, .. } in *items {
638+
let hi = fi.hir_id();
639+
if !matches!(k, hir::AssocItemKind::Fn { .. }) {
640+
continue;
649641
}
650-
f_in_trait_opt.and_then(|f_in_trait| match hir_map.find(f_in_trait) {
651-
Some(Node::TraitItem(hir::TraitItem {
652-
kind:
653-
hir::TraitItemKind::Fn(
654-
hir::FnSig { decl: hir::FnDecl { inputs, .. }, .. },
655-
_,
656-
),
657-
..
658-
})) => {
659-
let hir::Ty { span, .. } = inputs[local.index() - 1];
660-
Some(span)
661-
}
662-
_ => None,
663-
})
642+
if hir_map.name(hi) != hir_map.name(my_hir) {
643+
continue;
644+
}
645+
f_in_trait_opt = Some(hi);
646+
break;
664647
}
665-
_ => None,
648+
f_in_trait_opt.and_then(|f_in_trait| match hir_map.find(f_in_trait) {
649+
Some(Node::TraitItem(hir::TraitItem {
650+
kind:
651+
hir::TraitItemKind::Fn(
652+
hir::FnSig { decl: hir::FnDecl { inputs, .. }, .. },
653+
_,
654+
),
655+
..
656+
})) => {
657+
let hir::Ty { span, .. } = inputs[local.index() - 1];
658+
Some(span)
659+
}
660+
_ => None,
661+
})
666662
}
663+
_ => None,
667664
}),
668665
)
669666
}
@@ -1075,8 +1072,7 @@ fn get_mut_span_in_struct_field<'tcx>(
10751072
if let ty::Adt(def, _) = ty.kind() {
10761073
let field = def.all_fields().nth(field.index())?;
10771074
// Use the HIR types to construct the diagnostic message.
1078-
let hir_id = tcx.hir().local_def_id_to_hir_id(field.did.as_local()?);
1079-
let node = tcx.hir().find(hir_id)?;
1075+
let node = tcx.hir().find_by_def_id(field.did.as_local()?)?;
10801076
// Now we're dealing with the actual struct that we're going to suggest a change to,
10811077
// we can expect a field that is an immutable reference to a type.
10821078
if let hir::Node::Field(field) = node {

‎compiler/rustc_codegen_ssa/src/back/symbol_export.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fn reachable_non_generics_provider(tcx: TyCtxt<'_>, cnum: CrateNum) -> DefIdMap<
7676
//
7777
// As a result, if this id is an FFI item (foreign item) then we only
7878
// let it through if it's included statically.
79-
match tcx.hir().get(tcx.hir().local_def_id_to_hir_id(def_id)) {
79+
match tcx.hir().get_by_def_id(def_id) {
8080
Node::ForeignItem(..) => {
8181
tcx.is_statically_included_foreign_item(def_id).then_some(def_id)
8282
}

‎compiler/rustc_const_eval/src/const_eval/fn_queries.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_hir as hir;
2-
use rustc_hir::def_id::DefId;
2+
use rustc_hir::def_id::{DefId, LocalDefId};
33
use rustc_middle::ty::query::Providers;
44
use rustc_middle::ty::TyCtxt;
55
use rustc_span::symbol::Symbol;
@@ -15,7 +15,8 @@ pub fn is_unstable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> Option<Symbol> {
1515
}
1616
}
1717

18-
pub fn is_parent_const_impl_raw(tcx: TyCtxt<'_>, hir_id: hir::HirId) -> bool {
18+
pub fn is_parent_const_impl_raw(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
19+
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
1920
let parent_id = tcx.hir().get_parent_node(hir_id);
2021
matches!(
2122
tcx.hir().get(parent_id),
@@ -29,15 +30,15 @@ pub fn is_parent_const_impl_raw(tcx: TyCtxt<'_>, hir_id: hir::HirId) -> bool {
2930
/// Checks whether the function has a `const` modifier or, in case it is an intrinsic, whether
3031
/// said intrinsic has a `rustc_const_{un,}stable` attribute.
3132
fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
32-
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id.expect_local());
33-
34-
let node = tcx.hir().get(hir_id);
33+
let def_id = def_id.expect_local();
34+
let node = tcx.hir().get_by_def_id(def_id);
3535

3636
if let hir::Node::ForeignItem(hir::ForeignItem { kind: hir::ForeignItemKind::Fn(..), .. }) =
3737
node
3838
{
3939
// Intrinsics use `rustc_const_{un,}stable` attributes to indicate constness. All other
4040
// foreign items cannot be evaluated at compile-time.
41+
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
4142
if let Abi::RustIntrinsic | Abi::PlatformIntrinsic = tcx.hir().get_foreign_abi(hir_id) {
4243
tcx.lookup_const_stability(def_id).is_some()
4344
} else {
@@ -50,7 +51,7 @@ fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
5051

5152
// If the function itself is not annotated with `const`, it may still be a `const fn`
5253
// if it resides in a const trait impl.
53-
is_parent_const_impl_raw(tcx, hir_id)
54+
is_parent_const_impl_raw(tcx, def_id)
5455
} else {
5556
matches!(node, hir::Node::Ctor(_))
5657
}

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
221221
// Prevent const trait methods from being annotated as `stable`.
222222
// FIXME: Do this as part of stability checking.
223223
if self.is_const_stable_const_fn() {
224-
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
225-
if crate::const_eval::is_parent_const_impl_raw(tcx, hir_id) {
224+
if crate::const_eval::is_parent_const_impl_raw(tcx, def_id) {
226225
self.ccx
227226
.tcx
228227
.sess

‎compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ impl Qualif for CustomEq {
210210
// because that component may be part of an enum variant (e.g.,
211211
// `Option::<NonStructuralMatchTy>::Some`), in which case some values of this type may be
212212
// structural-match (`Option::None`).
213-
let id = cx.tcx.hir().local_def_id_to_hir_id(cx.def_id());
214-
traits::search_for_structural_match_violation(id, cx.body.span, cx.tcx, ty).is_some()
213+
traits::search_for_structural_match_violation(cx.body.span, cx.tcx, ty).is_some()
215214
}
216215

217216
fn in_adt_inherently<'tcx>(

‎compiler/rustc_incremental/src/persist/dirty_clean.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,7 @@ impl<'tcx> DirtyCleanVisitor<'tcx> {
223223
/// Return all DepNode labels that should be asserted for this item.
224224
/// index=0 is the "name" used for error messages
225225
fn auto_labels(&mut self, item_id: LocalDefId, attr: &Attribute) -> (&'static str, Labels) {
226-
let hir_id = self.tcx.hir().local_def_id_to_hir_id(item_id);
227-
let node = self.tcx.hir().get(hir_id);
226+
let node = self.tcx.hir().get_by_def_id(item_id);
228227
let (name, labels) = match node {
229228
HirNode::Item(item) => {
230229
match item.kind {

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+8-15
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,10 @@ fn msg_span_from_early_bound_and_free_regions<'tcx>(
151151
) -> (String, Span) {
152152
let sm = tcx.sess.source_map();
153153

154-
let scope = region.free_region_binding_scope(tcx);
155-
let node = tcx.hir().local_def_id_to_hir_id(scope.expect_local());
154+
let scope = region.free_region_binding_scope(tcx).expect_local();
156155
match *region {
157156
ty::ReEarlyBound(ref br) => {
158-
let mut sp = sm.guess_head_span(tcx.hir().span(node));
157+
let mut sp = sm.guess_head_span(tcx.def_span(scope));
159158
if let Some(param) =
160159
tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(br.name))
161160
{
@@ -166,7 +165,7 @@ fn msg_span_from_early_bound_and_free_regions<'tcx>(
166165
ty::ReFree(ty::FreeRegion {
167166
bound_region: ty::BoundRegionKind::BrNamed(_, name), ..
168167
}) => {
169-
let mut sp = sm.guess_head_span(tcx.hir().span(node));
168+
let mut sp = sm.guess_head_span(tcx.def_span(scope));
170169
if let Some(param) =
171170
tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(name))
172171
{
@@ -181,13 +180,13 @@ fn msg_span_from_early_bound_and_free_regions<'tcx>(
181180
} else {
182181
(
183182
format!("the anonymous lifetime #{} defined here", idx + 1),
184-
tcx.hir().span(node),
183+
tcx.def_span(scope),
185184
)
186185
}
187186
}
188187
_ => (
189188
format!("the lifetime `{}` as defined here", region),
190-
sm.guess_head_span(tcx.hir().span(node)),
189+
sm.guess_head_span(tcx.def_span(scope)),
191190
),
192191
},
193192
_ => bug!(),
@@ -1759,8 +1758,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
17591758
if let Some(ValuePairs::PolyTraitRefs(exp_found)) = values {
17601759
if let ty::Closure(def_id, _) = exp_found.expected.skip_binder().self_ty().kind() {
17611760
if let Some(def_id) = def_id.as_local() {
1762-
let hir_id = self.tcx.hir().local_def_id_to_hir_id(def_id);
1763-
let span = self.tcx.hir().span(hir_id);
1761+
let span = self.tcx.def_span(def_id);
17641762
diag.span_note(span, "this closure does not fulfill the lifetime requirements");
17651763
}
17661764
}
@@ -2245,7 +2243,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
22452243
if let Node::GenericParam(param) = hir.get(id) {
22462244
has_bounds = !param.bounds.is_empty();
22472245
}
2248-
let sp = hir.span(id);
2246+
let sp = self.tcx.def_span(def_id);
22492247
// `sp` only covers `T`, change it so that it covers
22502248
// `T:` when appropriate
22512249
let is_impl_trait = bound_kind.to_string().starts_with("impl ");
@@ -2291,12 +2289,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
22912289
.as_ref()
22922290
.and_then(|(_, g, _)| g.params.first())
22932291
.and_then(|param| param.def_id.as_local())
2294-
.map(|def_id| {
2295-
(
2296-
hir.span(hir.local_def_id_to_hir_id(def_id)).shrink_to_lo(),
2297-
format!("{}, ", new_lt),
2298-
)
2299-
});
2292+
.map(|def_id| (self.tcx.def_span(def_id).shrink_to_lo(), format!("{}, ", new_lt)));
23002293

23012294
let labeled_user_string = match bound_kind {
23022295
GenericKind::Param(ref p) => format!("the parameter type `{}`", p),

‎compiler/rustc_lint/src/builtin.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
610610
// reported for missing docs.
611611
let real_trait = trait_ref.path.res.def_id();
612612
let Some(def_id) = real_trait.as_local() else { return };
613-
let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
614-
let Some(Node::Item(item)) = cx.tcx.hir().find(hir_id) else { return };
613+
let Some(Node::Item(item)) = cx.tcx.hir().find_by_def_id(def_id) else { return };
615614
if let hir::VisibilityKind::Inherited = item.vis.node {
616615
for impl_item_ref in items {
617616
self.private_traits.insert(impl_item_ref.id.hir_id());
@@ -1212,7 +1211,7 @@ impl<'tcx> LateLintPass<'tcx> for InvalidNoMangleItems {
12121211
check_no_mangle_on_generic_fn(
12131212
no_mangle_attr,
12141213
Some(generics),
1215-
cx.tcx.hir().get_generics(it.id.def_id.to_def_id()).unwrap(),
1214+
cx.tcx.hir().get_generics(it.id.def_id).unwrap(),
12161215
it.span,
12171216
);
12181217
}

‎compiler/rustc_metadata/src/rmeta/encoder.rs

+6-8
Original file line numberDiff line numberDiff line change
@@ -1579,12 +1579,12 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
15791579
}
15801580
}
15811581

1582-
fn encode_info_for_closure(&mut self, def_id: LocalDefId) {
1582+
fn encode_info_for_closure(&mut self, hir_id: hir::HirId) {
1583+
let def_id = self.tcx.hir().local_def_id(hir_id);
15831584
debug!("EncodeContext::encode_info_for_closure({:?})", def_id);
15841585

15851586
// NOTE(eddyb) `tcx.type_of(def_id)` isn't used because it's fully generic,
15861587
// including on the signature, which is inferred in `typeck.
1587-
let hir_id = self.tcx.hir().local_def_id_to_hir_id(def_id);
15881588
let ty = self.tcx.typeck(def_id).node_type(hir_id);
15891589

15901590
match ty.kind() {
@@ -1605,9 +1605,9 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
16051605
}
16061606
}
16071607

1608-
fn encode_info_for_anon_const(&mut self, def_id: LocalDefId) {
1608+
fn encode_info_for_anon_const(&mut self, id: hir::HirId) {
1609+
let def_id = self.tcx.hir().local_def_id(id);
16091610
debug!("EncodeContext::encode_info_for_anon_const({:?})", def_id);
1610-
let id = self.tcx.hir().local_def_id_to_hir_id(def_id);
16111611
let body_id = self.tcx.hir().body_owned_by(id);
16121612
let const_data = self.encode_rendered_const_for_body(body_id);
16131613
let qualifs = self.tcx.mir_const_qualif(def_id);
@@ -1928,8 +1928,7 @@ impl<'a, 'tcx> Visitor<'tcx> for EncodeContext<'a, 'tcx> {
19281928
}
19291929
fn visit_anon_const(&mut self, c: &'tcx AnonConst) {
19301930
intravisit::walk_anon_const(self, c);
1931-
let def_id = self.tcx.hir().local_def_id(c.hir_id);
1932-
self.encode_info_for_anon_const(def_id);
1931+
self.encode_info_for_anon_const(c.hir_id);
19331932
}
19341933
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
19351934
intravisit::walk_item(self, item);
@@ -1983,8 +1982,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
19831982

19841983
fn encode_info_for_expr(&mut self, expr: &hir::Expr<'_>) {
19851984
if let hir::ExprKind::Closure(..) = expr.kind {
1986-
let def_id = self.tcx.hir().local_def_id(expr.hir_id);
1987-
self.encode_info_for_closure(def_id);
1985+
self.encode_info_for_closure(expr.hir_id);
19881986
}
19891987
}
19901988

‎compiler/rustc_middle/src/hir/map/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,7 @@ impl<'hir> Map<'hir> {
361361
id.as_local().and_then(|id| self.find(self.local_def_id_to_hir_id(id)))
362362
}
363363

364-
pub fn get_generics(&self, id: DefId) -> Option<&'hir Generics<'hir>> {
365-
let id = id.as_local()?;
364+
pub fn get_generics(&self, id: LocalDefId) -> Option<&'hir Generics<'hir>> {
366365
let node = self.tcx.hir_owner(id)?;
367366
match node.node {
368367
OwnerNode::ImplItem(impl_item) => Some(&impl_item.generics),

‎compiler/rustc_middle/src/mir/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -2449,15 +2449,14 @@ impl<'tcx> Debug for Rvalue<'tcx> {
24492449

24502450
AggregateKind::Closure(def_id, substs) => ty::tls::with(|tcx| {
24512451
if let Some(def_id) = def_id.as_local() {
2452-
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
24532452
let name = if tcx.sess.opts.debugging_opts.span_free_formats {
24542453
let substs = tcx.lift(substs).unwrap();
24552454
format!(
24562455
"[closure@{}]",
24572456
tcx.def_path_str_with_substs(def_id.to_def_id(), substs),
24582457
)
24592458
} else {
2460-
let span = tcx.hir().span(hir_id);
2459+
let span = tcx.def_span(def_id);
24612460
format!(
24622461
"[closure@{}]",
24632462
tcx.sess.source_map().span_to_diagnostic_string(span)
@@ -2481,8 +2480,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {
24812480

24822481
AggregateKind::Generator(def_id, _, _) => ty::tls::with(|tcx| {
24832482
if let Some(def_id) = def_id.as_local() {
2484-
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
2485-
let name = format!("[generator@{:?}]", tcx.hir().span(hir_id));
2483+
let name = format!("[generator@{:?}]", tcx.def_span(def_id));
24862484
let mut struct_fmt = fmt.debug_struct(&name);
24872485

24882486
// FIXME(project-rfc-2229#48): This should be a list of capture names/places

‎compiler/rustc_middle/src/mir/mono.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,11 @@ impl<'tcx> MonoItem<'tcx> {
179179

180180
pub fn local_span(&self, tcx: TyCtxt<'tcx>) -> Option<Span> {
181181
match *self {
182-
MonoItem::Fn(Instance { def, .. }) => {
183-
def.def_id().as_local().map(|def_id| tcx.hir().local_def_id_to_hir_id(def_id))
184-
}
185-
MonoItem::Static(def_id) => {
186-
def_id.as_local().map(|def_id| tcx.hir().local_def_id_to_hir_id(def_id))
187-
}
188-
MonoItem::GlobalAsm(item_id) => Some(item_id.hir_id()),
182+
MonoItem::Fn(Instance { def, .. }) => def.def_id().as_local(),
183+
MonoItem::Static(def_id) => def_id.as_local(),
184+
MonoItem::GlobalAsm(item_id) => Some(item_id.def_id),
189185
}
190-
.map(|hir_id| tcx.hir().span(hir_id))
186+
.map(|def_id| tcx.def_span(def_id))
191187
}
192188

193189
// Only used by rustc_codegen_cranelift

‎compiler/rustc_middle/src/mir/spanview.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,7 @@ fn trim_span_hi(span: Span, to_pos: BytePos) -> Span {
665665
}
666666

667667
fn fn_span<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Span {
668-
let hir_id =
669-
tcx.hir().local_def_id_to_hir_id(def_id.as_local().expect("expected DefId is local"));
670-
let fn_decl_span = tcx.hir().span(hir_id);
668+
let fn_decl_span = tcx.def_span(def_id);
671669
if let Some(body_span) = hir_body(tcx, def_id).map(|hir_body| hir_body.value.span) {
672670
if fn_decl_span.ctxt() == body_span.ctxt() { fn_decl_span.to(body_span) } else { body_span }
673671
} else {

0 commit comments

Comments
 (0)