Merge "Add rustfmt to p/m/C" into main