Add calculate_spacing for bump and bump_minimal

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

compiler/rustc_parse/src/lexer/tokentrees.rs

@@ -169,13 +169,7 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
             } else if let Some(glued) = self.token.glue(&next_tok) {
                 self.token = glued;
             } else {
-                let this_spacing = if next_tok.is_punct() {
-                    Spacing::Joint
-                } else if next_tok == token::Eof {
-                    Spacing::Alone
-                } else {
-                    Spacing::JointHidden
-                };
+                let this_spacing = self.calculate_spacing(&next_tok, false);
                 break (this_spacing, next_tok);
             }
         };
@@ -186,21 +180,21 @@ impl<'psess, 'src> Lexer<'psess, 'src> {
     // Cut-down version of `bump` used when the token kind is known in advance.
     fn bump_minimal(&mut self) -> Spacing {
         let (next_tok, is_next_tok_preceded_by_whitespace) = self.next_token_from_cursor();
+        let this_spacing = self.calculate_spacing(&next_tok, is_next_tok_preceded_by_whitespace);
+        self.token = next_tok;
+        this_spacing
+    }
 
-        let this_spacing = if is_next_tok_preceded_by_whitespace {
+    fn calculate_spacing(&self, next_tok: &Token, is_preceded_by_whitespace: bool) -> Spacing {
+        if is_preceded_by_whitespace {
+            Spacing::Alone
+        } else if next_tok.is_punct() {
+            Spacing::Joint
+        } else if *next_tok == token::Eof {
             Spacing::Alone
         } else {
-            if next_tok.is_punct() {
-                Spacing::Joint
-            } else if next_tok == token::Eof {
-                Spacing::Alone
-            } else {
-                Spacing::JointHidden
-            }
-        };
-
-        self.token = next_tok;
-        this_spacing
+            Spacing::JointHidden
+        }
     }
 
     fn eof_err(&mut self) -> Diag<'psess> {