fix additional semicolon during changing parentheses style

[rscprof]

#6013

Prevent add semicolon when changing parentheses style when using lazy_static. If we see that previous parentheses is round and we use the rule for lazy_static then we set flag about it and after it we simple skip insert semicolon during postprocessing spaces and semicolon.

[ytmimi]

Hi @rscprof thanks for helping out on this one. I'd like to take a more general approach to solve this. Instead of adding state to the context specifically for lazy_static!, I think it would be better if the call to rewrite_macro and rewrite_macro_inner returned (Option<String>, Option<Delimiter>). Then in FmtVisitor::visit_mac we can make appropriate changes to the span we pass to push_rewrite in order to inform rustfmt that we've rewritten the entirety of the old macro call including the trailing ;.

We'll need to update some call sites, but that shouldn't be a big deal. Something like:

- rewrite_macro(...)
+ let (rewrite, _) = rewrite_macro(...);

We'll also need to tweak with_context to be generic over its return type.

[rscprof]

Hi @ytmimi, I thought about returning pair, but I thought that it changes functions signatures drastically. I will change it tomorrow in your way.

[ytmimi]

@rscprof Thanks for your help! I finally had some time to get back around to reviewing this. I think your changes show that you understood what needed to be done to fix the issue. I think there were a few places where we could have made alternative code changes to simplify the diff. Also, I noticed in a few spots that you were conditionally returning the delimiters. I felt it was simpler to always return the rewritten delimiters if we could. Overall, good work so far, and I'd like to see the following changes.

[ytmimi]

@rscprof Can you take a look at the failures when you have a chance. Also, the rustfmt team strongly discourages merge commits. When you have a moment can you rebase these changes instead.

[rscprof]

@rscprof Can you take a look at the failures when you have a chance. Also, the rustfmt team strongly discourages merge commits. When you have a moment can you rebase these changes instead.

Hi! I'm going to do all things in a week

[ytmimi]

@rscprof I'm still seeing the Merge branch 'master' into issue-6013 commit in the history. Can you please update the git history to remove that merge commit.

[rscprof]

@rscprof I'm still seeing the Merge branch 'master' into issue-6013 commit in the history. Can you please update the git history to remove that merge commit.

I made one commit for radically simplifying history