diff options
| author | bors <bors@rust-lang.org> | 2020-12-20 07:01:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-20 07:01:00 +0000 |
| commit | b1964e60b72c2d10e9fd4e801990f8af3f306ac0 (patch) | |
| tree | 5c922d403f94a6393c5492d9cefa3245a3930567 /compiler/rustc_middle/src/ty/layout.rs | |
| parent | 29e32120c33d30ff526fc7f4d94ec9fce0dc10c9 (diff) | |
| parent | 328fcee4af7aed31343244206abb7dff25106d04 (diff) | |
Auto merge of #80163 - jackh726:binder-refactor-part-3, r=lcnr
Make BoundRegion have a kind of BoungRegionKind Split from #76814 Also includes making `replace_escaping_bound_vars` only return `T` Going to r? `@lcnr` Feel free to reassign
Diffstat (limited to 'compiler/rustc_middle/src/ty/layout.rs')
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index d6b3afb3be3..b545b92c925 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -2455,7 +2455,8 @@ impl<'tcx> ty::Instance<'tcx> { ty::Generator(_, substs, _) => { let sig = substs.as_generator().poly_sig(); - let env_region = ty::ReLateBound(ty::INNERMOST, ty::BrEnv); + let br = ty::BoundRegion { kind: ty::BrEnv }; + let env_region = ty::ReLateBound(ty::INNERMOST, br); let env_ty = tcx.mk_mut_ref(tcx.mk_region(env_region), ty); let pin_did = tcx.require_lang_item(LangItem::Pin, None); |