[TO BE SQUASHED] Refactor

Author: moatom

library/proc_macro/src/quote.rs

@@ -568,10 +568,9 @@ fn is_valid_sep(ts: &[TokenTree]) -> bool {
 
 fn expand_dollar_group_sep_star(tokens: &mut TokenStream, contents: TokenStream, sep: TokenStream) {
     let mut rep_expanded = TokenStream::new();
-
-    // Append a setup code for a `while`, where recursively quoted `CONTENTS`
-    // and `SEP` are repeatedly processed, to `REP_EXPANDED`.
     let meta_vars = collect_meta_vars(contents.clone());
+
+    // Construct setup code for the `while_loop` where recursively quoted `CONTENTS` and `SEP` are repeatedly processed
     minimal_quote!(
         use crate::ext::*;
         (@ if !sep.is_empty() {
@@ -592,8 +591,13 @@ fn expand_dollar_group_sep_star(tokens: &mut TokenStream, contents: TokenStream,
     }
     minimal_quote!(let _: crate::HasIterator = has_iter;).to_tokens(&mut rep_expanded);
 
-    // Append the `while` to `REP_EXPANDED`.
+    // Construct the `while_loop`
     let mut while_body = TokenStream::new();
+    let while_loop = vec![
+        TokenTree::Ident(Ident::new("while", Span::call_site())),
+        TokenTree::Ident(Ident::new("true", Span::call_site())),
+        TokenTree::Group(Group::new(Delimiter::Brace, while_body)),
+    ];
     for meta_var in &meta_vars {
         minimal_quote!(
             let (@ meta_var) = match (@ meta_var).next() {
@@ -619,12 +623,8 @@ fn expand_dollar_group_sep_star(tokens: &mut TokenStream, contents: TokenStream,
         (@ quote(contents)).to_tokens(&mut ts);
     )
     .to_tokens(&mut while_body);
-    rep_expanded.extend(vec![
-        TokenTree::Ident(Ident::new("while", Span::call_site())),
-        TokenTree::Ident(Ident::new("true", Span::call_site())),
-        TokenTree::Group(Group::new(Delimiter::Brace, while_body)),
-    ]);
 
+    rep_expanded.extend(while_loop);
     minimal_quote!((@ TokenTree::Group(Group::new(Delimiter::Brace, rep_expanded))))
         .to_tokens(tokens);
 }