Apply changes to make latest rustfmt happy

2 jobs for fix_clippy in 6 minutes and 23 seconds (queued for 5 minutes and 58 seconds)