Various cosmetic improvements

[alexreg]

Related to the larger effort of rust-lang/rust#58036.

[alexreg]

@h-michael Thanks for pointing out the unresolved conflict. That is fixed and pushed now.

[Xanewok]

Thank you for the PR! Could you please rebase on top of the current master? This should fix the compilation errors (due to #1315, assuming Clippy didn't break again 😢 🤞 )

[alexreg]

@Xanewok Sure. And sorry for the delay (busy couple of days). Hopefully all is fine with CI now...

[bors]

☔ The latest upstream changes (presumably #1320) made this pull request unmergeable. Please resolve the merge conflicts.

[alexreg]

@Xanewok Not sure why the previous commit failed CI. It looked like an error internal to clippy, perhaps?

[Xanewok]

Yeah, this was due to stale clippy version.

@alexreg Because of the fact that text offsets are affected by removing copyright notices, this needs an update to the text offsets. I did that already in ff90258, could you cherry-pick that and double-check that tests pass on your side?

[Xanewok]

Since that commit was based on this anyway, to reduce turnaround time I pushed a PR with your commits and the fixes on top of that.

Thanks once again!

[alexreg]

@Xanewok No problem. And cheers for sorting out the text offsets!