Skip to content

Commit 34daa4f

Browse files
compiler-errorscompiler-errors
committed
Only regular coroutines have movability
1 parent 909dd86 commit 34daa4f

File tree

25 files changed

+130
-101
lines changed

25 files changed

+130
-101
lines changed

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
691691
body,
692692
fn_decl_span: self.lower_span(span),
693693
fn_arg_span: None,
694-
kind: hir::ClosureKind::Coroutine(coroutine_kind, Movability::Static),
694+
kind: hir::ClosureKind::Coroutine(coroutine_kind),
695695
constness: hir::Constness::NotConst,
696696
}))
697697
}
@@ -744,7 +744,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
744744
body,
745745
fn_decl_span: self.lower_span(span),
746746
fn_arg_span: None,
747-
kind: hir::ClosureKind::Coroutine(coroutine_kind, Movability::Movable),
747+
kind: hir::ClosureKind::Coroutine(coroutine_kind),
748748
constness: hir::Constness::NotConst,
749749
}))
750750
}
@@ -829,7 +829,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
829829
body,
830830
fn_decl_span: self.lower_span(span),
831831
fn_arg_span: None,
832-
kind: hir::ClosureKind::Coroutine(coroutine_kind, Movability::Static),
832+
kind: hir::ClosureKind::Coroutine(coroutine_kind),
833833
constness: hir::Constness::NotConst,
834834
}))
835835
}
@@ -898,7 +898,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
898898
let is_async_gen = match self.coroutine_kind {
899899
Some(hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Async, _)) => false,
900900
Some(hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::AsyncGen, _)) => true,
901-
Some(hir::CoroutineKind::Coroutine)
901+
Some(hir::CoroutineKind::Coroutine(_))
902902
| Some(hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Gen, _))
903903
| None => {
904904
return hir::ExprKind::Err(self.tcx.sess.emit_err(AwaitOnlyInAsyncFnAndBlocks {
@@ -1126,11 +1126,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
11261126
movability: Movability,
11271127
) -> hir::ClosureKind {
11281128
match coroutine_kind {
1129-
Some(hir::CoroutineKind::Coroutine) => {
1129+
Some(hir::CoroutineKind::Coroutine(_)) => {
11301130
if decl.inputs.len() > 1 {
11311131
self.tcx.sess.emit_err(CoroutineTooManyParameters { fn_decl_span });
11321132
}
1133-
hir::ClosureKind::Coroutine(hir::CoroutineKind::Coroutine, movability)
1133+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Coroutine(movability))
11341134
}
11351135
Some(
11361136
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Gen, _)
@@ -1655,7 +1655,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
16551655
self.tcx.sess.emit_err(AsyncCoroutinesNotSupported { span }),
16561656
);
16571657
}
1658-
Some(hir::CoroutineKind::Coroutine) | None => {
1658+
Some(hir::CoroutineKind::Coroutine(_)) => {
16591659
if !self.tcx.features().coroutines {
16601660
rustc_session::parse::feature_err(
16611661
&self.tcx.sess.parse_sess,
@@ -1665,7 +1665,19 @@ impl<'hir> LoweringContext<'_, 'hir> {
16651665
)
16661666
.emit();
16671667
}
1668-
self.coroutine_kind = Some(hir::CoroutineKind::Coroutine);
1668+
false
1669+
}
1670+
None => {
1671+
if !self.tcx.features().coroutines {
1672+
rustc_session::parse::feature_err(
1673+
&self.tcx.sess.parse_sess,
1674+
sym::coroutines,
1675+
span,
1676+
"yield syntax is experimental",
1677+
)
1678+
.emit();
1679+
}
1680+
self.coroutine_kind = Some(hir::CoroutineKind::Coroutine(Movability::Movable));
16691681
false
16701682
}
16711683
};

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
848848
move_spans.var_subdiag(None, &mut err, None, |kind, var_span| {
849849
use crate::session_diagnostics::CaptureVarCause::*;
850850
match kind {
851-
hir::ClosureKind::Coroutine(_, _) => MoveUseInCoroutine { var_span },
851+
hir::ClosureKind::Coroutine(_) => MoveUseInCoroutine { var_span },
852852
hir::ClosureKind::Closure => MoveUseInClosure { var_span },
853853
}
854854
});
@@ -893,7 +893,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
893893
let place = &borrow.borrowed_place;
894894
let desc_place = self.describe_any_place(place.as_ref());
895895
match kind {
896-
hir::ClosureKind::Coroutine(_, _) => {
896+
hir::ClosureKind::Coroutine(_) => {
897897
BorrowUsePlaceCoroutine { place: desc_place, var_span, is_single_var: true }
898898
}
899899
hir::ClosureKind::Closure => {
@@ -1042,7 +1042,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10421042
|kind, var_span| {
10431043
use crate::session_diagnostics::CaptureVarCause::*;
10441044
match kind {
1045-
hir::ClosureKind::Coroutine(_, _) => BorrowUsePlaceCoroutine {
1045+
hir::ClosureKind::Coroutine(_) => BorrowUsePlaceCoroutine {
10461046
place: desc_place,
10471047
var_span,
10481048
is_single_var: true,
@@ -1126,7 +1126,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11261126
borrow_spans.var_subdiag(None, &mut err, Some(gen_borrow_kind), |kind, var_span| {
11271127
use crate::session_diagnostics::CaptureVarCause::*;
11281128
match kind {
1129-
hir::ClosureKind::Coroutine(_, _) => BorrowUsePlaceCoroutine {
1129+
hir::ClosureKind::Coroutine(_) => BorrowUsePlaceCoroutine {
11301130
place: desc_place,
11311131
var_span,
11321132
is_single_var: false,
@@ -1146,7 +1146,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11461146
let borrow_place = &issued_borrow.borrowed_place;
11471147
let borrow_place_desc = self.describe_any_place(borrow_place.as_ref());
11481148
match kind {
1149-
hir::ClosureKind::Coroutine(_, _) => {
1149+
hir::ClosureKind::Coroutine(_) => {
11501150
FirstBorrowUsePlaceCoroutine { place: borrow_place_desc, var_span }
11511151
}
11521152
hir::ClosureKind::Closure => {
@@ -1163,7 +1163,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11631163
|kind, var_span| {
11641164
use crate::session_diagnostics::CaptureVarCause::*;
11651165
match kind {
1166-
hir::ClosureKind::Coroutine(_, _) => {
1166+
hir::ClosureKind::Coroutine(_) => {
11671167
SecondBorrowUsePlaceCoroutine { place: desc_place, var_span }
11681168
}
11691169
hir::ClosureKind::Closure => {
@@ -2549,7 +2549,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
25492549
}
25502550
}
25512551
}
2552-
CoroutineKind::Coroutine => "coroutine",
2552+
CoroutineKind::Coroutine(_) => "coroutine",
25532553
},
25542554
None => "closure",
25552555
};
@@ -2850,7 +2850,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
28502850
loan_spans.var_subdiag(None, &mut err, Some(loan.kind), |kind, var_span| {
28512851
use crate::session_diagnostics::CaptureVarCause::*;
28522852
match kind {
2853-
hir::ClosureKind::Coroutine(_, _) => BorrowUseInCoroutine { var_span },
2853+
hir::ClosureKind::Coroutine(_) => BorrowUseInCoroutine { var_span },
28542854
hir::ClosureKind::Closure => BorrowUseInClosure { var_span },
28552855
}
28562856
});
@@ -2866,7 +2866,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
28662866
loan_spans.var_subdiag(None, &mut err, Some(loan.kind), |kind, var_span| {
28672867
use crate::session_diagnostics::CaptureVarCause::*;
28682868
match kind {
2869-
hir::ClosureKind::Coroutine(_, _) => BorrowUseInCoroutine { var_span },
2869+
hir::ClosureKind::Coroutine(_) => BorrowUseInCoroutine { var_span },
28702870
hir::ClosureKind::Closure => BorrowUseInClosure { var_span },
28712871
}
28722872
});

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ impl UseSpans<'_> {
576576
pub(super) fn coroutine_kind(self) -> Option<CoroutineKind> {
577577
match self {
578578
UseSpans::ClosureUse {
579-
closure_kind: hir::ClosureKind::Coroutine(coroutine_kind, _),
579+
closure_kind: hir::ClosureKind::Coroutine(coroutine_kind),
580580
..
581581
} => Some(coroutine_kind),
582582
_ => None,
@@ -605,7 +605,7 @@ impl UseSpans<'_> {
605605
use CaptureVarPathUseCause::*;
606606
if let UseSpans::ClosureUse { closure_kind, path_span, .. } = self {
607607
match closure_kind {
608-
hir::ClosureKind::Coroutine(_, _) => {
608+
hir::ClosureKind::Coroutine(_) => {
609609
err.subdiagnostic(match action {
610610
Borrow => BorrowInCoroutine { path_span },
611611
MatchOn | Use => UseInCoroutine { path_span },
@@ -1248,7 +1248,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
12481248
// another message for the same span
12491249
if !is_loop_message {
12501250
move_spans.var_subdiag(None, err, None, |kind, var_span| match kind {
1251-
hir::ClosureKind::Coroutine(_, _) => {
1251+
hir::ClosureKind::Coroutine(_) => {
12521252
CaptureVarCause::PartialMoveUseInCoroutine { var_span, is_partial }
12531253
}
12541254
hir::ClosureKind::Closure => {

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,10 +1047,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
10471047
}) => {
10481048
if !matches!(
10491049
kind,
1050-
hir::ClosureKind::Coroutine(
1051-
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Async, _),
1050+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(
1051+
hir::CoroutineDesugaring::Async,
10521052
_
1053-
)
1053+
),)
10541054
) {
10551055
closure_span = Some(expr.span.shrink_to_lo());
10561056
}

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -684,10 +684,10 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
684684
hir::FnRetTy::Return(hir_ty) => (fn_decl.output.span(), Some(hir_ty)),
685685
};
686686
let mir_description = match kind {
687-
hir::ClosureKind::Coroutine(
688-
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Async, src),
689-
_,
690-
) => match src {
687+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(
688+
hir::CoroutineDesugaring::Async,
689+
src,
690+
)) => match src {
691691
hir::CoroutineSource::Block => " of async block",
692692
hir::CoroutineSource::Closure => " of async closure",
693693
hir::CoroutineSource::Fn => {
@@ -704,10 +704,10 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
704704
" of async function"
705705
}
706706
},
707-
hir::ClosureKind::Coroutine(
708-
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Gen, src),
709-
_,
710-
) => match src {
707+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(
708+
hir::CoroutineDesugaring::Gen,
709+
src,
710+
)) => match src {
711711
hir::CoroutineSource::Block => " of gen block",
712712
hir::CoroutineSource::Closure => " of gen closure",
713713
hir::CoroutineSource::Fn => {
@@ -722,10 +722,10 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
722722
}
723723
},
724724

725-
hir::ClosureKind::Coroutine(
726-
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::AsyncGen, src),
727-
_,
728-
) => match src {
725+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(
726+
hir::CoroutineDesugaring::AsyncGen,
727+
src,
728+
)) => match src {
729729
hir::CoroutineSource::Block => " of async gen block",
730730
hir::CoroutineSource::Closure => " of async gen closure",
731731
hir::CoroutineSource::Fn => {
@@ -739,7 +739,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
739739
" of async gen function"
740740
}
741741
},
742-
hir::ClosureKind::Coroutine(hir::CoroutineKind::Coroutine, _) => {
742+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Coroutine(_)) => {
743743
" of coroutine"
744744
}
745745
hir::ClosureKind::Closure => " of closure",

‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ fn coroutine_kind_label(coroutine_kind: Option<CoroutineKind>) -> &'static str {
585585
Some(CoroutineKind::Desugared(CoroutineDesugaring::AsyncGen, CoroutineSource::Fn)) => {
586586
"async_gen_fn"
587587
}
588-
Some(CoroutineKind::Coroutine) => "coroutine",
588+
Some(CoroutineKind::Coroutine(_)) => "coroutine",
589589
None => "closure",
590590
}
591591
}

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,17 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
938938

939939
TerminatorKind::InlineAsm { .. } => self.check_op(ops::InlineAsm),
940940

941-
TerminatorKind::CoroutineDrop | TerminatorKind::Yield { .. } => {
942-
self.check_op(ops::Coroutine(hir::CoroutineKind::Coroutine))
941+
TerminatorKind::Yield { .. } => self.check_op(ops::Coroutine(
942+
self.tcx
943+
.coroutine_kind(self.body.source.def_id())
944+
.expect("Only expected to have a yield in a coroutine"),
945+
)),
946+
947+
TerminatorKind::CoroutineDrop => {
948+
span_bug!(
949+
self.body.source_info(location).span,
950+
"We should not encounter TerminatorKind::CoroutineDrop after coroutine transform"
951+
);
943952
}
944953

945954
TerminatorKind::UnwindTerminate(_) => {

‎compiler/rustc_hir/src/hir.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ pub enum ClosureKind {
959959
// FIXME(coroutines): We could probably remove movability here -- it can be deduced
960960
// from the `CoroutineKind` in all cases (except for "plain" coroutines, which could
961961
// carry the movability in the variant).
962-
Coroutine(CoroutineKind, Movability),
962+
Coroutine(CoroutineKind),
963963
}
964964

965965
/// A block of statements `{ .. }`, which may have a label (in this case the
@@ -1364,7 +1364,18 @@ pub enum CoroutineKind {
13641364
Desugared(CoroutineDesugaring, CoroutineSource),
13651365

13661366
/// A coroutine literal created via a `yield` inside a closure.
1367-
Coroutine,
1367+
Coroutine(Movability),
1368+
}
1369+
1370+
impl CoroutineKind {
1371+
pub fn movability(self) -> Movability {
1372+
match self {
1373+
CoroutineKind::Desugared(CoroutineDesugaring::Async, _)
1374+
| CoroutineKind::Desugared(CoroutineDesugaring::AsyncGen, _) => Movability::Static,
1375+
CoroutineKind::Desugared(CoroutineDesugaring::Gen, _) => Movability::Movable,
1376+
CoroutineKind::Coroutine(mov) => mov,
1377+
}
1378+
}
13681379
}
13691380

13701381
impl fmt::Display for CoroutineKind {
@@ -1374,7 +1385,7 @@ impl fmt::Display for CoroutineKind {
13741385
d.fmt(f)?;
13751386
k.fmt(f)
13761387
}
1377-
CoroutineKind::Coroutine => f.write_str("coroutine"),
1388+
CoroutineKind::Coroutine(_) => f.write_str("coroutine"),
13781389
}
13791390
}
13801391
}

‎compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ fn coroutine_kind(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Option<hir::CoroutineK
15541554
Node::Expr(&hir::Expr {
15551555
kind:
15561556
hir::ExprKind::Closure(&rustc_hir::Closure {
1557-
kind: hir::ClosureKind::Coroutine(kind, _),
1557+
kind: hir::ClosureKind::Coroutine(kind),
15581558
..
15591559
}),
15601560
..

‎compiler/rustc_hir_analysis/src/collect/generics_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
343343
{
344344
let dummy_args = match kind {
345345
ClosureKind::Closure => &["<closure_kind>", "<closure_signature>", "<upvars>"][..],
346-
ClosureKind::Coroutine(_, _) => {
346+
ClosureKind::Coroutine(_) => {
347347
&["<resume_ty>", "<yield_ty>", "<return_ty>", "<witness>", "<upvars>"][..]
348348
}
349349
};

‎compiler/rustc_hir_typeck/src/callee.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
306306
{
307307
let fn_decl_span = if matches!(
308308
kind,
309-
hir::ClosureKind::Coroutine(
310-
hir::CoroutineKind::Desugared(
311-
hir::CoroutineDesugaring::Async,
312-
hir::CoroutineSource::Closure
313-
),
314-
_
315-
)
309+
hir::ClosureKind::Coroutine(hir::CoroutineKind::Desugared(
310+
hir::CoroutineDesugaring::Async,
311+
hir::CoroutineSource::Closure
312+
),)
316313
) {
317314
// Actually need to unwrap one more layer of HIR to get to
318315
// the _real_ closure...

‎compiler/rustc_hir_typeck/src/check.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ pub(super) fn check_fn<'a, 'tcx>(
5555

5656
forbid_intrinsic_abi(tcx, span, fn_sig.abi);
5757

58-
if let Some(hir::ClosureKind::Coroutine(kind, _)) = closure_kind {
58+
if let Some(hir::ClosureKind::Coroutine(kind)) = closure_kind {
5959
let yield_ty = match kind {
6060
hir::CoroutineKind::Desugared(hir::CoroutineDesugaring::Gen, _)
61-
| hir::CoroutineKind::Coroutine => {
61+
| hir::CoroutineKind::Coroutine(_) => {
6262
let yield_ty = fcx.next_ty_var(TypeVariableOrigin {
6363
kind: TypeVariableOriginKind::TypeInference,
6464
span,
@@ -149,9 +149,7 @@ pub(super) fn check_fn<'a, 'tcx>(
149149
// We insert the deferred_coroutine_interiors entry after visiting the body.
150150
// This ensures that all nested coroutines appear before the entry of this coroutine.
151151
// resolve_coroutine_interiors relies on this property.
152-
let coroutine_ty = if let Some(hir::ClosureKind::Coroutine(coroutine_kind, movability)) =
153-
closure_kind
154-
{
152+
let coroutine_ty = if let Some(hir::ClosureKind::Coroutine(coroutine_kind)) = closure_kind {
155153
let interior = fcx
156154
.next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span });
157155
fcx.deferred_coroutine_interiors.borrow_mut().push((
@@ -162,7 +160,12 @@ pub(super) fn check_fn<'a, 'tcx>(
162160
));
163161

164162
let (resume_ty, yield_ty) = fcx.resume_yield_tys.unwrap();
165-
Some(CoroutineTypes { resume_ty, yield_ty, interior, movability: movability })
163+
Some(CoroutineTypes {
164+
resume_ty,
165+
yield_ty,
166+
interior,
167+
movability: coroutine_kind.movability(),
168+
})
166169
} else {
167170
None
168171
};

0 commit comments

Comments
 (0)