fix #6164: Reduce format failure for non default `imports_granularity`#6165

kenoss wants to merge 4 commits intorust-lang:masterrust-lang/rustfmt:masterfrom

kenoss:fix-6164kenoss/rustfmt:fix-6164Copy head branch name to clipboard