Skip to content

Commit 424dbab

Browse files
lcnrlcnr
committed
HirId to LocalDefId 
1 parent 669e751 commit 424dbab

File tree

11 files changed

+32
-86
lines changed

11 files changed

+32
-86
lines changed

‎compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ fn infer_return_ty_for_fn_sig<'tcx>(
12151215
fn_sig,
12161216
Applicability::MachineApplicable,
12171217
);
1218-
} else if let Some(sugg) = suggest_impl_trait(tcx, ret_ty, ty.span, hir_id, def_id) {
1218+
} else if let Some(sugg) = suggest_impl_trait(tcx, ret_ty, ty.span, def_id) {
12191219
diag.span_suggestion(
12201220
ty.span,
12211221
"replace with an appropriate return type",
@@ -1247,12 +1247,10 @@ fn infer_return_ty_for_fn_sig<'tcx>(
12471247
}
12481248
}
12491249

1250-
// FIXME(vincenzopalazzo): remove the hir item when the refactoring is stable
12511250
fn suggest_impl_trait<'tcx>(
12521251
tcx: TyCtxt<'tcx>,
12531252
ret_ty: Ty<'tcx>,
12541253
span: Span,
1255-
_hir_id: hir::HirId,
12561254
def_id: LocalDefId,
12571255
) -> Option<String> {
12581256
let format_as_assoc: fn(_, _, _, _, _) -> _ =

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,9 +1405,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
14051405
ty
14061406
} else {
14071407
let e = self.tainted_by_errors().unwrap_or_else(|| {
1408-
self.err_ctxt()
1409-
.emit_inference_failure_err(self.body_id, sp, ty.into(), E0282, true)
1410-
.emit()
1408+
self.err_ctxt().emit_inference_failure_err(sp, ty.into(), E0282, true).emit()
14111409
});
14121410
let err = self.tcx.ty_error(e);
14131411
self.demand_suptype(sp, err, ty);

‎compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
157157
pub fn err_ctxt(&'a self) -> TypeErrCtxt<'a, 'tcx> {
158158
TypeErrCtxt {
159159
infcx: &self.infcx,
160+
160161
typeck_results: Some(self.typeck_results.borrow()),
161162
fallback_has_occurred: self.fallback_has_occurred.get(),
163+
162164
normalize_fn_sig: Box::new(|fn_sig| {
163165
if fn_sig.has_escaping_bound_vars() {
164166
return fn_sig;

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
166166
&self,
167167
ty: Ty<'tcx>,
168168
) -> Option<(DefIdOrName, Ty<'tcx>, Vec<Ty<'tcx>>)> {
169-
let body_hir_id = self.tcx.hir().local_def_id_to_hir_id(self.body_id);
170-
self.err_ctxt().extract_callable_info(body_hir_id, self.param_env, ty)
169+
self.err_ctxt().extract_callable_info(self.body_id, self.param_env, ty)
171170
}
172171

173172
pub fn suggest_two_fn_call(

‎compiler/rustc_hir_typeck/src/writeback.rs

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
4747
let rustc_dump_user_substs =
4848
self.tcx.has_attr(item_def_id.to_def_id(), sym::rustc_dump_user_substs);
4949

50-
let mut wbcx = WritebackCx::new(self, body, rustc_dump_user_substs);
50+
let mut wbcx = WritebackCx::new(self, rustc_dump_user_substs);
5151
for param in body.params {
5252
wbcx.visit_node_id(param.pat.span, param.hir_id);
5353
}
@@ -106,23 +106,16 @@ struct WritebackCx<'cx, 'tcx> {
106106

107107
typeck_results: ty::TypeckResults<'tcx>,
108108

109-
body: &'tcx hir::Body<'tcx>,
110-
111109
rustc_dump_user_substs: bool,
112110
}
113111

114112
impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
115-
fn new(
116-
fcx: &'cx FnCtxt<'cx, 'tcx>,
117-
body: &'tcx hir::Body<'tcx>,
118-
rustc_dump_user_substs: bool,
119-
) -> WritebackCx<'cx, 'tcx> {
120-
let owner = body.id().hir_id.owner;
121-
113+
fn new(fcx: &'cx FnCtxt<'cx, 'tcx>, rustc_dump_user_substs: bool) -> WritebackCx<'cx, 'tcx> {
114+
// All bodies which share typeck results have the same `OwnerId`.
115+
let hir_id = fcx.tcx.hir().local_def_id_to_hir_id(fcx.body_id);
122116
WritebackCx {
123117
fcx,
124-
typeck_results: ty::TypeckResults::new(owner),
125-
body,
118+
typeck_results: ty::TypeckResults::new(hir_id.owner),
126119
rustc_dump_user_substs,
127120
}
128121
}
@@ -687,7 +680,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
687680
where
688681
T: TypeFoldable<TyCtxt<'tcx>>,
689682
{
690-
let mut resolver = Resolver::new(self.fcx, span, self.body);
683+
let mut resolver = Resolver::new(self.fcx, span);
691684
let x = x.fold_with(&mut resolver);
692685
if cfg!(debug_assertions) && x.needs_infer() {
693686
span_bug!(span.to_span(self.fcx.tcx), "writeback: `{:?}` has inference variables", x);
@@ -726,19 +719,14 @@ struct Resolver<'cx, 'tcx> {
726719
tcx: TyCtxt<'tcx>,
727720
infcx: &'cx InferCtxt<'tcx>,
728721
span: &'cx dyn Locatable,
729-
body: &'tcx hir::Body<'tcx>,
730722

731723
/// Set to `Some` if any `Ty` or `ty::Const` had to be replaced with an `Error`.
732724
replaced_with_error: Option<ErrorGuaranteed>,
733725
}
734726

735727
impl<'cx, 'tcx> Resolver<'cx, 'tcx> {
736-
fn new(
737-
fcx: &'cx FnCtxt<'cx, 'tcx>,
738-
span: &'cx dyn Locatable,
739-
body: &'tcx hir::Body<'tcx>,
740-
) -> Resolver<'cx, 'tcx> {
741-
Resolver { tcx: fcx.tcx, infcx: fcx, span, body, replaced_with_error: None }
728+
fn new(fcx: &'cx FnCtxt<'cx, 'tcx>, span: &'cx dyn Locatable) -> Resolver<'cx, 'tcx> {
729+
Resolver { tcx: fcx.tcx, infcx: fcx, span, replaced_with_error: None }
742730
}
743731

744732
fn report_error(&self, p: impl Into<ty::GenericArg<'tcx>>) -> ErrorGuaranteed {
@@ -747,13 +735,7 @@ impl<'cx, 'tcx> Resolver<'cx, 'tcx> {
747735
None => self
748736
.infcx
749737
.err_ctxt()
750-
.emit_inference_failure_err(
751-
self.tcx.hir().body_owner_def_id(self.body.id()),
752-
self.span.to_span(self.tcx),
753-
p.into(),
754-
E0282,
755-
false,
756-
)
738+
.emit_inference_failure_err(self.span.to_span(self.tcx), p.into(), E0282, false)
757739
.emit(),
758740
}
759741
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ pub mod nice_region_error;
9595
/// Get an instance by calling `InferCtxt::err` or `FnCtxt::infer_err`.
9696
pub struct TypeErrCtxt<'a, 'tcx> {
9797
pub infcx: &'a InferCtxt<'tcx>,
98+
99+
// These three fields are only used by hir typeck.
98100
pub typeck_results: Option<std::cell::Ref<'a, ty::TypeckResults<'tcx>>>,
99101
pub fallback_has_occurred: bool,
100102

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, IntoDiagnosticArg};
1010
use rustc_hir as hir;
1111
use rustc_hir::def::Res;
1212
use rustc_hir::def::{CtorOf, DefKind, Namespace};
13-
use rustc_hir::def_id::{DefId, LocalDefId};
13+
use rustc_hir::def_id::DefId;
1414
use rustc_hir::intravisit::{self, Visitor};
1515
use rustc_hir::{Body, Closure, Expr, ExprKind, FnRetTy, HirId, Local, LocalSource};
1616
use rustc_middle::hir::nested_filter;
@@ -386,7 +386,6 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
386386
#[instrument(level = "debug", skip(self, error_code))]
387387
pub fn emit_inference_failure_err(
388388
&self,
389-
body_def_id: LocalDefId,
390389
failure_span: Span,
391390
arg: GenericArg<'tcx>,
392391
error_code: TypeAnnotationNeeded,
@@ -403,12 +402,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
403402
};
404403

405404
let mut local_visitor = FindInferSourceVisitor::new(&self, typeck_results, arg);
406-
if let Some(body_id) = self.tcx.hir().maybe_body_owned_by(
407-
self.tcx.typeck_root_def_id(body_def_id.to_def_id()).expect_local(),
408-
) {
409-
let expr = self.tcx.hir().body(body_id).value;
410-
local_visitor.visit_expr(expr);
411-
}
405+
let expr = self.tcx.hir().expect_expr(typeck_results.hir_owner.into());
406+
local_visitor.visit_expr(expr);
412407

413408
let Some(InferSource { span, kind }) = local_visitor.infer_source else {
414409
return self.bad_inference_failure_err(failure_span, arg_data, error_code)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,10 @@ impl<'tcx> InferCtxt<'tcx> {
662662
pub fn err_ctxt(&self) -> TypeErrCtxt<'_, 'tcx> {
663663
TypeErrCtxt {
664664
infcx: self,
665+
665666
typeck_results: None,
666667
fallback_has_occurred: false,
668+
667669
normalize_fn_sig: Box::new(|fn_sig| fn_sig),
668670
autoderef_steps: Box::new(|ty| {
669671
debug_assert!(false, "shouldn't be using autoderef_steps outside of typeck");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2505,7 +2505,7 @@ impl<'tcx> TyCtxt<'tcx> {
25052505
ident
25062506
}
25072507

2508-
// FIXME(vincenzoapalzzo): move the HirId to a LocalDefId
2508+
// FIXME(vincenzopalazzo): move the HirId to a LocalDefId
25092509
pub fn adjust_ident_and_get_scope(
25102510
self,
25112511
mut ident: Ident,

‎compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,7 +2267,6 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
22672267
if self.tcx.lang_items().sized_trait() == Some(trait_ref.def_id()) {
22682268
if let None = self.tainted_by_errors() {
22692269
self.emit_inference_failure_err(
2270-
obligation.cause.body_id,
22712270
span,
22722271
trait_ref.self_ty().skip_binder().into(),
22732272
ErrorCode::E0282,
@@ -2294,13 +2293,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
22942293
let subst = data.trait_ref.substs.iter().find(|s| s.has_non_region_infer());
22952294

22962295
let mut err = if let Some(subst) = subst {
2297-
self.emit_inference_failure_err(
2298-
obligation.cause.body_id,
2299-
span,
2300-
subst,
2301-
ErrorCode::E0283,
2302-
true,
2303-
)
2296+
self.emit_inference_failure_err(span, subst, ErrorCode::E0283, true)
23042297
} else {
23052298
struct_span_err!(
23062299
self.tcx.sess,
@@ -2467,13 +2460,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
24672460
return;
24682461
}
24692462

2470-
self.emit_inference_failure_err(
2471-
obligation.cause.body_id,
2472-
span,
2473-
arg,
2474-
ErrorCode::E0282,
2475-
false,
2476-
)
2463+
self.emit_inference_failure_err(span, arg, ErrorCode::E0282, false)
24772464
}
24782465

24792466
ty::PredicateKind::Subtype(data) => {
@@ -2487,13 +2474,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
24872474
let SubtypePredicate { a_is_expected: _, a, b } = data;
24882475
// both must be type variables, or the other would've been instantiated
24892476
assert!(a.is_ty_var() && b.is_ty_var());
2490-
self.emit_inference_failure_err(
2491-
obligation.cause.body_id,
2492-
span,
2493-
a.into(),
2494-
ErrorCode::E0282,
2495-
true,
2496-
)
2477+
self.emit_inference_failure_err(span, a.into(), ErrorCode::E0282, true)
24972478
}
24982479
ty::PredicateKind::Clause(ty::Clause::Projection(data)) => {
24992480
if predicate.references_error() || self.tainted_by_errors().is_some() {
@@ -2506,13 +2487,8 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
25062487
.chain(Some(data.term.into_arg()))
25072488
.find(|g| g.has_non_region_infer());
25082489
if let Some(subst) = subst {
2509-
let mut err = self.emit_inference_failure_err(
2510-
obligation.cause.body_id,
2511-
span,
2512-
subst,
2513-
ErrorCode::E0284,
2514-
true,
2515-
);
2490+
let mut err =
2491+
self.emit_inference_failure_err(span, subst, ErrorCode::E0284, true);
25162492
err.note(&format!("cannot satisfy `{}`", predicate));
25172493
err
25182494
} else {
@@ -2535,13 +2511,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
25352511
}
25362512
let subst = data.walk().find(|g| g.is_non_region_infer());
25372513
if let Some(subst) = subst {
2538-
let err = self.emit_inference_failure_err(
2539-
obligation.cause.body_id,
2540-
span,
2541-
subst,
2542-
ErrorCode::E0284,
2543-
true,
2544-
);
2514+
let err = self.emit_inference_failure_err(span, subst, ErrorCode::E0284, true);
25452515
err
25462516
} else {
25472517
// If we can't find a substitution, just print a generic error

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pub trait TypeErrCtxtExt<'tcx> {
212212

213213
fn extract_callable_info(
214214
&self,
215-
hir_id: HirId,
215+
body_id: LocalDefId,
216216
param_env: ty::ParamEnv<'tcx>,
217217
found: Ty<'tcx>,
218218
) -> Option<(DefIdOrName, Ty<'tcx>, Vec<Ty<'tcx>>)>;
@@ -908,9 +908,8 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
908908
trait_pred.self_ty(),
909909
);
910910

911-
let body_hir_id = self.tcx.hir().local_def_id_to_hir_id(obligation.cause.body_id);
912911
let Some((def_id_or_name, output, inputs)) = self.extract_callable_info(
913-
body_hir_id,
912+
obligation.cause.body_id,
914913
obligation.param_env,
915914
self_ty,
916915
) else { return false; };
@@ -1112,10 +1111,9 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
11121111
/// Extracts information about a callable type for diagnostics. This is a
11131112
/// heuristic -- it doesn't necessarily mean that a type is always callable,
11141113
/// because the callable type must also be well-formed to be called.
1115-
// FIXME(vincenzopalazzo): move the HirId to a LocalDefId
11161114
fn extract_callable_info(
11171115
&self,
1118-
hir_id: HirId,
1116+
body_id: LocalDefId,
11191117
param_env: ty::ParamEnv<'tcx>,
11201118
found: Ty<'tcx>,
11211119
) -> Option<(DefIdOrName, Ty<'tcx>, Vec<Ty<'tcx>>)> {
@@ -1167,7 +1165,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
11671165
})
11681166
}
11691167
ty::Param(param) => {
1170-
let generics = self.tcx.generics_of(hir_id.owner.to_def_id());
1168+
let generics = self.tcx.generics_of(body_id);
11711169
let name = if generics.count() > param.index as usize
11721170
&& let def = generics.param_at(param.index as usize, self.tcx)
11731171
&& matches!(def.kind, ty::GenericParamDefKind::Type { .. })

0 commit comments

Comments
 (0)