Update code according to new rustfmt rules (run cargo fmt)

Update code according to new rustfmt rules (run cargo fmt) #1319