};
if let ty::Param(param_ty) = ty.kind() {
let tcx = self.infcx.tcx;
- let generics = tcx.generics_of(self.mir_def_id);
+ let generics = tcx.generics_of(self.mir_def_id());
let param = generics.type_param(¶m_ty, tcx);
- if let Some(generics) =
- tcx.hir().get_generics(tcx.closure_base_def_id(self.mir_def_id.to_def_id()))
+ if let Some(generics) = tcx
+ .hir()
+ .get_generics(tcx.closure_base_def_id(self.mir_def_id().to_def_id()))
{
suggest_constraining_type_param(
tcx,
format!("`{}` would have to be valid for `{}`...", name, region_name),
);
- let fn_hir_id = self.infcx.tcx.hir().local_def_id_to_hir_id(self.mir_def_id);
+ let fn_hir_id = self.mir_hir_id();
err.span_label(
drop_span,
format!(
match &self
.infcx
.tcx
- .typeck(self.mir_def_id)
+ .typeck(self.mir_def_id())
.node_type(fn_hir_id)
.kind()
{
) -> DiagnosticBuilder<'cx> {
let tcx = self.infcx.tcx;
- let (_, escapes_from) = tcx.article_and_description(self.mir_def_id.to_def_id());
+ let (_, escapes_from) = tcx.article_and_description(self.mir_def_id().to_def_id());
let mut err =
borrowck_errors::borrowed_data_escapes_closure(tcx, escape_span, escapes_from);
) -> Option<AnnotatedBorrowFnSignature<'tcx>> {
// Define a fallback for when we can't match a closure.
let fallback = || {
- let is_closure = self.infcx.tcx.is_closure(self.mir_def_id.to_def_id());
+ let is_closure = self.infcx.tcx.is_closure(self.mir_def_id().to_def_id());
if is_closure {
None
} else {
- let ty = self.infcx.tcx.type_of(self.mir_def_id);
+ let ty = self.infcx.tcx.type_of(self.mir_def_id());
match ty.kind() {
ty::FnDef(_, _) | ty::FnPtr(_) => self.annotate_fn_sig(
- self.mir_def_id.to_def_id(),
- self.infcx.tcx.fn_sig(self.mir_def_id),
+ self.mir_def_id().to_def_id(),
+ self.infcx.tcx.fn_sig(self.mir_def_id()),
),
_ => None,
}