Help rustfmt a little (#17004)

Commit

31 days ago

Help rustfmt a little (#17004) Rustfmt gave up on that block due to the trailing functions. This unblocks Rustfmt.