bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove NEW_COLLECT_LIFETIMES env var

Browse source
This commit is contained in:
Santiago Pastorino 2022-07-26 11:56:26 -03:00
parent 399609e841
commit fac763168f
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 82 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/rustc_ast_lowering/src/lib.rs
View file

@ -1377,7 +1377,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
let hir_bounds = if origin == hir::OpaqueTyOrigin::TyAlias { let hir_bounds = if origin == hir::OpaqueTyOrigin::TyAlias {
lctx.lower_param_bounds(bounds, itctx, true) lctx.lower_param_bounds(bounds, itctx, true)
} else { } else {
if std::env::var("NEW_COLLECT_LIFETIMES").is_ok() {
debug!(?lctx.captured_lifetimes); debug!(?lctx.captured_lifetimes);
let lifetime_stash = std::mem::replace( let lifetime_stash = std::mem::replace(
@ -1397,10 +1396,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
let ident = lifetime.ident; let ident = lifetime.ident;
let span = ident.span; let span = ident.span;
let res = lctx let res =
.resolver lctx.resolver.get_lifetime_res(lifetime.id).unwrap_or(LifetimeRes::Error);
.get_lifetime_res(lifetime.id)
.unwrap_or(LifetimeRes::Error);
debug!(?res); debug!(?res);
if let Some(mut captured_lifetimes) = lctx.captured_lifetimes.take() { if let Some(mut captured_lifetimes) = lctx.captured_lifetimes.take() {
@ -1472,30 +1469,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
let ret = lctx.lower_param_bounds(bounds, itctx, false); let ret = lctx.lower_param_bounds(bounds, itctx, false);
let ctxt = let ctxt = std::mem::replace(&mut lctx.captured_lifetimes, lifetime_stash).unwrap();
std::mem::replace(&mut lctx.captured_lifetimes, lifetime_stash).unwrap();
collected_lifetimes = ctxt.captures; collected_lifetimes = ctxt.captures;
ret ret
} else {
let lifetime_stash = std::mem::replace(
&mut lctx.captured_lifetimes,
Some(LifetimeCaptureContext {
parent_def_id: opaque_ty_def_id,
captures: std::mem::take(&mut collected_lifetimes),
binders_to_ignore: Default::default(),
}),
);
let ret = lctx.lower_param_bounds(bounds, itctx, true);
let ctxt =
std::mem::replace(&mut lctx.captured_lifetimes, lifetime_stash).unwrap();
collected_lifetimes = ctxt.captures;
ret
}
}; };
debug!(?collected_lifetimes); debug!(?collected_lifetimes);