diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-07-12 01:26:31 +0200 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2017-07-28 15:46:24 +0200 |
| commit | 66b8a12a6d2dd0e71781becedec0fe35729c2f41 (patch) | |
| tree | eff16a5dd6877f8c88a21e5ddab1724d46606661 /src | |
| parent | bfd71c5b7044970ec34c7829b0ffaddb3b1dc4a4 (diff) | |
| download | rust-66b8a12a6d2dd0e71781becedec0fe35729c2f41.tar.gz rust-66b8a12a6d2dd0e71781becedec0fe35729c2f41.zip | |
Fix upstream changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/traits/project.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/traits/project.rs b/src/librustc/traits/project.rs index 91d6fac26f1..b97c2b77d10 100644 --- a/src/librustc/traits/project.rs +++ b/src/librustc/traits/project.rs @@ -1158,10 +1158,10 @@ fn confirm_generator_candidate<'cx, 'gcx, 'tcx>( // Note: we unwrap the binder here but re-create it below (1) let ty::Binder((trait_ref, yield_ty, return_ty)) = tcx.generator_trait_ref_and_outputs(gen_def_id, - obligation.predicate.trait_ref.self_ty(), + obligation.predicate.self_ty(), gen_sig); - let name = obligation.predicate.item_name(tcx); + let name = tcx.associated_item(obligation.predicate.item_def_id).name; let ty = if name == Symbol::intern("Return") { return_ty } else if name == Symbol::intern("Yield") { @@ -1172,7 +1172,7 @@ fn confirm_generator_candidate<'cx, 'gcx, 'tcx>( let predicate = ty::Binder(ty::ProjectionPredicate { // (1) recreate binder here projection_ty: ty::ProjectionTy { - trait_ref: trait_ref, + substs: trait_ref.substs, item_def_id: obligation.predicate.item_def_id, }, ty: ty |