Merge pull request #2396 from dtolnay/msg

Rearrange parts of attr.rs that rustfmt has been refusing to format

Author: dtolnay