Skip to content

Commit 705d798

Browse files
eholkeholk
committed
Option<CoroutineKind>
1 parent d116f17 commit 705d798

File tree

22 files changed

+113
-120
lines changed

22 files changed

+113
-120
lines changed

‎compiler/rustc_ast/src/ast.rs

+8-17
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ pub struct Closure {
13111311
pub binder: ClosureBinder,
13121312
pub capture_clause: CaptureBy,
13131313
pub constness: Const,
1314-
pub coro_kind: CoroutineKind,
1314+
pub coro_kind: Option<CoroutineKind>,
13151315
pub movability: Movability,
13161316
pub fn_decl: P<FnDecl>,
13171317
pub body: P<Expr>,
@@ -2405,8 +2405,6 @@ pub enum CoroutineKind {
24052405
Async { span: Span, closure_id: NodeId, return_impl_trait_id: NodeId },
24062406
/// `gen`, which evaluates to `impl Iterator`
24072407
Gen { span: Span, closure_id: NodeId, return_impl_trait_id: NodeId },
2408-
/// Neither `async` nor `gen`
2409-
None,
24102408
}
24112409

24122410
impl CoroutineKind {
@@ -2418,14 +2416,12 @@ impl CoroutineKind {
24182416
matches!(self, CoroutineKind::Gen { .. })
24192417
}
24202418

2421-
/// In this case this is an `async` return, the `NodeId` for the generated `impl Trait` item.
2422-
pub fn opt_return_id(self) -> Option<(NodeId, Span)> {
2419+
/// In this case this is an `async` or `gen` return, the `NodeId` for the generated `impl Trait`
2420+
/// item.
2421+
pub fn return_id(self) -> (NodeId, Span) {
24232422
match self {
24242423
CoroutineKind::Async { return_impl_trait_id, span, .. }
2425-
| CoroutineKind::Gen { return_impl_trait_id, span, .. } => {
2426-
Some((return_impl_trait_id, span))
2427-
}
2428-
CoroutineKind::None => None,
2424+
| CoroutineKind::Gen { return_impl_trait_id, span, .. } => (return_impl_trait_id, span),
24292425
}
24302426
}
24312427
}
@@ -2830,7 +2826,7 @@ pub struct FnHeader {
28302826
/// The `unsafe` keyword, if any
28312827
pub unsafety: Unsafe,
28322828
/// Whether this is `async`, `gen`, or nothing.
2833-
pub coro_kind: CoroutineKind,
2829+
pub coro_kind: Option<CoroutineKind>,
28342830
/// The `const` keyword, if any
28352831
pub constness: Const,
28362832
/// The `extern` keyword and corresponding ABI string, if any
@@ -2842,20 +2838,15 @@ impl FnHeader {
28422838
pub fn has_qualifiers(&self) -> bool {
28432839
let Self { unsafety, coro_kind, constness, ext } = self;
28442840
matches!(unsafety, Unsafe::Yes(_))
2845-
|| !matches!(coro_kind, CoroutineKind::None)
2841+
|| coro_kind.is_some()
28462842
|| matches!(constness, Const::Yes(_))
28472843
|| !matches!(ext, Extern::None)
28482844
}
28492845
}
28502846

28512847
impl Default for FnHeader {
28522848
fn default() -> FnHeader {
2853-
FnHeader {
2854-
unsafety: Unsafe::No,
2855-
coro_kind: CoroutineKind::None,
2856-
constness: Const::No,
2857-
ext: Extern::None,
2858-
}
2849+
FnHeader { unsafety: Unsafe::No, coro_kind: None, constness: Const::No, ext: Extern::None }
28592850
}
28602851
}
28612852

‎compiler/rustc_ast/src/mut_visit.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,6 @@ pub fn noop_visit_coro_kind<T: MutVisitor>(coro_kind: &mut CoroutineKind, vis: &
878878
vis.visit_id(closure_id);
879879
vis.visit_id(return_impl_trait_id);
880880
}
881-
CoroutineKind::None => {}
882881
}
883882
}
884883

@@ -1173,7 +1172,7 @@ fn visit_const_item<T: MutVisitor>(
11731172
pub fn noop_visit_fn_header<T: MutVisitor>(header: &mut FnHeader, vis: &mut T) {
11741173
let FnHeader { unsafety, coro_kind, constness, ext: _ } = header;
11751174
visit_constness(constness, vis);
1176-
vis.visit_coro_kind(coro_kind);
1175+
coro_kind.as_mut().map(|coro_kind| vis.visit_coro_kind(coro_kind));
11771176
visit_unsafety(unsafety, vis);
11781177
}
11791178

@@ -1416,7 +1415,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
14161415
}) => {
14171416
vis.visit_closure_binder(binder);
14181417
visit_constness(constness, vis);
1419-
vis.visit_coro_kind(coro_kind);
1418+
coro_kind.as_mut().map(|coro_kind| vis.visit_coro_kind(coro_kind));
14201419
vis.visit_capture_by(capture_clause);
14211420
vis.visit_fn_decl(fn_decl);
14221421
vis.visit_expr(body);

‎compiler/rustc_ast_lowering/src/expr.rs

+6-17
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
204204
fn_decl_span,
205205
fn_arg_span,
206206
}) => match coro_kind {
207-
CoroutineKind::Async { closure_id, .. } => self.lower_expr_async_closure(
207+
Some(CoroutineKind::Async { closure_id, .. }) => self.lower_expr_async_closure(
208208
binder,
209209
*capture_clause,
210210
e.id,
@@ -215,10 +215,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
215215
*fn_decl_span,
216216
*fn_arg_span,
217217
),
218-
CoroutineKind::Gen { .. } => {
218+
Some(CoroutineKind::Gen { .. }) => {
219219
span_bug!(e.span, "generator closures are not allowed")
220220
}
221-
CoroutineKind::None => self.lower_expr_closure(
221+
None => self.lower_expr_closure(
222222
binder,
223223
*capture_clause,
224224
e.id,
@@ -937,13 +937,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
937937

938938
let bound_generic_params = self.lower_lifetime_binder(closure_id, generic_params);
939939
// Lower outside new scope to preserve `is_in_loop_condition`.
940-
let fn_decl = self.lower_fn_decl(
941-
decl,
942-
closure_id,
943-
fn_decl_span,
944-
FnDeclKind::Closure,
945-
CoroutineKind::None,
946-
);
940+
let fn_decl = self.lower_fn_decl(decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
947941

948942
let c = self.arena.alloc(hir::Closure {
949943
def_id: self.local_def_id(closure_id),
@@ -1058,13 +1052,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
10581052
// We need to lower the declaration outside the new scope, because we
10591053
// have to conserve the state of being inside a loop condition for the
10601054
// closure argument types.
1061-
let fn_decl = self.lower_fn_decl(
1062-
&outer_decl,
1063-
closure_id,
1064-
fn_decl_span,
1065-
FnDeclKind::Closure,
1066-
CoroutineKind::None,
1067-
);
1055+
let fn_decl =
1056+
self.lower_fn_decl(&outer_decl, closure_id, fn_decl_span, FnDeclKind::Closure, None);
10681057

10691058
let c = self.arena.alloc(hir::Closure {
10701059
def_id: self.local_def_id(closure_id),

‎compiler/rustc_ast_lowering/src/item.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
603603
i.id,
604604
sig.span,
605605
FnDeclKind::ExternFn,
606-
CoroutineKind::None,
606+
None,
607607
),
608608
this.lower_fn_params_to_names(fdec),
609609
)
@@ -842,7 +842,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
842842
},
843843
),
844844
AssocItemKind::Fn(box Fn { sig, generics, body, .. }) => {
845-
self.current_item = Some(i.span);
846845
let body_id = self.lower_maybe_coroutine_body(
847846
i.span,
848847
hir_id,
@@ -1026,15 +1025,16 @@ impl<'hir> LoweringContext<'_, 'hir> {
10261025
span: Span,
10271026
fn_id: hir::HirId,
10281027
decl: &FnDecl,
1029-
coro_kind: CoroutineKind,
1028+
coro_kind: Option<CoroutineKind>,
10301029
body: Option<&Block>,
10311030
) -> hir::BodyId {
1032-
let (closure_id, body) = match (coro_kind, body) {
1033-
(
1034-
CoroutineKind::Async { closure_id, .. } | CoroutineKind::Gen { closure_id, .. },
1035-
Some(body),
1036-
) => (closure_id, body),
1037-
_ => return self.lower_fn_body_block(span, decl, body),
1031+
let (Some(coro_kind), Some(body)) = (coro_kind, body) else {
1032+
return self.lower_fn_body_block(span, decl, body);
1033+
};
1034+
let closure_id = match coro_kind {
1035+
CoroutineKind::Async { closure_id, .. } | CoroutineKind::Gen { closure_id, .. } => {
1036+
closure_id
1037+
}
10381038
};
10391039

10401040
self.lower_body(|this| {
@@ -1219,7 +1219,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
12191219
hir::CoroutineSource::Fn,
12201220
mkbody,
12211221
),
1222-
CoroutineKind::None => unreachable!("we must have either an async fn or a gen fn"),
12231222
};
12241223

12251224
let hir_id = this.lower_node_id(closure_id);
@@ -1236,7 +1235,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12361235
sig: &FnSig,
12371236
id: NodeId,
12381237
kind: FnDeclKind,
1239-
coro_kind: CoroutineKind,
1238+
coro_kind: Option<CoroutineKind>,
12401239
) -> (&'hir hir::Generics<'hir>, hir::FnSig<'hir>) {
12411240
let header = self.lower_fn_header(sig.header);
12421241
let itctx = ImplTraitContext::Universal;
@@ -1248,7 +1247,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12481247
}
12491248

12501249
fn lower_fn_header(&mut self, h: FnHeader) -> hir::FnHeader {
1251-
let asyncness = if let CoroutineKind::Async { span, .. } = h.coro_kind {
1250+
let asyncness = if let Some(CoroutineKind::Async { span, .. }) = h.coro_kind {
12521251
hir::IsAsync::Async(span)
12531252
} else {
12541253
hir::IsAsync::NotAsync

‎compiler/rustc_ast_lowering/src/lib.rs

+4-14
Original file line numberDiff line numberDiff line change
@@ -1364,13 +1364,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
13641364
generic_params,
13651365
unsafety: self.lower_unsafety(f.unsafety),
13661366
abi: self.lower_extern(f.ext),
1367-
decl: self.lower_fn_decl(
1368-
&f.decl,
1369-
t.id,
1370-
t.span,
1371-
FnDeclKind::Pointer,
1372-
CoroutineKind::None,
1373-
),
1367+
decl: self.lower_fn_decl(&f.decl, t.id, t.span, FnDeclKind::Pointer, None),
13741368
param_names: self.lower_fn_params_to_names(&f.decl),
13751369
}))
13761370
}
@@ -1805,7 +1799,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
18051799
fn_node_id: NodeId,
18061800
fn_span: Span,
18071801
kind: FnDeclKind,
1808-
coro: CoroutineKind,
1802+
coro: Option<CoroutineKind>,
18091803
) -> &'hir hir::FnDecl<'hir> {
18101804
let c_variadic = decl.c_variadic();
18111805

@@ -1835,11 +1829,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
18351829
}));
18361830

18371831
let output = match coro {
1838-
CoroutineKind::Async { .. } | CoroutineKind::Gen { .. } => {
1832+
Some(coro) => {
18391833
let fn_def_id = self.local_def_id(fn_node_id);
18401834
self.lower_coroutine_fn_ret_ty(&decl.output, fn_def_id, coro, kind, fn_span)
18411835
}
1842-
CoroutineKind::None => match &decl.output {
1836+
None => match &decl.output {
18431837
FnRetTy::Ty(ty) => {
18441838
let context = if kind.return_impl_trait_allowed() {
18451839
let fn_def_id = self.local_def_id(fn_node_id);
@@ -1916,9 +1910,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
19161910
let opaque_ty_node_id = match coro {
19171911
CoroutineKind::Async { return_impl_trait_id, .. }
19181912
| CoroutineKind::Gen { return_impl_trait_id, .. } => return_impl_trait_id,
1919-
CoroutineKind::None => {
1920-
unreachable!("lower_coroutine_fn_ret_ty must be called with either Async or Gen")
1921-
}
19221913
};
19231914

19241915
let captured_lifetimes: Vec<_> = self
@@ -1976,7 +1967,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
19761967
let (symbol, lang_item) = match coro {
19771968
CoroutineKind::Async { .. } => (hir::FN_OUTPUT_NAME, hir::LangItem::Future),
19781969
CoroutineKind::Gen { .. } => (hir::ITERATOR_ITEM_NAME, hir::LangItem::Iterator),
1979-
CoroutineKind::None => panic!("attemping to lower output type of non-coroutine fn"),
19801970
};
19811971

19821972
let future_args = self.arena.alloc(hir::GenericArgs {

‎compiler/rustc_ast_passes/src/ast_validation.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -1268,13 +1268,18 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12681268

12691269
self.check_c_variadic_type(fk);
12701270

1271-
// Functions cannot both be `const async`
1271+
// Functions cannot both be `const async` or `const gen`
12721272
if let Some(&FnHeader {
12731273
constness: Const::Yes(cspan),
1274-
coro_kind: CoroutineKind::Async { span: aspan, .. },
1274+
coro_kind:
1275+
Some(
1276+
CoroutineKind::Async { span: aspan, .. }
1277+
| CoroutineKind::Gen { span: aspan, .. },
1278+
),
12751279
..
12761280
}) = fk.header()
12771281
{
1282+
// FIXME(eholk): Report a different error for `const gen`
12781283
self.err_handler().emit_err(errors::ConstAndAsync {
12791284
spans: vec![cspan, aspan],
12801285
cspan,

‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1492,7 +1492,6 @@ impl<'a> State<'a> {
14921492

14931493
fn print_coro_kind(&mut self, coro_kind: ast::CoroutineKind) {
14941494
match coro_kind {
1495-
ast::CoroutineKind::None => {}
14961495
ast::CoroutineKind::Gen { .. } => {
14971496
self.word_nbsp("gen");
14981497
}
@@ -1691,7 +1690,7 @@ impl<'a> State<'a> {
16911690

16921691
fn print_fn_header_info(&mut self, header: ast::FnHeader) {
16931692
self.print_constness(header.constness);
1694-
self.print_coro_kind(header.coro_kind);
1693+
header.coro_kind.map(|coro_kind| self.print_coro_kind(coro_kind));
16951694
self.print_unsafety(header.unsafety);
16961695

16971696
match header.ext {

‎compiler/rustc_ast_pretty/src/pprust/state/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ impl<'a> State<'a> {
423423
self.print_closure_binder(binder);
424424
self.print_constness(*constness);
425425
self.print_movability(*movability);
426-
self.print_coro_kind(*coro_kind);
426+
coro_kind.map(|coro_kind| self.print_coro_kind(coro_kind));
427427
self.print_capture_clause(*capture_clause);
428428

429429
self.print_fn_params_and_ret(fn_decl, true);

‎compiler/rustc_builtin_macros/src/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ fn check_test_signature(
541541
return Err(sd.emit_err(errors::TestBadFn { span: i.span, cause: span, kind: "unsafe" }));
542542
}
543543

544-
if let ast::CoroutineKind::Async { span, .. } = f.sig.header.coro_kind {
544+
if let Some(ast::CoroutineKind::Async { span, .. }) = f.sig.header.coro_kind {
545545
return Err(sd.emit_err(errors::TestBadFn { span: i.span, cause: span, kind: "async" }));
546546
}
547547

‎compiler/rustc_expand/src/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl<'a> ExtCtxt<'a> {
547547
binder: ast::ClosureBinder::NotPresent,
548548
capture_clause: ast::CaptureBy::Ref,
549549
constness: ast::Const::No,
550-
coro_kind: ast::CoroutineKind::None,
550+
coro_kind: None,
551551
movability: ast::Movability::Movable,
552552
fn_decl,
553553
body,

‎compiler/rustc_lint/src/early.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
162162
// Explicitly check for lints associated with 'closure_id', since
163163
// it does not have a corresponding AST node
164164
if let ast_visit::FnKind::Fn(_, _, sig, _, _, _) = fk {
165-
if let ast::CoroutineKind::Async { closure_id, .. }
166-
| ast::CoroutineKind::Gen { closure_id, .. } = sig.header.coro_kind
165+
if let Some(
166+
ast::CoroutineKind::Async { closure_id, .. }
167+
| ast::CoroutineKind::Gen { closure_id, .. },
168+
) = sig.header.coro_kind
167169
{
168170
self.check_id(closure_id);
169171
}
@@ -226,8 +228,10 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
226228
match e.kind {
227229
ast::ExprKind::Closure(box ast::Closure {
228230
coro_kind:
229-
ast::CoroutineKind::Async { closure_id, .. }
230-
| ast::CoroutineKind::Gen { closure_id, .. },
231+
Some(
232+
ast::CoroutineKind::Async { closure_id, .. }
233+
| ast::CoroutineKind::Gen { closure_id, .. },
234+
),
231235
..
232236
}) => self.check_id(closure_id),
233237
_ => {}

‎compiler/rustc_parse/src/parser/expr.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::{
1010
use crate::errors;
1111
use crate::maybe_recover_from_interpolated_ty_qpath;
1212
use ast::mut_visit::{noop_visit_expr, MutVisitor};
13-
use ast::{GenBlockKind, Pat, Path, PathSegment};
13+
use ast::{CoroutineKind, GenBlockKind, Pat, Path, PathSegment};
1414
use core::mem;
1515
use rustc_ast::ptr::P;
1616
use rustc_ast::token::{self, Delimiter, Token, TokenKind};
@@ -21,9 +21,7 @@ use rustc_ast::util::parser::{prec_let_scrutinee_needs_par, AssocOp, Fixity};
2121
use rustc_ast::visit::Visitor;
2222
use rustc_ast::{self as ast, AttrStyle, AttrVec, CaptureBy, ExprField, UnOp, DUMMY_NODE_ID};
2323
use rustc_ast::{AnonConst, BinOp, BinOpKind, FnDecl, FnRetTy, MacCall, Param, Ty, TyKind};
24-
use rustc_ast::{
25-
Arm, BlockCheckMode, CoroutineKind, Expr, ExprKind, Label, Movability, RangeLimits,
26-
};
24+
use rustc_ast::{Arm, BlockCheckMode, Expr, ExprKind, Label, Movability, RangeLimits};
2725
use rustc_ast::{ClosureBinder, MetaItemLit, StmtKind};
2826
use rustc_ast_pretty::pprust;
2927
use rustc_data_structures::stack::ensure_sufficient_stack;
@@ -2239,7 +2237,7 @@ impl<'a> Parser<'a> {
22392237
let asyncness = if self.token.uninterpolated_span().at_least_rust_2018() {
22402238
self.parse_asyncness(Case::Sensitive)
22412239
} else {
2242-
CoroutineKind::None
2240+
None
22432241
};
22442242

22452243
let capture_clause = self.parse_capture_clause()?;
@@ -2263,7 +2261,7 @@ impl<'a> Parser<'a> {
22632261
}
22642262
};
22652263

2266-
if let CoroutineKind::Async { span, .. } = asyncness {
2264+
if let Some(CoroutineKind::Async { span, .. }) = asyncness {
22672265
// Feature-gate `async ||` closures.
22682266
self.sess.gated_spans.gate(sym::async_closure, span);
22692267
}

0 commit comments

Comments
 (0)