bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

change fn_sig query to use EarlyBinder; remove bound_fn_sig query; add EarlyBinder to fn_sig in metadata

Browse source
This commit is contained in:
Kyle Matsuda 2023-01-18 16:52:47 -07:00
parent e982971ff2
commit c2414dfaa4
80 changed files with 142 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -2599,7 +2599,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
match ty.kind() {
ty::FnDef(_, _) | ty::FnPtr(_) => self.annotate_fn_sig(
self.mir_def_id(),
self.infcx.tcx.bound_fn_sig(self.mir_def_id().into()).subst_identity(),
self.infcx.tcx.fn_sig(self.mir_def_id()).subst_identity(),
),
_ => None,
}

2
compiler/rustc_borrowck/src/diagnostics/mod.rs
View file

@ -1136,7 +1136,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
&& let self_ty = infcx.replace_bound_vars_with_fresh_vars(
fn_call_span,
LateBoundRegionConversionTime::FnCall,
tcx.bound_fn_sig(method_did).subst_identity().input(0),
tcx.fn_sig(method_did).subst_identity().input(0),
)
&& infcx.can_eq(self.param_env, ty, self_ty).is_ok()
{