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")]