Skip to content

Preserve substitutions when making trait obligations for suggestions #71618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 24, 2020
Merged

Preserve substitutions when making trait obligations for suggestions #71618

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
730c6f3
Preserve substitutions when trying to prove trait obligation
ecstatic-morse Apr 27, 2020
8ea828b
Add regression test for #71394
ecstatic-morse Apr 27, 2020
4d9e9c6
Bless other example of #71394
ecstatic-morse Apr 27, 2020
d2bacb1
Ensure that `new_self_ty` has no escaping bound vars
ecstatic-morse Apr 28, 2020
7278e29
Document invariants of `mk_trait_obligation_with_new_self_ty`
ecstatic-morse May 18, 2020
f99519b
Bail out if `output_ty` has bound variables
ecstatic-morse May 18, 2020
1fad3b7
Use `mk_trait_obligation_with_new_self_ty` for new suggestion
ecstatic-morse May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bail out if output_ty has bound variables
  • Loading branch information
@ecstatic-morse
ecstatic-morse committed May 22, 2020
commit f99519bebb2cdd90379bb2b07a0cfdeeb5d2d469
14 changes: 9 additions & 5 deletions src/librustc_trait_selection/traits/error_reporting/suggestions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,11 +532,15 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
};
let msg = format!("use parentheses to call the {}", callable);

let new_obligation = self.mk_trait_obligation_with_new_self_ty(
obligation.param_env,
trait_ref,
output_ty.skip_binder(),
);
// `mk_trait_obligation_with_new_self_ty` only works for types with no escaping bound
// variables, so bail out if we have any.
let output_ty = match output_ty.no_bound_vars() {
Some(ty) => ty,
None => return,
};

let new_obligation =
self.mk_trait_obligation_with_new_self_ty(obligation.param_env, trait_ref, output_ty);

match self.evaluate_obligation(&new_obligation) {
Ok(
Expand Down