Merge "Run rustfmt and add rustfmt.toml to directory"