Merge pull request #1127 from dtolnay/staticasync

Fix static async closure keyword order
dtolnay · Jan 20, 2022 · 2468457 · 2468457
2 parents 6a8bf28 + 5aeec41
commit 2468457
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 38 deletions.
diff --git a/src/expr.rs b/src/expr.rs
@@ -403,8 +403,8 @@ ast_struct! {
     #[cfg_attr(doc_cfg, doc(cfg(feature = "full")))]
     pub struct ExprClosure #full {
         pub attrs: Vec<Attribute>,
-        pub asyncness: Option<Token![async]>,
         pub movability: Option<Token![static]>,
+        pub asyncness: Option<Token![async]>,
         pub capture: Option<Token![move]>,
         pub or1_token: Token![|],
         pub inputs: Punctuated<Pat, Token![,]>,
@@ -2397,12 +2397,8 @@ pub(crate) mod parsing {
 
     #[cfg(feature = "full")]
     fn expr_closure(input: ParseStream, allow_struct: AllowStruct) -> Result<ExprClosure> {
+        let movability: Option<Token![static]> = input.parse()?;
         let asyncness: Option<Token![async]> = input.parse()?;
-        let movability: Option<Token![static]> = if asyncness.is_none() {
-            input.parse()?
-        } else {
-            None
-        };
         let capture: Option<Token![move]> = input.parse()?;
         let or1_token: Token![|] = input.parse()?;
 
@@ -2440,8 +2436,8 @@ pub(crate) mod parsing {
 
         Ok(ExprClosure {
             attrs: Vec::new(),
-            asyncness,
             movability,
+            asyncness,
             capture,
             or1_token,
             inputs,
@@ -3223,8 +3219,8 @@ pub(crate) mod printing {
     impl ToTokens for ExprClosure {
         fn to_tokens(&self, tokens: &mut TokenStream) {
             outer_attrs_to_tokens(&self.attrs, tokens);
-            self.asyncness.to_tokens(tokens);
             self.movability.to_tokens(tokens);
+            self.asyncness.to_tokens(tokens);
             self.capture.to_tokens(tokens);
             self.or1_token.to_tokens(tokens);
             self.inputs.to_tokens(tokens);

diff --git a/src/gen/clone.rs b/src/gen/clone.rs
diff --git a/src/gen/debug.rs b/src/gen/debug.rs
diff --git a/src/gen/eq.rs b/src/gen/eq.rs
diff --git a/src/gen/fold.rs b/src/gen/fold.rs
diff --git a/src/gen/hash.rs b/src/gen/hash.rs
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs
diff --git a/syn.json b/syn.json
@@ -1087,14 +1087,14 @@
             "syn": "Attribute"
           }
         },
-        "asyncness": {
+        "movability": {
           "option": {
-            "token": "Async"
+            "token": "Static"
           }
         },
-        "movability": {
+        "asyncness": {
           "option": {
-            "token": "Static"
+            "token": "Async"
           }
         },
         "capture": {

diff --git a/tests/debug/gen.rs b/tests/debug/gen.rs
diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs
@@ -22,10 +22,6 @@ static EXCLUDE: &[&str] = &[
     "src/test/ui/rfc-2497-if-let-chains/issue-90722.rs",
     "src/test/ui/rfc-2497-if-let-chains/then-else-blocks.rs",
 
-    // TODO: static async closure keyword order
-    "src/tools/rustfmt/tests/source/async_block.rs",
-    "src/tools/rustfmt/tests/target/async_block.rs",
-
     // TODO: impl ~const T {}
     // https://github.com/dtolnay/syn/issues/1051
     "src/test/ui/rfc-2632-const-trait-impl/syntax.rs",