Merge pull request #3135 from tnull/2024-06-rustfmt-rgs