@@ -126,6 +126,7 @@ use rustc_ast::ast::RangeEnd;
126126use rustc_ast:: ast:: RangeLimits ;
127127use rustc_ast:: ast:: RangeSyntax ;
128128use rustc_ast:: ast:: Recovered ;
129+ use rustc_ast:: ast:: Safety ;
129130use rustc_ast:: ast:: StaticForeignItem ;
130131use rustc_ast:: ast:: StaticItem ;
131132use rustc_ast:: ast:: Stmt ;
@@ -146,7 +147,6 @@ use rustc_ast::ast::TyAliasWhereClauses;
146147use rustc_ast:: ast:: TyKind ;
147148use rustc_ast:: ast:: UintTy ;
148149use rustc_ast:: ast:: UnOp ;
149- use rustc_ast:: ast:: Unsafe ;
150150use rustc_ast:: ast:: UnsafeSource ;
151151use rustc_ast:: ast:: UseTree ;
152152use rustc_ast:: ast:: UseTreeKind ;
@@ -469,7 +469,7 @@ spanless_eq_struct!(AttrItem; path args tokens);
469469spanless_eq_struct ! ( AttrTokenStream ; 0 ) ;
470470spanless_eq_struct ! ( Attribute ; kind id style span) ;
471471spanless_eq_struct ! ( AttributesData ; attrs tokens) ;
472- spanless_eq_struct ! ( BareFnTy ; unsafety ext generic_params decl decl_span) ;
472+ spanless_eq_struct ! ( BareFnTy ; safety ext generic_params decl decl_span) ;
473473spanless_eq_struct ! ( BindingMode ; 0 1 ) ;
474474spanless_eq_struct ! ( Block ; stmts id rules span tokens could_be_bare_literal) ;
475475spanless_eq_struct ! ( Closure ; binder capture_clause constness coroutine_kind movability fn_decl body !fn_decl_span !fn_arg_span) ;
@@ -485,17 +485,17 @@ spanless_eq_struct!(ExprField; attrs id span ident expr is_shorthand is_placehol
485485spanless_eq_struct ! ( FieldDef ; attrs id span vis ident ty is_placeholder) ;
486486spanless_eq_struct ! ( Fn ; defaultness generics sig body) ;
487487spanless_eq_struct ! ( FnDecl ; inputs output) ;
488- spanless_eq_struct ! ( FnHeader ; constness coroutine_kind unsafety ext) ;
488+ spanless_eq_struct ! ( FnHeader ; constness coroutine_kind safety ext) ;
489489spanless_eq_struct ! ( FnSig ; header decl span) ;
490- spanless_eq_struct ! ( ForeignMod ; unsafety abi items) ;
490+ spanless_eq_struct ! ( ForeignMod ; safety abi items) ;
491491spanless_eq_struct ! ( FormatArgPosition ; index kind span) ;
492492spanless_eq_struct ! ( FormatArgs ; span template arguments) ;
493493spanless_eq_struct ! ( FormatArgument ; kind expr) ;
494494spanless_eq_struct ! ( FormatOptions ; width precision alignment fill sign alternate zero_pad debug_hex) ;
495495spanless_eq_struct ! ( FormatPlaceholder ; argument span format_trait format_options) ;
496496spanless_eq_struct ! ( GenericParam ; id ident attrs bounds is_placeholder kind !colon_span) ;
497497spanless_eq_struct ! ( Generics ; params where_clause span) ;
498- spanless_eq_struct ! ( Impl ; defaultness unsafety generics constness polarity of_trait self_ty items) ;
498+ spanless_eq_struct ! ( Impl ; defaultness safety generics constness polarity of_trait self_ty items) ;
499499spanless_eq_struct ! ( InlineAsm ; template template_strs operands clobber_abis options line_spans) ;
500500spanless_eq_struct ! ( InlineAsmSym ; id qself path) ;
501501spanless_eq_struct ! ( Item <K >; attrs id span vis ident kind !tokens) ;
@@ -524,7 +524,7 @@ spanless_eq_struct!(Stmt; id kind span);
524524spanless_eq_struct ! ( StrLit ; symbol suffix symbol_unescaped style span) ;
525525spanless_eq_struct ! ( StructExpr ; qself path fields rest) ;
526526spanless_eq_struct ! ( Token ; kind span) ;
527- spanless_eq_struct ! ( Trait ; unsafety is_auto generics bounds items) ;
527+ spanless_eq_struct ! ( Trait ; safety is_auto generics bounds items) ;
528528spanless_eq_struct ! ( TraitBoundModifiers ; constness asyncness polarity) ;
529529spanless_eq_struct ! ( TraitRef ; path ref_id) ;
530530spanless_eq_struct ! ( Ty ; id kind span tokens) ;
@@ -593,6 +593,7 @@ spanless_eq_enum!(PreciseCapturingArg; Lifetime(0) Arg(0 1));
593593spanless_eq_enum ! ( RangeEnd ; Included ( 0 ) Excluded ) ;
594594spanless_eq_enum ! ( RangeLimits ; HalfOpen Closed ) ;
595595spanless_eq_enum ! ( Recovered ; No Yes ( 0 ) ) ;
596+ spanless_eq_enum ! ( Safety ; Unsafe ( 0 ) Default ) ;
596597spanless_eq_enum ! ( StmtKind ; Let ( 0 ) Item ( 0 ) Expr ( 0 ) Semi ( 0 ) Empty MacCall ( 0 ) ) ;
597598spanless_eq_enum ! ( StrStyle ; Cooked Raw ( 0 ) ) ;
598599spanless_eq_enum ! ( StructRest ; Base ( 0 ) Rest ( 0 ) None ) ;
@@ -601,7 +602,6 @@ spanless_eq_enum!(TokenTree; Token(0 1) Delimited(0 1 2 3));
601602spanless_eq_enum ! ( TraitObjectSyntax ; Dyn DynStar None ) ;
602603spanless_eq_enum ! ( UintTy ; Usize U8 U16 U32 U64 U128 ) ;
603604spanless_eq_enum ! ( UnOp ; Deref Not Neg ) ;
604- spanless_eq_enum ! ( Unsafe ; Yes ( 0 ) No ) ;
605605spanless_eq_enum ! ( UnsafeSource ; CompilerGenerated UserProvided ) ;
606606spanless_eq_enum ! ( UseTreeKind ; Simple ( 0 ) Nested ( items span) Glob ) ;
607607spanless_eq_enum ! ( VariantData ; Struct ( fields recovered) Tuple ( 0 1 ) Unit ( 0 ) ) ;
0 commit comments