bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rebase, use Ty in CallArgument and re-insert static_assert_size on ConstraintCategory

Browse source
This commit is contained in:
b-naber 2022-05-25 23:32:27 +02:00
parent 99fa123f66
commit 3c6c8d5a8d
4 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_borrowck/src/diagnostics/region_errors.rs
View file

@ -788,7 +788,11 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
let tcx = self.infcx.tcx;
let instance = if let ConstraintCategory::CallArgument(Some((fn_did, substs))) = category {
let instance = if let ConstraintCategory::CallArgument(Some(func_ty)) = category {
let (fn_did, substs) = match func_ty.kind() {
ty::FnDef(fn_did, substs) => (fn_did, substs),
_ => return,
};
debug!(?fn_did, ?substs);
// Only suggest this on function calls, not closures
@ -821,13 +825,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
let mut visitor = TraitObjectVisitor(FxHashSet::default());
visitor.visit_ty(param.param_ty);
if let Some((ident, self_ty)) =
self.get_impl_ident_and_self_ty_from_trait(instance.def_id(), &visitor.0)
{
self.suggest_constrain_dyn_trait_in_impl(diag, &visitor.0, ident, self_ty)
} else {
return;
};
let Some((ident, self_ty)) =
self.get_impl_ident_and_self_ty_from_trait(instance.def_id(), &visitor.0) else {return};
self.suggest_constrain_dyn_trait_in_impl(diag, &visitor.0, ident, self_ty);
}
#[instrument(skip(self, err), level = "debug")]

20
compiler/rustc_borrowck/src/type_check/mod.rs
View file

@ -1418,7 +1418,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
ref args,
ref destination,
from_hir_call,
fn_span,
target,
..
} => {
self.check_operand(func, term_location);
@ -1427,9 +1427,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
}
let func_ty = func.ty(body, tcx);
debug!("check_terminator: call, func_ty={:?}", func_ty);
debug!("func_ty.kind: {:?}", func_ty.kind());
debug!(?fn_span);
let sig = match func_ty.kind() {
ty::FnDef(..) | ty::FnPtr(_) => func_ty.fn_sig(tcx),
_ => {
@ -1444,7 +1443,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
);
debug!(?sig);
let sig = self.normalize(sig, term_location);
self.check_call_dest(body, term, &sig, destination, target, term_location);
self.check_call_dest(body, term, &sig, *destination, target, term_location);
self.prove_predicates(
sig.inputs_and_output
@ -1604,24 +1603,19 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
span_mirbug!(self, term, "call to {:?} with wrong # of args", sig);
}
let call_arg = if let TerminatorKind::Call { func, .. } = &term.kind {
let func_ty = func.ty(body, self.infcx.tcx);
if let ty::FnDef(fn_did, substs) = func_ty.kind() {
Some((*fn_did, *substs))
} else {
None
}
let func_ty = if let TerminatorKind::Call { func, .. } = &term.kind {
Some(func.ty(body, self.infcx.tcx))
} else {
None
};
debug!(?call_arg);
debug!(?func_ty);
for (n, (fn_arg, op_arg)) in iter::zip(sig.inputs(), args).enumerate() {
let op_arg_ty = op_arg.ty(body, self.tcx());
let op_arg_ty = self.normalize(op_arg_ty, term_location);
let category = if from_hir_call {
ConstraintCategory::CallArgument(call_arg)
ConstraintCategory::CallArgument(func_ty)
} else {
ConstraintCategory::Boring
};