@@ -38,6 +38,7 @@ use rustc_ast::ast::ConstBlockItem;
3838use rustc_ast:: ast:: ConstItem ;
3939use rustc_ast:: ast:: ConstItemKind ;
4040use rustc_ast:: ast:: CoroutineKind ;
41+ use rustc_ast:: ast:: CoroutineMarker ;
4142use rustc_ast:: ast:: Crate ;
4243use rustc_ast:: ast:: Defaultness ;
4344use rustc_ast:: ast:: Delegation ;
@@ -80,7 +81,6 @@ use rustc_ast::ast::FormatOptions;
8081use rustc_ast:: ast:: FormatPlaceholder ;
8182use rustc_ast:: ast:: FormatSign ;
8283use rustc_ast:: ast:: FormatTrait ;
83- use rustc_ast:: ast:: GenBlockKind ;
8484use rustc_ast:: ast:: GenericArg ;
8585use rustc_ast:: ast:: GenericArgs ;
8686use rustc_ast:: ast:: GenericBound ;
@@ -499,9 +499,10 @@ spanless_eq_struct!(Attribute; kind id style span);
499499spanless_eq_struct ! ( AttrsTarget ; attrs tokens) ;
500500spanless_eq_struct ! ( BindingMode ; 0 1 ) ;
501501spanless_eq_struct ! ( Block ; stmts id rules span) ;
502- spanless_eq_struct ! ( Closure ; binder capture_clause constness coroutine_kind movability fn_decl body !fn_decl_span !fn_arg_span) ;
502+ spanless_eq_struct ! ( Closure ; binder capture_clause constness coroutine_marker movability fn_decl body !fn_decl_span !fn_arg_span) ;
503503spanless_eq_struct ! ( ConstBlockItem ; id span block) ;
504504spanless_eq_struct ! ( ConstItem ; defaultness ident generics ty body kind define_opaque) ;
505+ spanless_eq_struct ! ( CoroutineMarker ; kind span closure_id return_impl_trait_id) ;
505506spanless_eq_struct ! ( Crate ; attrs items spans id is_placeholder) ;
506507spanless_eq_struct ! ( Delegation ; id qself path ident rename body source) ;
507508spanless_eq_struct ! ( DelegationMac ; qself prefix suffixes body) ;
@@ -517,7 +518,7 @@ spanless_eq_struct!(FieldDefExtras; safety mut_restriction default);
517518spanless_eq_struct ! ( Fn ; defaultness ident generics sig contract define_opaque body eii_impl) ;
518519spanless_eq_struct ! ( FnContract ; declarations requires ensures) ;
519520spanless_eq_struct ! ( FnDecl ; inputs output) ;
520- spanless_eq_struct ! ( FnHeader ; constness coroutine_kind safety ext) ;
521+ spanless_eq_struct ! ( FnHeader ; constness coroutine_marker safety ext) ;
521522spanless_eq_struct ! ( FnPtrTy ; safety ext generic_params decl decl_span) ;
522523spanless_eq_struct ! ( FnSig ; header decl span) ;
523524spanless_eq_struct ! ( ForLoop ; pat iter body label kind) ;
@@ -612,7 +613,7 @@ spanless_eq_enum!(FormatCount; Literal(0) Argument(0));
612613spanless_eq_enum ! ( FormatDebugHex ; Lower Upper ) ;
613614spanless_eq_enum ! ( FormatSign ; Plus Minus ) ;
614615spanless_eq_enum ! ( FormatTrait ; Display Debug LowerExp UpperExp Octal Pointer Binary LowerHex UpperHex ) ;
615- spanless_eq_enum ! ( GenBlockKind ; Async Gen AsyncGen ) ;
616+ spanless_eq_enum ! ( CoroutineKind ; Async Gen AsyncGen ) ;
616617spanless_eq_enum ! ( GenericArg ; Lifetime ( 0 ) Type ( 0 ) Const ( 0 ) ) ;
617618spanless_eq_enum ! ( GenericArgs ; AngleBracketed ( 0 ) Parenthesized ( 0 ) ParenthesizedElided ( 0 ) ) ;
618619spanless_eq_enum ! ( GenericBound ; Trait ( 0 ) Outlives ( 0 ) Use ( 0 1 ) ) ;
@@ -661,9 +662,6 @@ spanless_eq_enum!(WherePredicateKind; BoundPredicate(0) RegionPredicate(0));
661662spanless_eq_enum ! ( YieldKind ; Prefix ( 0 ) Postfix ( 0 ) ) ;
662663spanless_eq_enum ! ( AssignOpKind ; AddAssign SubAssign MulAssign DivAssign
663664 RemAssign BitXorAssign BitAndAssign BitOrAssign ShlAssign ShrAssign ) ;
664- spanless_eq_enum ! ( CoroutineKind ; Async ( span closure_id return_impl_trait_id)
665- Gen ( span closure_id return_impl_trait_id)
666- AsyncGen ( span closure_id return_impl_trait_id) ) ;
667665spanless_eq_enum ! ( ExprKind ; Array ( 0 ) ConstBlock ( 0 ) Call ( 0 1 ) MethodCall ( 0 )
668666 Tup ( 0 ) Binary ( 0 1 2 ) Unary ( 0 1 ) Move ( 0 1 ) Lit ( 0 ) Cast ( 0 1 ) Type ( 0 1 )
669667 Let ( 0 1 2 3 ) If ( 0 1 2 ) While ( 0 1 2 ) ForLoop ( 0 ) Loop ( 0 1 2 ) Match ( 0 1 2 )
0 commit comments