commit 12cb78e76af0172bdc5a849c5fd1c08cde6e906b
author Felix Rabe <felix@rabe.io> Sat Jun 08 23:03:49 2019 +0200
committer Felix Rabe <felix@rabe.io> Sat Jun 08 23:55:11 2019 +0200
tree e10b274240048085237be37dea836439422ea9bc
parent 848f676fcf23223eb0727691731e4e2567e2044d

Fix order to be "const async unsafe" everywhere

src/gen/fold.rs

diff --git a/src/gen/fold.rs b/src/gen/fold.rs
index e7b5964..7181fb8 100644
--- a/src/gen/fold.rs
+++ b/src/gen/fold.rs
@@ -1935,8 +1935,8 @@
         attrs: FoldHelper::lift(_i.attrs, |it| _visitor.fold_attribute(it)),
         vis: _visitor.fold_visibility(_i.vis),
         constness: (_i.constness).map(|it| Token![const](tokens_helper(_visitor, &it.span))),
-        unsafety: (_i.unsafety).map(|it| Token![unsafe](tokens_helper(_visitor, &it.span))),
         asyncness: (_i.asyncness).map(|it| Token![async](tokens_helper(_visitor, &it.span))),
+        unsafety: (_i.unsafety).map(|it| Token![unsafe](tokens_helper(_visitor, &it.span))),
         abi: (_i.abi).map(|it| _visitor.fold_abi(it)),
         ident: _visitor.fold_ident(_i.ident),
         decl: Box::new(_visitor.fold_fn_decl(*_i.decl)),
@@ -2285,8 +2285,8 @@
 pub fn fold_method_sig<V: Fold + ?Sized>(_visitor: &mut V, _i: MethodSig) -> MethodSig {
     MethodSig {
         constness: (_i.constness).map(|it| Token![const](tokens_helper(_visitor, &it.span))),
-        unsafety: (_i.unsafety).map(|it| Token![unsafe](tokens_helper(_visitor, &it.span))),
         asyncness: (_i.asyncness).map(|it| Token![async](tokens_helper(_visitor, &it.span))),
+        unsafety: (_i.unsafety).map(|it| Token![unsafe](tokens_helper(_visitor, &it.span))),
         abi: (_i.abi).map(|it| _visitor.fold_abi(it)),
         ident: _visitor.fold_ident(_i.ident),
         decl: _visitor.fold_fn_decl(_i.decl),

src/item.rs

diff --git a/src/item.rs b/src/item.rs
index d42fe2c..a8f19a0 100644
--- a/src/item.rs
+++ b/src/item.rs
@@ -84,8 +84,8 @@
             pub attrs: Vec<Attribute>,
             pub vis: Visibility,
             pub constness: Option<Token![const]>,
-            pub unsafety: Option<Token![unsafe]>,
             pub asyncness: Option<Token![async]>,
+            pub unsafety: Option<Token![unsafe]>,
             pub abi: Option<Abi>,
             pub ident: Ident,
             pub decl: Box<FnDecl>,
@@ -687,8 +687,8 @@
     /// *This type is available if Syn is built with the `"full"` feature.*
     pub struct MethodSig {
         pub constness: Option<Token![const]>,
-        pub unsafety: Option<Token![unsafe]>,
         pub asyncness: Option<Token![async]>,
+        pub unsafety: Option<Token![unsafe]>,
         pub abi: Option<Abi>,
         pub ident: Ident,
         pub decl: FnDecl,
@@ -1114,8 +1114,8 @@
                 attrs: private::attrs(outer_attrs, inner_attrs),
                 vis: vis,
                 constness: constness,
-                unsafety: unsafety,
                 asyncness: asyncness,
+                unsafety: unsafety,
                 abi: abi,
                 ident: ident,
                 decl: Box::new(FnDecl {
@@ -1759,8 +1759,8 @@
                 attrs: private::attrs(outer_attrs, inner_attrs),
                 sig: MethodSig {
                     constness: constness,
-                    unsafety: unsafety,
                     asyncness: None,
+                    unsafety: unsafety,
                     abi: abi,
                     ident: ident,
                     decl: FnDecl {
@@ -1987,8 +1987,8 @@
             let vis: Visibility = input.parse()?;
             let defaultness: Option<Token![default]> = input.parse()?;
             let constness: Option<Token![const]> = input.parse()?;
-            let unsafety: Option<Token![unsafe]> = input.parse()?;
             let asyncness: Option<Token![async]> = input.parse()?;
+            let unsafety: Option<Token![unsafe]> = input.parse()?;
             let abi: Option<Abi> = input.parse()?;
             let fn_token: Token![fn] = input.parse()?;
             let ident: Ident = input.parse()?;
@@ -2012,8 +2012,8 @@
                 defaultness: defaultness,
                 sig: MethodSig {
                     constness: constness,
-                    unsafety: unsafety,
                     asyncness: asyncness,
+                    unsafety: unsafety,
                     abi: abi,
                     ident: ident,
                     decl: FnDecl {
@@ -2625,8 +2625,8 @@
     impl ToTokens for MethodSig {
         fn to_tokens(&self, tokens: &mut TokenStream) {
             self.constness.to_tokens(tokens);
-            self.unsafety.to_tokens(tokens);
             self.asyncness.to_tokens(tokens);
+            self.unsafety.to_tokens(tokens);
             self.abi.to_tokens(tokens);
             NamedDecl(&self.decl, &self.ident).to_tokens(tokens);
         }