Merge "Update rustfmt options"