Skip to content

Commit 2806c2d

Browse files
compiler-errorscompiler-errors
committed
coro_kind -> coroutine_kind
1 parent 96bb542 commit 2806c2d

File tree

23 files changed

+100
-75
lines changed

23 files changed

+100
-75
lines changed

‎compiler/rustc_ast/src/ast.rs

Lines changed: 10 additions & 5 deletions
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: Option<CoroutineKind>,
1314+
pub coroutine_kind: Option<CoroutineKind>,
13151315
pub movability: Movability,
13161316
pub fn_decl: P<FnDecl>,
13171317
pub body: P<Expr>,
@@ -2840,7 +2840,7 @@ pub struct FnHeader {
28402840
/// The `unsafe` keyword, if any
28412841
pub unsafety: Unsafe,
28422842
/// Whether this is `async`, `gen`, or nothing.
2843-
pub coro_kind: Option<CoroutineKind>,
2843+
pub coroutine_kind: Option<CoroutineKind>,
28442844
/// The `const` keyword, if any
28452845
pub constness: Const,
28462846
/// The `extern` keyword and corresponding ABI string, if any
@@ -2850,17 +2850,22 @@ pub struct FnHeader {
28502850
impl FnHeader {
28512851
/// Does this function header have any qualifiers or is it empty?
28522852
pub fn has_qualifiers(&self) -> bool {
2853-
let Self { unsafety, coro_kind, constness, ext } = self;
2853+
let Self { unsafety, coroutine_kind, constness, ext } = self;
28542854
matches!(unsafety, Unsafe::Yes(_))
2855-
|| coro_kind.is_some()
2855+
|| coroutine_kind.is_some()
28562856
|| matches!(constness, Const::Yes(_))
28572857
|| !matches!(ext, Extern::None)
28582858
}
28592859
}
28602860

28612861
impl Default for FnHeader {
28622862
fn default() -> FnHeader {
2863-
FnHeader { unsafety: Unsafe::No, coro_kind: None, constness: Const::No, ext: Extern::None }
2863+
FnHeader {
2864+
unsafety: Unsafe::No,
2865+
coroutine_kind: None,
2866+
constness: Const::No,
2867+
ext: Extern::None,
2868+
}
28642869
}
28652870
}
28662871

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ pub trait MutVisitor: Sized {
121121
noop_visit_fn_decl(d, self);
122122
}
123123

124-
fn visit_coro_kind(&mut self, a: &mut CoroutineKind) {
125-
noop_visit_coro_kind(a, self);
124+
fn visit_coroutine_kind(&mut self, a: &mut CoroutineKind) {
125+
noop_visit_coroutine_kind(a, self);
126126
}
127127

128128
fn visit_closure_binder(&mut self, b: &mut ClosureBinder) {
@@ -871,8 +871,8 @@ pub fn noop_visit_closure_binder<T: MutVisitor>(binder: &mut ClosureBinder, vis:
871871
}
872872
}
873873

874-
pub fn noop_visit_coro_kind<T: MutVisitor>(coro_kind: &mut CoroutineKind, vis: &mut T) {
875-
match coro_kind {
874+
pub fn noop_visit_coroutine_kind<T: MutVisitor>(coroutine_kind: &mut CoroutineKind, vis: &mut T) {
875+
match coroutine_kind {
876876
CoroutineKind::Async { span, closure_id, return_impl_trait_id }
877877
| CoroutineKind::Gen { span, closure_id, return_impl_trait_id } => {
878878
vis.visit_span(span);
@@ -1171,9 +1171,9 @@ fn visit_const_item<T: MutVisitor>(
11711171
}
11721172

11731173
pub fn noop_visit_fn_header<T: MutVisitor>(header: &mut FnHeader, vis: &mut T) {
1174-
let FnHeader { unsafety, coro_kind, constness, ext: _ } = header;
1174+
let FnHeader { unsafety, coroutine_kind, constness, ext: _ } = header;
11751175
visit_constness(constness, vis);
1176-
coro_kind.as_mut().map(|coro_kind| vis.visit_coro_kind(coro_kind));
1176+
coroutine_kind.as_mut().map(|coroutine_kind| vis.visit_coroutine_kind(coroutine_kind));
11771177
visit_unsafety(unsafety, vis);
11781178
}
11791179

@@ -1407,7 +1407,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
14071407
binder,
14081408
capture_clause,
14091409
constness,
1410-
coro_kind,
1410+
coroutine_kind,
14111411
movability: _,
14121412
fn_decl,
14131413
body,
@@ -1416,7 +1416,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
14161416
}) => {
14171417
vis.visit_closure_binder(binder);
14181418
visit_constness(constness, vis);
1419-
coro_kind.as_mut().map(|coro_kind| vis.visit_coro_kind(coro_kind));
1419+
coroutine_kind.as_mut().map(|coroutine_kind| vis.visit_coroutine_kind(coroutine_kind));
14201420
vis.visit_capture_by(capture_clause);
14211421
vis.visit_fn_decl(fn_decl);
14221422
vis.visit_expr(body);

‎compiler/rustc_ast/src/visit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
861861
ExprKind::Closure(box Closure {
862862
binder,
863863
capture_clause,
864-
coro_kind: _,
864+
coroutine_kind: _,
865865
constness: _,
866866
movability: _,
867867
fn_decl,

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
195195
binder,
196196
capture_clause,
197197
constness,
198-
coro_kind,
198+
coroutine_kind,
199199
movability,
200200
fn_decl,
201201
body,
202202
fn_decl_span,
203203
fn_arg_span,
204-
}) => match coro_kind {
204+
}) => match coroutine_kind {
205205
Some(
206206
CoroutineKind::Async { closure_id, .. }
207207
| CoroutineKind::Gen { closure_id, .. },

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,25 @@ impl<'hir> LoweringContext<'_, 'hir> {
206206
// `impl Future<Output = T>` here because lower_body
207207
// only cares about the input argument patterns in the function
208208
// declaration (decl), not the return types.
209-
let coro_kind = header.coro_kind;
209+
let coroutine_kind = header.coroutine_kind;
210210
let body_id = this.lower_maybe_coroutine_body(
211211
span,
212212
hir_id,
213213
decl,
214-
coro_kind,
214+
coroutine_kind,
215215
body.as_deref(),
216216
);
217217

218218
let itctx = ImplTraitContext::Universal;
219219
let (generics, decl) =
220220
this.lower_generics(generics, header.constness, id, &itctx, |this| {
221-
this.lower_fn_decl(decl, id, *fn_sig_span, FnDeclKind::Fn, coro_kind)
221+
this.lower_fn_decl(
222+
decl,
223+
id,
224+
*fn_sig_span,
225+
FnDeclKind::Fn,
226+
coroutine_kind,
227+
)
222228
});
223229
let sig = hir::FnSig {
224230
decl,
@@ -734,7 +740,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
734740
sig,
735741
i.id,
736742
FnDeclKind::Trait,
737-
sig.header.coro_kind,
743+
sig.header.coroutine_kind,
738744
);
739745
(generics, hir::TraitItemKind::Fn(sig, hir::TraitFn::Required(names)), false)
740746
}
@@ -743,15 +749,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
743749
i.span,
744750
hir_id,
745751
&sig.decl,
746-
sig.header.coro_kind,
752+
sig.header.coroutine_kind,
747753
Some(body),
748754
);
749755
let (generics, sig) = self.lower_method_sig(
750756
generics,
751757
sig,
752758
i.id,
753759
FnDeclKind::Trait,
754-
sig.header.coro_kind,
760+
sig.header.coroutine_kind,
755761
);
756762
(generics, hir::TraitItemKind::Fn(sig, hir::TraitFn::Provided(body_id)), true)
757763
}
@@ -844,15 +850,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
844850
i.span,
845851
hir_id,
846852
&sig.decl,
847-
sig.header.coro_kind,
853+
sig.header.coroutine_kind,
848854
body.as_deref(),
849855
);
850856
let (generics, sig) = self.lower_method_sig(
851857
generics,
852858
sig,
853859
i.id,
854860
if self.is_in_trait_impl { FnDeclKind::Impl } else { FnDeclKind::Inherent },
855-
sig.header.coro_kind,
861+
sig.header.coroutine_kind,
856862
);
857863

858864
(generics, hir::ImplItemKind::Fn(sig, body_id))
@@ -1023,13 +1029,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
10231029
span: Span,
10241030
fn_id: hir::HirId,
10251031
decl: &FnDecl,
1026-
coro_kind: Option<CoroutineKind>,
1032+
coroutine_kind: Option<CoroutineKind>,
10271033
body: Option<&Block>,
10281034
) -> hir::BodyId {
1029-
let (Some(coro_kind), Some(body)) = (coro_kind, body) else {
1035+
let (Some(coroutine_kind), Some(body)) = (coroutine_kind, body) else {
10301036
return self.lower_fn_body_block(span, decl, body);
10311037
};
1032-
let closure_id = match coro_kind {
1038+
let closure_id = match coroutine_kind {
10331039
CoroutineKind::Async { closure_id, .. } | CoroutineKind::Gen { closure_id, .. } => {
10341040
closure_id
10351041
}
@@ -1200,7 +1206,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
12001206

12011207
this.expr_block(body)
12021208
};
1203-
let coroutine_expr = match coro_kind {
1209+
// FIXME(gen_blocks): Consider unifying the `make_*_expr` functions.
1210+
let coroutine_expr = match coroutine_kind {
12041211
CoroutineKind::Async { .. } => this.make_async_expr(
12051212
CaptureBy::Value { move_kw: rustc_span::DUMMY_SP },
12061213
closure_id,
@@ -1233,19 +1240,19 @@ impl<'hir> LoweringContext<'_, 'hir> {
12331240
sig: &FnSig,
12341241
id: NodeId,
12351242
kind: FnDeclKind,
1236-
coro_kind: Option<CoroutineKind>,
1243+
coroutine_kind: Option<CoroutineKind>,
12371244
) -> (&'hir hir::Generics<'hir>, hir::FnSig<'hir>) {
12381245
let header = self.lower_fn_header(sig.header);
12391246
let itctx = ImplTraitContext::Universal;
12401247
let (generics, decl) =
12411248
self.lower_generics(generics, sig.header.constness, id, &itctx, |this| {
1242-
this.lower_fn_decl(&sig.decl, id, sig.span, kind, coro_kind)
1249+
this.lower_fn_decl(&sig.decl, id, sig.span, kind, coroutine_kind)
12431250
});
12441251
(generics, hir::FnSig { header, decl, span: self.lower_span(sig.span) })
12451252
}
12461253

12471254
fn lower_fn_header(&mut self, h: FnHeader) -> hir::FnHeader {
1248-
let asyncness = if let Some(CoroutineKind::Async { span, .. }) = h.coro_kind {
1255+
let asyncness = if let Some(CoroutineKind::Async { span, .. }) = h.coroutine_kind {
12491256
hir::IsAsync::Async(span)
12501257
} else {
12511258
hir::IsAsync::NotAsync

‎compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12711271
// Functions cannot both be `const async` or `const gen`
12721272
if let Some(&FnHeader {
12731273
constness: Const::Yes(cspan),
1274-
coro_kind:
1274+
coroutine_kind:
12751275
Some(
12761276
CoroutineKind::Async { span: aspan, .. }
12771277
| CoroutineKind::Gen { span: aspan, .. },

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,8 +1490,8 @@ impl<'a> State<'a> {
14901490
}
14911491
}
14921492

1493-
fn print_coro_kind(&mut self, coro_kind: ast::CoroutineKind) {
1494-
match coro_kind {
1493+
fn print_coroutine_kind(&mut self, coroutine_kind: ast::CoroutineKind) {
1494+
match coroutine_kind {
14951495
ast::CoroutineKind::Gen { .. } => {
14961496
self.word_nbsp("gen");
14971497
}
@@ -1690,7 +1690,7 @@ impl<'a> State<'a> {
16901690

16911691
fn print_fn_header_info(&mut self, header: ast::FnHeader) {
16921692
self.print_constness(header.constness);
1693-
header.coro_kind.map(|coro_kind| self.print_coro_kind(coro_kind));
1693+
header.coroutine_kind.map(|coroutine_kind| self.print_coroutine_kind(coroutine_kind));
16941694
self.print_unsafety(header.unsafety);
16951695

16961696
match header.ext {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ impl<'a> State<'a> {
413413
binder,
414414
capture_clause,
415415
constness,
416-
coro_kind,
416+
coroutine_kind,
417417
movability,
418418
fn_decl,
419419
body,
@@ -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-
coro_kind.map(|coro_kind| self.print_coro_kind(coro_kind));
426+
coroutine_kind.map(|coroutine_kind| self.print_coroutine_kind(coroutine_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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,11 @@ fn check_test_signature(
541541
return Err(sd.emit_err(errors::TestBadFn { span: i.span, cause: span, kind: "unsafe" }));
542542
}
543543

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

548-
if let Some(ast::CoroutineKind::Gen { span, .. }) = f.sig.header.coro_kind {
548+
if let Some(ast::CoroutineKind::Gen { span, .. }) = f.sig.header.coroutine_kind {
549549
return Err(sd.emit_err(errors::TestBadFn { span: i.span, cause: span, kind: "gen" }));
550550
}
551551

‎compiler/rustc_expand/src/build.rs

Lines changed: 1 addition & 1 deletion
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: None,
550+
coroutine_kind: None,
551551
movability: ast::Movability::Movable,
552552
fn_decl,
553553
body,

0 commit comments

Comments
 (0)