bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

reverse obligations for better diagnostics on multiple conflicting fn bounds

Browse source
This commit is contained in:
Michael Goulet 2022-10-15 18:48:13 +00:00
parent caa701e3c1
commit bc3516d474
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_hir_typeck/src/closure.rs
View file

@ -231,7 +231,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
for obligation in traits::elaborate_obligations( for obligation in traits::elaborate_obligations(
self.tcx, self.tcx,
self.obligations_for_self_ty(expected_vid).collect(), // Reverse the obligations here, since `elaborate_*` uses a stack,
// and we want to keep inference generally in the same order of
// the registered obligations.
self.obligations_for_self_ty(expected_vid).rev().collect(),
) { ) {
debug!(?obligation.predicate); debug!(?obligation.predicate);
let bound_predicate = obligation.predicate.kind(); let bound_predicate = obligation.predicate.kind();

3
compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
View file

@ -670,7 +670,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub(in super::super) fn obligations_for_self_ty<'b>( pub(in super::super) fn obligations_for_self_ty<'b>(
&'b self, &'b self,
self_ty: ty::TyVid, self_ty: ty::TyVid,
) -> impl Iterator<Item = traits::PredicateObligation<'tcx>> + Captures<'tcx> + 'b { ) -> impl DoubleEndedIterator<Item = traits::PredicateObligation<'tcx>> + Captures<'tcx> + 'b
{
// FIXME: consider using `sub_root_var` here so we // FIXME: consider using `sub_root_var` here so we
// can see through subtyping. // can see through subtyping.
let ty_var_root = self.root_var(self_ty); let ty_var_root = self.root_var(self_ty);