rustfmt subtree update

Cargo.lock

@@ -2010,6 +2010,20 @@ dependencies = [
  "hybrid-array",
 ]
 
+[[package]]
+name = "insta"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82"
+dependencies = [
+ "console",
+ "once_cell",
+ "regex",
+ "similar",
+ "strip-ansi-escapes",
+ "tempfile",
+]
+
 [[package]]
 name = "installer"
 version = "0.0.0"
@@ -5099,7 +5113,7 @@ dependencies = [
 name = "rustfmt-nightly"
 version = "1.10.0"
 dependencies = [
- "annotate-snippets 0.11.5",
+ "annotate-snippets 0.12.16",
  "anyhow",
  "bytecount",
  "cargo_metadata 0.23.1",
@@ -5109,6 +5123,7 @@ dependencies = [
  "dirs",
  "getopts",
  "ignore",
+ "insta",
  "itertools",
  "regex",
  "rustfmt-config_proc_macro",
@@ -5118,7 +5133,7 @@ dependencies = [
  "tempfile",
  "term",
  "thiserror 1.0.69",
- "toml 0.9.8",
+ "toml 1.1.0+spec-1.1.0",
  "tracing",
  "tracing-subscriber",
  "unicode-properties",
@@ -5501,6 +5516,15 @@ dependencies = [
  "stacker",
 ]
 
+[[package]]
+name = "strip-ansi-escapes"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a8f8038e7e7969abb3f1b7c2a811225e9296da208539e0f79c5251d6cac0025"
+dependencies = [
+ "vte",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -5803,21 +5827,6 @@ dependencies = [
  "toml_edit 0.22.27",
 ]
 
-[[package]]
-name = "toml"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
-dependencies = [
- "indexmap",
- "serde_core",
- "serde_spanned 1.1.0",
- "toml_datetime 0.7.3",
- "toml_parser",
- "toml_writer",
- "winnow 0.7.13",
-]
-
 [[package]]
 name = "toml"
 version = "1.1.0+spec-1.1.0"
@@ -5842,15 +5851,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
-dependencies = [
- "serde_core",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "1.1.0+spec-1.1.0"
@@ -6292,6 +6292,15 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "vte"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wait-timeout"
 version = "0.2.1"

src/tools/rustfmt/.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: rustfoundation
-custom: ["rust-lang.org/funding"]
+custom: ["https://rust-lang.org/funding"]

src/tools/rustfmt/.github/workflows/check_diff.yml

@@ -32,6 +32,14 @@ on:
       rustfmt_configs:
         description: 'Optional comma separated list of rustfmt config options to pass when running the feature branch'
         required: false
+      release_channel:
+        description: 'Configure which release channel to use when compiling rustfmt'
+        default: stable
+        type: choice
+        options:
+          - stable
+          - beta
+          - nightly
 
 permissions:
   contents: read

src/tools/rustfmt/.github/workflows/integration.yml

@@ -1,8 +1,5 @@
 name: integration
 on:
-  push:
-    branches:
-      - main
   pull_request:
 
 permissions:
@@ -13,11 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     name: ${{ matrix.integration }}
     strategy:
-      # https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits
-      # There's a limit of 60 concurrent jobs across all repos in the rust-lang organization.
-      # In order to prevent overusing too much of that 60 limit, we throttle the
-      # number of rustfmt jobs that will run concurrently.
-      max-parallel: 4
       fail-fast: false
       matrix:
         integration: [

src/tools/rustfmt/.github/workflows/rustdoc_check.yml

@@ -1,8 +1,6 @@
 name: rustdoc check
 on:
-  push:
-    branches:
-      - main
+  merge_group:
   pull_request:
 
 permissions:

src/tools/rustfmt/.github/workflows/test.yml

@@ -0,0 +1,102 @@
+name: test
+on:
+  merge_group:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }})
+    env:
+      CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }}
+    strategy:
+      fail-fast: false
+      matrix:
+        build: [linux, macos, win32-gnu, win32-msvc, win64-gnu, win64-msvc]
+        cfg_release_channel: [nightly, stable]
+        include:
+          - build: linux
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - build: macos
+            os: macos-latest
+            target: x86_64-apple-darwin
+          - build: win32-gnu
+            os: windows-latest
+            target: i686-pc-windows-gnu
+          - build: win32-msvc
+            os: windows-latest
+            target: i686-pc-windows-msvc
+          - build: win64-gnu
+            os: windows-latest
+            target: x86_64-pc-windows-gnu
+          - build: win64-msvc
+            os: windows-latest
+            target: x86_64-pc-windows-msvc
+
+    steps:
+    - name: disable git eol translation
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: git config --global core.autocrlf false
+    - name: checkout
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+    - name: Install Rustup using win.rustup.rs
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        # Disable the download progress bar which can cause perf issues
+        $ProgressPreference = "SilentlyContinue"
+        Invoke-WebRequest https://win.rustup.rs/ -OutFile rustup-init.exe
+        .\rustup-init.exe -y --default-host=x86_64-pc-windows-msvc --default-toolchain=none
+        del rustup-init.exe
+        rustup target add ${{ matrix.target }}
+      shell: powershell
+
+    - name: Add mingw32 to path for i686-gnu
+      run: |
+        echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
+      if: matrix.target == 'i686-pc-windows-gnu' && matrix.channel == 'nightly'
+      shell: bash
+
+    - name: Add mingw64 to path for x86_64-gnu
+      run: echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
+      if: matrix.target == 'x86_64-pc-windows-gnu' && matrix.channel == 'nightly'
+      shell: bash
+
+    - name: install rustup
+      if: ${{ matrix.os != 'windows-latest' }}
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh
+        sh rustup-init.sh -y --default-toolchain none
+        rustup target add ${{ matrix.target }}
+
+    # Run build
+    - name: Build and Test
+      env:
+        RUSTFLAGS: -D warnings
+        CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT: true
+      run: cargo run --manifest-path ci/Cargo.toml build-and-test
+
+  test-conclusion:
+    name: "test conclusion"
+    needs:
+      - test
+    # We need to ensure this job does *not* get skipped if its dependencies fail,
+    # because a skipped job is considered a success by GitHub. So we have to
+    # overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run
+    # when the workflow is canceled manually.
+    #
+    # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-latest
+    steps:
+      # Manually check the status of all dependencies. `if: failure()` does not work.
+      - name: Conclusion
+        run: |
+          # Print the dependent jobs to see them in the CI log
+          jq -C <<< '${{ toJson(needs) }}'
+          # Check if all jobs that we depend on (in the needs array) were successful (or have been skipped).
+          jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'

src/tools/rustfmt/.github/workflows/upload-assets.yml

@@ -68,11 +68,6 @@ jobs:
 
       - name: Upload Release Asset
         if: github.event_name == 'release'
-        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ env.ASSET }}
-          asset_name: ${{ env.ASSET }}
-          asset_content_type: application/octet-stream
+        run: gh release upload "${{ github.event.release.tag_name }}" "${{ env.ASSET }}"