bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address code review feedback

Browse source
This commit is contained in:
Eric Holk 2023-12-04 13:43:38 -08:00
parent 26f9954971
commit 50ef8006eb
No known key found for this signature in database
GPG key ID: 8EA6B43ED4CE0911
10 changed files with 53 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_resolve/src/late.rs
View file

@ -916,10 +916,10 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
&sig.decl.output,
);
if let Some((async_node_id, _)) =
if let Some((coro_node_id, _)) =
sig.header.coro_kind.map(|coro_kind| coro_kind.return_id())
{
this.record_lifetime_params_for_impl_trait(async_node_id);
this.record_lifetime_params_for_impl_trait(coro_node_id);
}
},
);
@ -942,13 +942,13 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
this.visit_generics(generics);
let declaration = &sig.decl;
let async_node_id =
let coro_node_id =
sig.header.coro_kind.map(|coro_kind| coro_kind.return_id());
this.with_lifetime_rib(
LifetimeRibKind::AnonymousCreateParameter {
binder: fn_id,
report_in_path: async_node_id.is_some(),
report_in_path: coro_node_id.is_some(),
},
|this| {
this.resolve_fn_signature(
@ -961,7 +961,7 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
&declaration.output,
);
if let Some((async_node_id, _)) = async_node_id {
if let Some((async_node_id, _)) = coro_node_id {
this.record_lifetime_params_for_impl_trait(async_node_id);
}
},
@ -4291,8 +4291,10 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
// `async |x| ...` gets desugared to `|x| async {...}`, so we need to
// resolve the arguments within the proper scopes so that usages of them inside the
// closure are detected as upvars rather than normal closure arg usages.
//
// Similarly, `gen |x| ...` gets desugared to `|x| gen {...}`, so we handle that too.
ExprKind::Closure(box ast::Closure {
coro_kind: Some(CoroutineKind::Async { .. }),
coro_kind: Some(_),
ref fn_decl,
ref body,
..