rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge Async and Gen into CoroutineKind

Browse Source
This commit is contained in:
Eric Holk
2023-11-30 14:54:39 -08:00
parent 3887b1645a
commit 48d5f1f0f2
25 changed files with 442 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_resolve/src/late.rs
View File

@@ -916,7 +916,7 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
&sig.decl.output,
);
if let Some((async_node_id, _)) = sig.header.asyncness.opt_return_id() {
if let Some((async_node_id, _)) = sig.header.coro_kind.opt_return_id() {
this.record_lifetime_params_for_impl_trait(async_node_id);
}
},
@@ -940,7 +940,7 @@ impl<'a: 'ast, 'ast, 'tcx> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast,
this.visit_generics(generics);
let declaration = &sig.decl;
let async_node_id = sig.header.asyncness.opt_return_id();
let async_node_id = sig.header.coro_kind.opt_return_id();
this.with_lifetime_rib(
LifetimeRibKind::AnonymousCreateParameter {
@@ -4289,7 +4289,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
// 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.
ExprKind::Closure(box ast::Closure {
asyncness: Async::Yes { .. },
coro_kind: CoroutineKind::Async { .. },
ref fn_decl,
ref body,
..