Some small stylistic adjustments

In the hope of improving clarity in the CI workflow.

Author: EliahKagan

.github/workflows/ci.yml

@@ -213,9 +213,9 @@ jobs:
           - ubuntu-latest
           - ubuntu-24.04-arm
         include:
-          - nextest-extra-args: ''
+          - test-args: ''
           - os: windows-11-arm
-            nextest-extra-args: '-- --skip fuzzed_timeout --skip performance --skip speed'
+            test-args: '--skip fuzzed_timeout --skip performance --skip speed'
 
     runs-on: ${{ matrix.os }}
 
@@ -227,11 +227,11 @@ jobs:
           if (Get-Command rustup -ErrorAction SilentlyContinue) {
             Write-Output '::warning:: The runner has rustup. Consider removing this step.'
           } else {
-            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL `
-              --output rustup-init.exe `
-              https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
-            .\rustup-init.exe --default-toolchain none -y
-            Remove-Item rustup-init.exe
+            $file = 'rustup-init.exe'
+            $url = "https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/$file"
+            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL --output $file $url
+            & ".\$file" --default-toolchain none -y
+            Remove-Item $file
             Add-Content -Value "$Env:USERPROFILE\.cargo\bin" -Path $Env:GITHUB_PATH
           }
       - uses: dtolnay/rust-toolchain@stable
@@ -245,7 +245,7 @@ jobs:
       - name: Test (nextest)
         env:
           GIX_TEST_CREATE_ARCHIVES_EVEN_ON_CI: '1'
-        run: cargo nextest run --workspace --no-fail-fast ${{ matrix.nextest-extra-args }}
+        run: cargo nextest run --workspace --no-fail-fast -- ${{ matrix.test-args }}
       - name: Check that tracked archives are up to date
         run: git diff --exit-code  # If this fails, the fix is usually to commit a regenerated archive.
 
@@ -256,18 +256,18 @@ jobs:
           - windows-latest
           - windows-11-arm
         include:
-          - nextest-extra-args: ''
+          - test-args: ''
           - os: windows-11-arm
-            nextest-extra-args: '-- --skip fuzzed-timeout --skip performance --skip speed'
+            test-args: '--skip fuzzed-timeout --skip performance --skip speed'
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Report version/build of Git in this runner image
         run: git version --build-options
       - name: Upgrade Git for Windows to latest stable release
-        # TODO: Remove this and related steps once `windows-11-arm` ships a new enough Git version.
-        # (The Windows 11 ARM runner still ships Git 2.48.*, so it remains affected by #1849.)
+        # TODO(ci): Remove this and related steps once `windows-11-arm` ships a new enough Git.
+        # The Windows 11 ARM runner still ships Git 2.48.*, so it remains affected by #1849.
         if: matrix.os == 'windows-11-arm'
         env:
           GH_TOKEN: ${{ github.token }}
@@ -304,11 +304,11 @@ jobs:
           if (Get-Command rustup -ErrorAction SilentlyContinue) {
             Write-Output '::warning:: The runner has rustup. Consider removing this step.'
           } else {
-            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL `
-              --output rustup-init.exe `
-              https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
-            .\rustup-init.exe --default-toolchain none -y
-            Remove-Item rustup-init.exe
+            $file = 'rustup-init.exe'
+            $url = "https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/$file"
+            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL --output $file $url
+            & ".\$file" --default-toolchain none -y
+            Remove-Item $file
             Add-Content -Value "$Env:USERPROFILE\.cargo\bin" -Path $Env:GITHUB_PATH
           }
       - uses: dtolnay/rust-toolchain@stable
@@ -320,7 +320,8 @@ jobs:
         id: nextest
         env:
           GIX_TEST_IGNORE_ARCHIVES: '1'
-        run: cargo nextest --profile=with-xml run --workspace --no-fail-fast ${{ matrix.nextest-extra-args }}
+        run: |
+          cargo nextest --profile=with-xml run --workspace --no-fail-fast -- ${{ matrix.test-args }}
         continue-on-error: true
       - name: Check for errors
         run: |