Merge pull request #1646 from allengeorge/rustfmt_10

Reformat rust code with rustfmt 1.0

Client: rs