fmt

.github/workflows/ci.yaml

@@ -214,7 +214,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -234,17 +234,17 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
         uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-insta
       - name: ty mdtests (GitHub annotations)
@@ -292,17 +292,17 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
         uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-insta
       - name: "Run tests"
@@ -321,11 +321,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-nextest
       - name: "Run tests"
@@ -348,7 +348,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -377,7 +377,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
@@ -400,7 +400,7 @@ jobs:
         with:
           file: "Cargo.toml"
           field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         env:
           MSRV: ${{ steps.msrv.outputs.value }}
@@ -408,11 +408,11 @@ jobs:
       - name: "Install mold"
         uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-insta
       - name: "Run tests"
@@ -432,7 +432,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           workspaces: "fuzz -> target"
       - name: "Install Rust toolchain"
@@ -494,7 +494,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       # Run all code generation scripts, and verify that the current output is
@@ -708,7 +708,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
@@ -732,7 +732,7 @@ jobs:
         with:
           persist-credentials: false
       - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 22
@@ -765,7 +765,7 @@ jobs:
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.13"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -804,7 +804,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Run checks"
@@ -874,7 +874,7 @@ jobs:
           persist-credentials: false
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 22
@@ -905,14 +905,14 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-codspeed
 
@@ -938,14 +938,14 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-codspeed
 

.github/workflows/daily_fuzz.yaml

@@ -39,7 +39,7 @@ jobs:
         run: rustup show
       - name: "Install mold"
         uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: Build ruff
         # A debug build means the script runs slower once it gets started,
         # but this is outweighed by the fact that a release build takes *much* longer to compile in CI

.github/workflows/mypy_primer.yaml

@@ -12,7 +12,6 @@ on:
       - ".github/workflows/mypy_primer.yaml"
       - ".github/workflows/mypy_primer_comment.yaml"
       - "Cargo.lock"
-      - "!**.md"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -40,7 +39,7 @@ jobs:
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           workspaces: "ruff"
 
@@ -50,12 +49,46 @@ jobs:
       - name: Run mypy_primer
         shell: bash
         env:
-          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
-          DIFF_FILE: mypy_primer.diff
+          TY_MEMORY_REPORT: mypy_primer
         run: |
           cd ruff
-          scripts/mypy_primer.sh
-          echo ${{ github.event.number }} > ../pr-number
+
+          echo "Enabling mypy primer specific configuration overloads (see .github/mypy-primer-ty.toml)"
+          mkdir -p ~/.config/ty
+          cp .github/mypy-primer-ty.toml ~/.config/ty/ty.toml
+
+          PRIMER_SELECTOR="$(paste -s -d'|' crates/ty_python_semantic/resources/primer/good.txt)"
+
+          echo "new commit"
+          git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
+
+          MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
+          git checkout -b base_commit "$MERGE_BASE"
+          echo "base commit"
+          git rev-list --format=%s --max-count=1 base_commit
+
+          cd ..
+
+          echo "Project selector: $PRIMER_SELECTOR"
+          # Allow the exit code to be 0 or 1, only fail for actual mypy_primer crashes/bugs
+          uvx \
+            --from="git+https://github.com/hauntsaninja/mypy_primer@e5f55447969d33ae3c7ccdb183e2a37101867270" \
+            mypy_primer \
+            --repo ruff \
+            --type-checker ty \
+            --old base_commit \
+            --new "$GITHUB_SHA" \
+            --project-selector "/($PRIMER_SELECTOR)\$" \
+            --output concise \
+            --debug > mypy_primer.diff || [ $? -eq 1 ]
+
+          # Output diff with ANSI color codes
+          cat mypy_primer.diff
+
+          # Remove ANSI color codes before uploading
+          sed -ie 's/\x1b\[[0-9;]*m//g' mypy_primer.diff
+
+          echo ${{ github.event.number }} > pr-number
 
       - name: Upload diff
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -68,41 +101,3 @@ jobs:
         with:
           name: pr-number
           path: pr-number
-
-  memory_usage:
-    name: Run memory statistics
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Run mypy_primer
-        shell: bash
-        env:
-          TY_MAX_PARALLELISM: 1 # for deterministic memory numbers
-          TY_MEMORY_REPORT: mypy_primer
-          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/memory.txt
-          DIFF_FILE: mypy_primer_memory.diff
-        run: |
-          cd ruff
-          scripts/mypy_primer.sh
-
-      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: mypy_primer_memory_diff
-          path: mypy_primer_memory.diff

.github/workflows/mypy_primer_comment.yaml

@@ -45,28 +45,15 @@ jobs:
           if_no_artifact_found: ignore
           allow_forks: true
 
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: "Download mypy_primer memory results"
-        id: download-mypy_primer_memory_diff
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: mypy_primer_memory_diff
-          workflow: mypy_primer.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/mypy_primer_memory_diff
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-          allow_forks: true
-
       - name: Generate comment content
         id: generate-comment
-        if: ${{ steps.download-mypy_primer_diff.outputs.found_artifact == 'true' && steps.download-mypy_primer_memory_diff.outputs.found_artifact == 'true' }}
+        if: steps.download-mypy_primer_diff.outputs.found_artifact == 'true'
         run: |
           # Guard against malicious mypy_primer results that symlink to a secret
           # file on this runner
-          if [[ -L pr/mypy_primer_diff/mypy_primer.diff ]] || [[ -L pr/mypy_primer_memory_diff/mypy_primer_memory.diff ]]
+          if [[ -L pr/mypy_primer_diff/mypy_primer.diff ]]
           then
-              echo "Error: mypy_primer.diff and mypy_primer_memory.diff cannot be a symlink"
+              echo "Error: mypy_primer.diff cannot be a symlink"
               exit 1
           fi
 
@@ -87,18 +74,6 @@ jobs:
             echo 'No ecosystem changes detected ✅' >> comment.txt
           fi
 
-          if [ -s "pr/mypy_primer_memory_diff/mypy_primer_memory.diff" ]; then
-            echo '<details>' >> comment.txt
-            echo '<summary>Memory usage changes were detected when running on open source projects</summary>' >> comment.txt
-            echo '' >> comment.txt
-            echo '```diff' >> comment.txt
-            cat pr/mypy_primer_memory_diff/mypy_primer_memory.diff >> comment.txt
-            echo '```' >> comment.txt
-            echo '</details>' >> comment.txt
-          else
-            echo 'No memory usage changes detected ✅' >> comment.txt
-          fi
-
           echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
           cat comment.txt >> "$GITHUB_OUTPUT"
           echo 'EOF' >> "$GITHUB_OUTPUT"

.github/workflows/publish-docs.yml

@@ -68,7 +68,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
 
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}

.github/workflows/ty-ecosystem-analyzer.yaml

@@ -17,7 +17,6 @@ env:
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
   REF_NAME: ${{ github.ref_name }}
-  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
 
 jobs:
   ty-ecosystem-analyzer:
@@ -35,7 +34,7 @@ jobs:
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           workspaces: "ruff"
 
@@ -64,75 +63,32 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@f0eec0e549684d8e1d7b8bc3e351202124b63bda"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@9c34dc514ee9aef6735db1dfebb80f63acbc3440"
 
           ecosystem-analyzer \
             --repository ruff \
-            diff \
-            --projects-old ruff/projects_old.txt \
-            --projects-new ruff/projects_new.txt \
-            --old old_commit \
-            --new new_commit \
-            --output-old diagnostics-old.json \
-            --output-new diagnostics-new.json
+            analyze \
+            --projects ruff/projects_old.txt \
+            --commit old_commit \
+            --output diagnostics_old.json
 
-          mkdir dist
+          ecosystem-analyzer \
+            --repository ruff \
+            analyze \
+            --projects ruff/projects_new.txt \
+            --commit new_commit \
+            --output diagnostics_new.json
 
           ecosystem-analyzer \
             generate-diff \
-            diagnostics-old.json \
-            diagnostics-new.json \
+            diagnostics_old.json \
+            diagnostics_new.json \
             --old-name "main (merge base)" \
             --new-name "$REF_NAME" \
-            --output-html dist/diff.html
+            --output-html diff.html
 
-          ecosystem-analyzer \
-            generate-diff-statistics \
-            diagnostics-old.json \
-            diagnostics-new.json \
-            --old-name "main (merge base)" \
-            --new-name "$REF_NAME" \
-            --output diff-statistics.md
-
-          echo '## `ecosystem-analyzer` results' > comment.md
-          echo >> comment.md
-          cat diff-statistics.md >> comment.md
-
-          cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"
-
-          echo ${{ github.event.number }} > pr-number
-
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        id: deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
-        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=ty-ecosystem --branch ${{ github.head_ref }} --commit-hash ${GITHUB_SHA}
-
-      - name: "Append deployment URL"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        env:
-          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
-        run: |
-          echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)**" >> comment.md
-
-      - name: Upload comment
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: comment.md
-          path: comment.md
-
-      - name: Upload pr-number
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: pr-number
-          path: pr-number
-
-      - name: Upload diagnostics diff
+      - name: Upload HTML diff report
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: diff.html
-          path: dist/diff.html
+          path: diff.html

.github/workflows/ty-ecosystem-analyzer_comment.yaml

@@ -1,85 +0,0 @@
-name: PR comment (ty ecosystem-analyzer)
-
-on: # zizmor: ignore[dangerous-triggers]
-  workflow_run:
-    workflows: [ty ecosystem-analyzer]
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      workflow_run_id:
-        description: The ty ecosystem-analyzer workflow that triggers the workflow run
-        required: true
-
-jobs:
-  comment:
-    runs-on: ubuntu-24.04
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: Download PR number
-        with:
-          name: pr-number
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - name: Parse pull request number
-        id: pr-number
-        run: |
-          if [[ -f pr-number ]]
-          then
-            echo "pr-number=$(<pr-number)" >> "$GITHUB_OUTPUT"
-          fi
-
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: "Download comment.md"
-        id: download-comment
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: comment.md
-          workflow: ty-ecosystem-analyzer.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/comment
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - name: Generate comment content
-        id: generate-comment
-        if: ${{ steps.download-comment.outputs.found_artifact == 'true' }}
-        run: |
-          # Guard against malicious ty ecosystem-analyzer results that symlink to a secret
-          # file on this runner
-          if [[ -L pr/comment/comment.md ]]
-          then
-              echo "Error: comment.md cannot be a symlink"
-              exit 1
-          fi
-
-          # Note: this identifier is used to find the comment to update on subsequent runs
-          echo '<!-- generated-comment ty ecosystem-analyzer -->' > comment.md
-          echo >> comment.md
-          cat pr/comment/comment.md >> comment.md
-
-          echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
-          cat comment.md >> "$GITHUB_OUTPUT"
-          echo 'EOF' >> "$GITHUB_OUTPUT"
-
-      - name: Find existing comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
-        if: steps.generate-comment.outcome == 'success'
-        id: find-comment
-        with:
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          comment-author: "github-actions[bot]"
-          body-includes: "<!-- generated-comment ty ecosystem-analyzer -->"
-
-      - name: Create or update comment
-        if: steps.find-comment.outcome == 'success'
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
-        with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          body-path: comment.md
-          edit-mode: replace

.github/zizmor.yml

@@ -10,7 +10,6 @@ rules:
     ignore:
       - build-docker.yml
       - publish-playground.yml
-      - ty-ecosystem-analyzer.yaml
   excessive-permissions:
     # it's hard to test what the impact of removing these ignores would be
     # without actually running the release workflow...

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ exclude: |
     crates/ty_vendored/vendor/.*|
     crates/ty_project/resources/.*|
     crates/ty_python_semantic/resources/corpus/.*|
-    crates/ty/docs/(configuration|rules|cli|environment).md|
+    crates/ty/docs/(configuration|rules|cli).md|
     crates/ruff_benchmark/resources/.*|
     crates/ruff_linter/resources/.*|
     crates/ruff_linter/src/rules/.*/snapshots/.*|
@@ -67,7 +67,7 @@ repos:
           - black==25.1.0
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.34.0
+    rev: v1.33.1
     hooks:
       - id: typos
 
@@ -81,7 +81,7 @@ repos:
         pass_filenames: false # This makes it a lot faster
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.1
     hooks:
       - id: ruff-format
       - id: ruff
@@ -99,12 +99,12 @@ repos:
   # zizmor detects security vulnerabilities in GitHub Actions workflows.
   # Additional configuration for the tool is found in `.github/zizmor.yml`
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.11.0
+    rev: v1.10.0
     hooks:
       - id: zizmor
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
+    rev: 0.33.1
     hooks:
       - id: check-github-workflows
 

CHANGELOG.md

@@ -1,33 +1,5 @@
 # Changelog
 
-## 0.12.3
-
-### Preview features
-
-- \[`flake8-bugbear`\] Support non-context-manager calls in `B017` ([#19063](https://github.com/astral-sh/ruff/pull/19063))
-- \[`flake8-use-pathlib`\] Add autofixes for `PTH100`, `PTH106`, `PTH107`, `PTH108`, `PTH110`, `PTH111`, `PTH112`, `PTH113`, `PTH114`, `PTH115`, `PTH117`, `PTH119`, `PTH120` ([#19213](https://github.com/astral-sh/ruff/pull/19213))
-- \[`flake8-use-pathlib`\] Add autofixes for `PTH203`, `PTH204`, `PTH205` ([#18922](https://github.com/astral-sh/ruff/pull/18922))
-
-### Bug fixes
-
-- \[`flake8-return`\] Fix false-positive for variables used inside nested functions in `RET504` ([#18433](https://github.com/astral-sh/ruff/pull/18433))
-- Treat form feed as valid whitespace before a line continuation ([#19220](https://github.com/astral-sh/ruff/pull/19220))
-- \[`flake8-type-checking`\] Fix syntax error introduced by fix (`TC008`) ([#19150](https://github.com/astral-sh/ruff/pull/19150))
-- \[`pyupgrade`\] Keyword arguments in `super` should suppress the `UP008` fix ([#19131](https://github.com/astral-sh/ruff/pull/19131))
-
-### Documentation
-
-- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI007`, `PYI008`) ([#19103](https://github.com/astral-sh/ruff/pull/19103))
-- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM116`) ([#19111](https://github.com/astral-sh/ruff/pull/19111))
-- \[`flake8-type-checking`\] Make example error out-of-the-box (`TC001`) ([#19151](https://github.com/astral-sh/ruff/pull/19151))
-- \[`flake8-use-pathlib`\] Make example error out-of-the-box (`PTH210`) ([#19189](https://github.com/astral-sh/ruff/pull/19189))
-- \[`pycodestyle`\] Make example error out-of-the-box (`E272`) ([#19191](https://github.com/astral-sh/ruff/pull/19191))
-- \[`pycodestyle`\] Make example not raise unnecessary `SyntaxError` (`E114`) ([#19190](https://github.com/astral-sh/ruff/pull/19190))
-- \[`pydoclint`\] Make example error out-of-the-box (`DOC501`) ([#19218](https://github.com/astral-sh/ruff/pull/19218))
-- \[`pylint`, `pyupgrade`\] Fix syntax errors in examples (`PLW1501`, `UP028`) ([#19127](https://github.com/astral-sh/ruff/pull/19127))
-- \[`pylint`\] Update `missing-maxsplit-arg` docs and error to suggest proper usage (`PLC0207`) ([#18949](https://github.com/astral-sh/ruff/pull/18949))
-- \[`flake8-bandit`\] Make example error out-of-the-box (`S412`) ([#19241](https://github.com/astral-sh/ruff/pull/19241))
-
 ## 0.12.2
 
 ### Preview features

Cargo.lock

@@ -591,7 +591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -600,7 +600,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -629,24 +629,12 @@ name = "console"
 version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
-dependencies = [
- "encode_unicode",
- "libc",
- "once_cell",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "console"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
 dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
  "unicode-width 0.2.1",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -680,6 +668,11 @@ name = "countme"
 version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+dependencies = [
+ "dashmap 5.5.3",
+ "once_cell",
+ "rustc-hash 1.1.0",
+]
 
 [[package]]
 name = "cpufeatures"
@@ -847,6 +840,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "dashmap"
 version = "6.1.0"
@@ -1013,7 +1019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1475,14 +1481,14 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.18.0"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
- "console 0.16.0",
+ "console",
+ "number_prefix",
  "portable-atomic",
  "unicode-width 0.2.1",
- "unit-prefix",
  "vt100",
  "web-time",
 ]
@@ -1519,7 +1525,7 @@ version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
 dependencies = [
- "console 0.15.11",
+ "console",
  "globset",
  "once_cell",
  "pest",
@@ -1586,7 +1592,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi 0.5.1",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1650,7 +1656,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2019,11 +2025,12 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "notify"
-version = "8.1.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
  "bitflags 2.9.1",
+ "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -2032,7 +2039,7 @@ dependencies = [
  "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2070,6 +2077,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -2153,7 +2166,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -2244,7 +2257,7 @@ dependencies = [
  "once_cell",
  "pep440_rs",
  "regex",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "serde",
  "smallvec",
  "thiserror 1.0.69",
@@ -2711,7 +2724,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.12.3"
+version = "0.12.2"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2754,7 +2767,7 @@ dependencies = [
  "ruff_source_file",
  "ruff_text_size",
  "ruff_workspace",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_json",
  "shellexpand",
@@ -2800,7 +2813,7 @@ dependencies = [
  "ruff_python_formatter",
  "ruff_python_parser",
  "ruff_python_trivia",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_json",
  "tikv-jemallocator",
@@ -2829,7 +2842,7 @@ dependencies = [
  "arc-swap",
  "camino",
  "countme",
- "dashmap",
+ "dashmap 6.1.0",
  "dunce",
  "etcetera",
  "filetime",
@@ -2848,7 +2861,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "schemars",
  "serde",
@@ -2856,7 +2869,6 @@ dependencies = [
  "thiserror 2.0.12",
  "tracing",
  "tracing-subscriber",
- "ty_static",
  "web-time",
  "zip",
 ]
@@ -2900,7 +2912,6 @@ dependencies = [
  "tracing-subscriber",
  "ty",
  "ty_project",
- "ty_static",
  "url",
 ]
 
@@ -2922,7 +2933,7 @@ dependencies = [
  "ruff_cache",
  "ruff_macros",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "schemars",
  "serde",
  "static_assertions",
@@ -2961,7 +2972,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.12.3"
+version = "0.12.2"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3004,7 +3015,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "schemars",
  "serde",
  "serde_json",
@@ -3076,7 +3087,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "schemars",
  "serde",
@@ -3126,7 +3137,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "schemars",
  "serde",
@@ -3175,7 +3186,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_json",
  "static_assertions",
@@ -3199,7 +3210,7 @@ dependencies = [
  "ruff_python_parser",
  "ruff_python_stdlib",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "schemars",
  "serde",
  "smallvec",
@@ -3260,7 +3271,7 @@ dependencies = [
  "ruff_source_file",
  "ruff_text_size",
  "ruff_workspace",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_json",
  "shellexpand",
@@ -3294,7 +3305,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.12.3"
+version = "0.12.2"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3349,7 +3360,7 @@ dependencies = [
  "ruff_python_semantic",
  "ruff_python_stdlib",
  "ruff_source_file",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "schemars",
  "serde",
  "shellexpand",
@@ -3368,6 +3379,12 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -3390,7 +3407,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3422,7 +3439,7 @@ dependencies = [
  "parking_lot",
  "portable-atomic",
  "rayon",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa-macro-rules",
  "salsa-macros",
  "smallvec",
@@ -3586,9 +3603,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "serde",
  "serde_derive",
@@ -3597,9 +3614,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -3780,7 +3797,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4039,9 +4056,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -4060,9 +4077,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-indicatif"
-version = "0.3.11"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c714cc8fc46db04fcfddbd274c6ef59bebb1b435155984e7c6e89c3ce66f200"
+checksum = "8201ca430e0cd893ef978226fd3516c06d9c494181c8bf4e5b32e30ed4b40aa1"
 dependencies = [
  "indicatif",
  "tracing",
@@ -4120,6 +4137,7 @@ dependencies = [
  "clap",
  "clap_complete_command",
  "colored 3.0.0",
+ "countme",
  "crossbeam",
  "ctrlc",
  "dunce",
@@ -4142,7 +4160,6 @@ dependencies = [
  "ty_project",
  "ty_python_semantic",
  "ty_server",
- "ty_static",
  "wild",
 ]
 
@@ -4150,16 +4167,12 @@ dependencies = [
 name = "ty_ide"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.1",
  "insta",
- "regex",
  "ruff_db",
  "ruff_python_ast",
  "ruff_python_parser",
- "ruff_python_trivia",
- "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "smallvec",
  "tracing",
@@ -4191,7 +4204,7 @@ dependencies = [
  "ruff_python_ast",
  "ruff_python_formatter",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "schemars",
  "serde",
@@ -4212,6 +4225,7 @@ dependencies = [
  "camino",
  "colored 3.0.0",
  "compact_str",
+ "countme",
  "dir-test",
  "drop_bomb",
  "get-size2",
@@ -4235,7 +4249,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "schemars",
  "serde",
@@ -4248,7 +4262,6 @@ dependencies = [
  "thiserror 2.0.12",
  "tracing",
  "ty_python_semantic",
- "ty_static",
  "ty_test",
  "ty_vendored",
 ]
@@ -4267,7 +4280,7 @@ dependencies = [
  "ruff_notebook",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "salsa",
  "serde",
  "serde_json",
@@ -4280,13 +4293,6 @@ dependencies = [
  "ty_vendored",
 ]
 
-[[package]]
-name = "ty_static"
-version = "0.0.1"
-dependencies = [
- "ruff_macros",
-]
-
 [[package]]
 name = "ty_test"
 version = "0.0.0"
@@ -4305,7 +4311,7 @@ dependencies = [
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "rustc-stable-hash",
  "salsa",
  "serde",
@@ -4315,7 +4321,6 @@ dependencies = [
  "toml",
  "tracing",
  "ty_python_semantic",
- "ty_static",
  "ty_vendored",
 ]
 
@@ -4468,12 +4473,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "unit-prefix"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817"
-
 [[package]]
 name = "unscanny"
 version = "0.1.0"
@@ -4806,7 +4805,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4880,7 +4879,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -4889,16 +4888,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -4907,30 +4897,14 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
@@ -4939,96 +4913,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
 [[package]]
 name = "winnow"
 version = "0.7.10"

Cargo.toml

@@ -44,7 +44,6 @@ ty_ide = { path = "crates/ty_ide" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
 ty_server = { path = "crates/ty_server" }
-ty_static = { path = "crates/ty_static" }
 ty_test = { path = "crates/ty_test" }
 ty_vendored = { path = "crates/ty_vendored" }
 
@@ -84,7 +83,7 @@ get-size2 = { version = "0.5.0", features = [
     "derive",
     "smallvec",
     "hashbrown",
-    "compact-str",
+    "compact-str"
 ] }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
@@ -99,7 +98,7 @@ ignore = { version = "0.4.22" }
 imara-diff = { version = "0.1.5" }
 imperative = { version = "1.0.4" }
 indexmap = { version = "2.6.0" }
-indicatif = { version = "0.18.0" }
+indicatif = { version = "0.17.8" }
 indoc = { version = "2.0.4" }
 insta = { version = "1.35.1" }
 insta-cmd = { version = "0.6.0" }
@@ -168,13 +167,13 @@ tikv-jemallocator = { version = "0.6.0" }
 toml = { version = "0.8.11" }
 tracing = { version = "0.1.40" }
 tracing-flame = { version = "0.2.0" }
-tracing-indicatif = { version = "0.3.11" }
+tracing-indicatif = { version = "0.3.6" }
 tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.18", default-features = false, features = [
     "env-filter",
     "fmt",
     "ansi",
-    "smallvec",
+    "smallvec"
 ] }
 tryfn = { version = "0.2.1" }
 typed-arena = { version = "2.0.2" }
@@ -184,7 +183,11 @@ unicode-width = { version = "0.2.0" }
 unicode_names2 = { version = "1.2.2" }
 unicode-normalization = { version = "0.1.23" }
 url = { version = "2.5.0" }
-uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
+uuid = { version = "1.6.1", features = [
+    "v4",
+    "fast-rng",
+    "macro-diagnostics",
+] }
 walkdir = { version = "2.3.2" }
 wasm-bindgen = { version = "0.2.92" }
 wasm-bindgen-test = { version = "0.3.42" }
@@ -219,8 +222,8 @@ must_use_candidate = "allow"
 similar_names = "allow"
 single_match_else = "allow"
 too_many_lines = "allow"
-needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
-unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
+needless_continue = "allow"       # An explicit continue can be more readable, especially if the alternative is an empty block.
+unnecessary_debug_formatting = "allow"  # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
 # Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
 needless_raw_string_hashes = "allow"
 # Disallowed restriction lints

README.md

@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.3/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.3/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.2/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.2/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.3
+  rev: v0.12.2
   hooks:
     # Run the linter.
     - id: ruff-check
@@ -430,7 +430,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Babel](https://github.com/python-babel/babel)
 - Benchling ([Refac](https://github.com/benchling/refac))
 - [Bokeh](https://github.com/bokeh/bokeh)
-- Capital One ([datacompy](https://github.com/capitalone/datacompy))
 - CrowdCent ([NumerBlox](https://github.com/crowdcent/numerblox)) <!-- typos: ignore -->
 - [Cryptography (PyCA)](https://github.com/pyca/cryptography)
 - CERN ([Indico](https://getindico.io/))
@@ -507,7 +506,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Streamlit](https://github.com/streamlit/streamlit)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
-- [Weblate](https://weblate.org/)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))
 - [ZenML](https://github.com/zenml-io/zenml)
 - [Zulip](https://github.com/zulip/zulip)

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.3"
+version = "0.12.2"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/src/cache.rs

@@ -681,7 +681,7 @@ mod tests {
                     UnsafeFixes::Enabled,
                 )
                 .unwrap();
-                if diagnostics.inner.iter().any(Diagnostic::is_invalid_syntax) {
+                if diagnostics.inner.iter().any(Diagnostic::is_syntax_error) {
                     parse_errors.push(path.clone());
                 }
                 paths.push(path);

crates/ruff/src/commands/check.rs

@@ -9,15 +9,15 @@ use ignore::Error;
 use log::{debug, error, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
+use ruff_linter::message::diagnostic_from_violation;
 use rustc_hash::FxHashMap;
 
-use ruff_db::diagnostic::Diagnostic;
 use ruff_db::panic::catch_unwind;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
-use ruff_linter::{IOError, Violation, fs, warn_user_once};
+use ruff_linter::{IOError, fs, warn_user_once};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::resolver::{
@@ -129,7 +129,11 @@ pub(crate) fn check(
                         SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
 
                     Diagnostics::new(
-                        vec![IOError { message }.into_diagnostic(TextRange::default(), &dummy)],
+                        vec![diagnostic_from_violation(
+                            IOError { message },
+                            TextRange::default(),
+                            &dummy,
+                        )],
                         FxHashMap::default(),
                     )
                 } else {
@@ -162,9 +166,7 @@ pub(crate) fn check(
             |a, b| (a.0 + b.0, a.1 + b.1),
         );
 
-    all_diagnostics
-        .inner
-        .sort_by(Diagnostic::ruff_start_ordering);
+    all_diagnostics.inner.sort();
 
     // Store the caches.
     caches.persist()?;

crates/ruff/src/commands/check_stdin.rs

@@ -1,7 +1,6 @@
 use std::path::Path;
 
 use anyhow::Result;
-use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::packaging;
 use ruff_linter::settings::flags;
@@ -53,8 +52,6 @@ pub(crate) fn check_stdin(
         noqa,
         fix_mode,
     )?;
-    diagnostics
-        .inner
-        .sort_unstable_by(Diagnostic::ruff_start_ordering);
+    diagnostics.inner.sort_unstable();
     Ok(diagnostics)
 }

crates/ruff/src/diagnostics.rs

@@ -13,13 +13,13 @@ use log::{debug, warn};
 use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
-use ruff_linter::message::create_syntax_error_diagnostic;
+use ruff_linter::message::{create_syntax_error_diagnostic, diagnostic_from_violation};
 use ruff_linter::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
 use ruff_linter::source_kind::{SourceError, SourceKind};
-use ruff_linter::{IOError, Violation, fs};
+use ruff_linter::{IOError, fs};
 use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
 use ruff_source_file::SourceFileBuilder;
@@ -62,12 +62,13 @@ impl Diagnostics {
                     let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                     let source_file = SourceFileBuilder::new(name, "").finish();
                     Self::new(
-                        vec![
+                        vec![diagnostic_from_violation(
                             IOError {
                                 message: err.to_string(),
-                            }
-                            .into_diagnostic(TextRange::default(), &source_file),
-                        ],
+                            },
+                            TextRange::default(),
+                            &source_file,
+                        )],
                         FxHashMap::default(),
                     )
                 } else {

crates/ruff/tests/lint.rs

@@ -5692,57 +5692,3 @@ class Foo:
     "
     );
 }
-
-#[test_case::test_case("concise")]
-#[test_case::test_case("full")]
-#[test_case::test_case("json")]
-#[test_case::test_case("json-lines")]
-#[test_case::test_case("junit")]
-#[test_case::test_case("grouped")]
-#[test_case::test_case("github")]
-#[test_case::test_case("gitlab")]
-#[test_case::test_case("pylint")]
-#[test_case::test_case("rdjson")]
-#[test_case::test_case("azure")]
-#[test_case::test_case("sarif")]
-fn output_format(output_format: &str) -> Result<()> {
-    const CONTENT: &str = "\
-import os  # F401
-x = y      # F821
-match 42:  # invalid-syntax
-    case _: ...
-";
-
-    let tempdir = TempDir::new()?;
-    let input = tempdir.path().join("input.py");
-    fs::write(&input, CONTENT)?;
-
-    let snapshot = format!("output_format_{output_format}");
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#),
-            (ruff_linter::VERSION, "[VERSION]"),
-        ]
-    }, {
-        assert_cmd_snapshot!(
-            snapshot,
-            Command::new(get_cargo_bin(BIN_NAME))
-                .args([
-                    "check",
-                    "--no-cache",
-                    "--output-format",
-                    output_format,
-                    "--select",
-                    "F401,F821",
-                    "--target-version",
-                    "py39",
-                    "input.py",
-                ])
-                .current_dir(&tempdir),
-        );
-    });
-
-    Ok(())
-}

crates/ruff/tests/snapshots/lint__output_format_azure.snap

@@ -1,23 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - azure
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=2;columnnumber=5;code=F821;]Undefined name `y`
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=3;columnnumber=1;]SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_concise.snap

@@ -1,25 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - concise
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-input.py:1:8: F401 [*] `os` imported but unused
-input.py:2:5: F821 Undefined name `y`
-input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_full.snap

@@ -1,49 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - full
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-input.py:1:8: F401 [*] `os` imported but unused
-  |
-1 | import os  # F401
-  |        ^^ F401
-2 | x = y      # F821
-3 | match 42:  # invalid-syntax
-  |
-  = help: Remove unused import: `os`
-
-input.py:2:5: F821 Undefined name `y`
-  |
-1 | import os  # F401
-2 | x = y      # F821
-  |     ^ F821
-3 | match 42:  # invalid-syntax
-4 |     case _: ...
-  |
-
-input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-  |
-1 | import os  # F401
-2 | x = y      # F821
-3 | match 42:  # invalid-syntax
-  | ^^^^^
-4 |     case _: ...
-  |
-
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_github.snap

@@ -1,23 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - github
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-::error title=Ruff (F401),file=[TMP]/input.py,line=1,col=8,endLine=1,endColumn=10::input.py:1:8: F401 `os` imported but unused
-::error title=Ruff (F821),file=[TMP]/input.py,line=2,col=5,endLine=2,endColumn=6::input.py:2:5: F821 Undefined name `y`
-::error title=Ruff,file=[TMP]/input.py,line=3,col=1,endLine=3,endColumn=6::input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_gitlab.snap

@@ -1,60 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - gitlab
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-[
-  {
-    "check_name": "F401",
-    "description": "`os` imported but unused",
-    "fingerprint": "4dbad37161e65c72",
-    "location": {
-      "lines": {
-        "begin": 1,
-        "end": 1
-      },
-      "path": "input.py"
-    },
-    "severity": "major"
-  },
-  {
-    "check_name": "F821",
-    "description": "Undefined name `y`",
-    "fingerprint": "7af59862a085230",
-    "location": {
-      "lines": {
-        "begin": 2,
-        "end": 2
-      },
-      "path": "input.py"
-    },
-    "severity": "major"
-  },
-  {
-    "check_name": "syntax-error",
-    "description": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "fingerprint": "e558cec859bb66e8",
-    "location": {
-      "lines": {
-        "begin": 3,
-        "end": 3
-      },
-      "path": "input.py"
-    },
-    "severity": "major"
-  }
-]
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_grouped.snap

@@ -1,27 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - grouped
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-input.py:
-  1:8 F401 [*] `os` imported but unused
-  2:5 F821 Undefined name `y`
-  3:1 SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_json-lines.snap

@@ -1,23 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - json-lines
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"[TMP]/input.py","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":null,"code":"F821","end_location":{"column":6,"row":2},"filename":"[TMP]/input.py","fix":null,"location":{"column":5,"row":2},"message":"Undefined name `y`","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
-{"cell":null,"code":null,"end_location":{"column":6,"row":3},"filename":"[TMP]/input.py","fix":null,"location":{"column":1,"row":3},"message":"SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)","noqa_row":null,"url":null}
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_json.snap

@@ -1,88 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - json
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-[
-  {
-    "cell": null,
-    "code": "F401",
-    "end_location": {
-      "column": 10,
-      "row": 1
-    },
-    "filename": "[TMP]/input.py",
-    "fix": {
-      "applicability": "safe",
-      "edits": [
-        {
-          "content": "",
-          "end_location": {
-            "column": 1,
-            "row": 2
-          },
-          "location": {
-            "column": 1,
-            "row": 1
-          }
-        }
-      ],
-      "message": "Remove unused import: `os`"
-    },
-    "location": {
-      "column": 8,
-      "row": 1
-    },
-    "message": "`os` imported but unused",
-    "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/unused-import"
-  },
-  {
-    "cell": null,
-    "code": "F821",
-    "end_location": {
-      "column": 6,
-      "row": 2
-    },
-    "filename": "[TMP]/input.py",
-    "fix": null,
-    "location": {
-      "column": 5,
-      "row": 2
-    },
-    "message": "Undefined name `y`",
-    "noqa_row": 2,
-    "url": "https://docs.astral.sh/ruff/rules/undefined-name"
-  },
-  {
-    "cell": null,
-    "code": null,
-    "end_location": {
-      "column": 6,
-      "row": 3
-    },
-    "filename": "[TMP]/input.py",
-    "fix": null,
-    "location": {
-      "column": 1,
-      "row": 3
-    },
-    "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "noqa_row": null,
-    "url": null
-  }
-]
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_junit.snap

@@ -1,34 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - junit
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="[TMP]/input.py" tests="3" disabled="0" errors="0" failures="3" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="[TMP]/input" line="1" column="8">
-            <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
-        </testcase>
-        <testcase name="org.ruff.F821" classname="[TMP]/input" line="2" column="5">
-            <failure message="Undefined name `y`">line 2, col 5, Undefined name `y`</failure>
-        </testcase>
-        <testcase name="org.ruff" classname="[TMP]/input" line="3" column="1">
-            <failure message="SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)">line 3, col 1, SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)</failure>
-        </testcase>
-    </testsuite>
-</testsuites>
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_pylint.snap

@@ -1,23 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - pylint
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-input.py:1: [F401] `os` imported but unused
-input.py:2: [F821] Undefined name `y`
-input.py:3: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_rdjson.snap

@@ -1,103 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - rdjson
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-{
-  "diagnostics": [
-    {
-      "code": {
-        "url": "https://docs.astral.sh/ruff/rules/unused-import",
-        "value": "F401"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 10,
-            "line": 1
-          },
-          "start": {
-            "column": 8,
-            "line": 1
-          }
-        }
-      },
-      "message": "`os` imported but unused",
-      "suggestions": [
-        {
-          "range": {
-            "end": {
-              "column": 1,
-              "line": 2
-            },
-            "start": {
-              "column": 1,
-              "line": 1
-            }
-          },
-          "text": ""
-        }
-      ]
-    },
-    {
-      "code": {
-        "url": "https://docs.astral.sh/ruff/rules/undefined-name",
-        "value": "F821"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 6,
-            "line": 2
-          },
-          "start": {
-            "column": 5,
-            "line": 2
-          }
-        }
-      },
-      "message": "Undefined name `y`"
-    },
-    {
-      "code": {
-        "url": null,
-        "value": null
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 6,
-            "line": 3
-          },
-          "start": {
-            "column": 1,
-            "line": 3
-          }
-        }
-      },
-      "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
-    }
-  ],
-  "severity": "warning",
-  "source": {
-    "name": "ruff",
-    "url": "https://docs.astral.sh/ruff"
-  }
-}
------ stderr -----

crates/ruff/tests/snapshots/lint__output_format_sarif.snap

@@ -1,142 +0,0 @@
----
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - sarif
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
----
-success: false
-exit_code: 1
------ stdout -----
-{
-  "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
-  "runs": [
-    {
-      "results": [
-        {
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 10,
-                  "endLine": 1,
-                  "startColumn": 8,
-                  "startLine": 1
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "`os` imported but unused"
-          },
-          "ruleId": "F401"
-        },
-        {
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 6,
-                  "endLine": 2,
-                  "startColumn": 5,
-                  "startLine": 2
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "Undefined name `y`"
-          },
-          "ruleId": "F821"
-        },
-        {
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 6,
-                  "endLine": 3,
-                  "startColumn": 1,
-                  "startLine": 3
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
-          },
-          "ruleId": null
-        }
-      ],
-      "tool": {
-        "driver": {
-          "informationUri": "https://github.com/astral-sh/ruff",
-          "name": "ruff",
-          "rules": [
-            {
-              "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)\n"
-              },
-              "help": {
-                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
-              },
-              "helpUri": "https://docs.astral.sh/ruff/rules/unused-import",
-              "id": "F401",
-              "properties": {
-                "id": "F401",
-                "kind": "Pyflakes",
-                "name": "unused-import",
-                "problem.severity": "error"
-              },
-              "shortDescription": {
-                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
-              }
-            },
-            {
-              "fullDescription": {
-                "text": "## What it does\nChecks for uses of undefined names.\n\n## Why is this bad?\nAn undefined name is likely to raise `NameError` at runtime.\n\n## Example\n```python\ndef double():\n    return n * 2  # raises `NameError` if `n` is undefined when `double` is called\n```\n\nUse instead:\n```python\ndef double(n):\n    return n * 2\n```\n\n## Options\n- [`target-version`]: Can be used to configure which symbols Ruff will understand\n  as being available in the `builtins` namespace.\n\n## References\n- [Python documentation: Naming and binding](https://docs.python.org/3/reference/executionmodel.html#naming-and-binding)\n"
-              },
-              "help": {
-                "text": "Undefined name `{name}`. {tip}"
-              },
-              "helpUri": "https://docs.astral.sh/ruff/rules/undefined-name",
-              "id": "F821",
-              "properties": {
-                "id": "F821",
-                "kind": "Pyflakes",
-                "name": "undefined-name",
-                "problem.severity": "error"
-              },
-              "shortDescription": {
-                "text": "Undefined name `{name}`. {tip}"
-              }
-            }
-          ],
-          "version": "[VERSION]"
-        }
-      }
-    }
-  ],
-  "version": "2.1.0"
-}
------ stderr -----

crates/ruff_benchmark/benches/ty.rs

@@ -498,8 +498,11 @@ fn bench_project(benchmark: &ProjectBenchmark, criterion: &mut Criterion) {
         let diagnostics = result.len();
 
         assert!(
-            diagnostics <= max_diagnostics,
-            "Expected <={max_diagnostics} diagnostics but got {diagnostics}"
+            diagnostics > 1 && diagnostics <= max_diagnostics,
+            "Expected between {} and {} diagnostics but got {}",
+            1,
+            max_diagnostics,
+            diagnostics
         );
     }
 
@@ -567,23 +570,6 @@ fn anyio(criterion: &mut Criterion) {
     bench_project(&benchmark, criterion);
 }
 
-fn datetype(criterion: &mut Criterion) {
-    let benchmark = ProjectBenchmark::new(
-        RealWorldProject {
-            name: "DateType",
-            repository: "https://github.com/glyph/DateType",
-            commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
-            max_dep_date: "2025-07-04",
-            python_version: PythonVersion::PY313,
-        },
-        0,
-    );
-
-    bench_project(&benchmark, criterion);
-}
-
 criterion_group!(check_file, benchmark_cold, benchmark_incremental);
 criterion_group!(
     micro,
@@ -592,5 +578,5 @@ criterion_group!(
     benchmark_complex_constrained_attributes_1,
     benchmark_complex_constrained_attributes_2,
 );
-criterion_group!(project, anyio, attrs, hydra, datetype);
+criterion_group!(project, anyio, attrs, hydra);
 criterion_main!(check_file, micro, project);

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -242,19 +242,20 @@ fn large(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=8)]
-fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
-    let thread_pool = ThreadPoolBuilder::new().build().unwrap();
+// Currently disabled because the benchmark is too noisy (± 10%) to give useful feedback.
+// #[bench(args=[&*PYDANTIC], sample_size=3, sample_count=3)]
+// fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
+//     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
 
-    bencher
-        .with_inputs(|| benchmark.setup_iteration())
-        .bench_local_values(|db| {
-            thread_pool.install(|| {
-                check_project(&db, benchmark.max_diagnostics);
-                db
-            })
-        });
-}
+//     bencher
+//         .with_inputs(|| benchmark.setup_iteration())
+//         .bench_local_values(|db| {
+//             thread_pool.install(|| {
+//                 check_project(&db, benchmark.max_diagnostics);
+//                 db
+//             })
+//         });
+// }
 
 fn main() {
     ThreadPoolBuilder::new()

crates/ruff_db/Cargo.toml

@@ -20,7 +20,6 @@ ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_source_file = { workspace = true, features = ["get-size"] }
 ruff_text_size = { workspace = true }
-ty_static = { workspace = true }
 
 anstyle = { workspace = true }
 arc-swap = { workspace = true }

crates/ruff_db/src/diagnostic/mod.rs

@@ -83,7 +83,7 @@ impl Diagnostic {
     ///
     /// Note that `message` is stored in the primary annotation, _not_ in the primary diagnostic
     /// message.
-    pub fn invalid_syntax(
+    pub fn syntax_error(
         span: impl Into<Span>,
         message: impl IntoDiagnosticMessage,
         range: impl Ranged,
@@ -365,7 +365,7 @@ impl Diagnostic {
     }
 
     /// Returns `true` if `self` is a syntax error message.
-    pub fn is_invalid_syntax(&self) -> bool {
+    pub fn is_syntax_error(&self) -> bool {
         self.id().is_invalid_syntax()
     }
 
@@ -381,7 +381,7 @@ impl Diagnostic {
 
     /// Returns the URL for the rule documentation, if it exists.
     pub fn to_url(&self) -> Option<String> {
-        if self.is_invalid_syntax() {
+        if self.is_syntax_error() {
             None
         } else {
             Some(format!(
@@ -447,16 +447,20 @@ impl Diagnostic {
     pub fn expect_range(&self) -> TextRange {
         self.range().expect("Expected a range for the primary span")
     }
+}
 
-    /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
-    ///
-    /// Panics if either diagnostic has no primary span, if the span has no range, or if its file is
-    /// not a `SourceFile`.
-    pub fn ruff_start_ordering(&self, other: &Self) -> std::cmp::Ordering {
-        (self.expect_ruff_source_file(), self.expect_range().start()).cmp(&(
-            other.expect_ruff_source_file(),
-            other.expect_range().start(),
-        ))
+impl Ord for Diagnostic {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.partial_cmp(other).unwrap_or(std::cmp::Ordering::Equal)
+    }
+}
+
+impl PartialOrd for Diagnostic {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(
+            (self.ruff_source_file()?, self.range()?.start())
+                .cmp(&(other.ruff_source_file()?, other.range()?.start())),
+        )
     }
 }
 

crates/ruff_db/src/lib.rs

@@ -5,7 +5,6 @@ use ruff_python_ast::PythonVersion;
 use rustc_hash::FxHasher;
 use std::hash::BuildHasherDefault;
 use std::num::NonZeroUsize;
-use ty_static::EnvVars;
 
 pub mod diagnostic;
 pub mod display;
@@ -51,8 +50,8 @@ pub trait Db: salsa::Database {
 /// ty can still spawn more threads for other tasks, e.g. to wait for a Ctrl+C signal or
 /// watching the files for changes.
 pub fn max_parallelism() -> NonZeroUsize {
-    std::env::var(EnvVars::TY_MAX_PARALLELISM)
-        .or_else(|_| std::env::var(EnvVars::RAYON_NUM_THREADS))
+    std::env::var("TY_MAX_PARALLELISM")
+        .or_else(|_| std::env::var("RAYON_NUM_THREADS"))
         .ok()
         .and_then(|s| s.parse().ok())
         .unwrap_or_else(|| {

crates/ruff_dev/Cargo.toml

@@ -13,7 +13,6 @@ license = { workspace = true }
 [dependencies]
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
-ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
 ruff_linter = { workspace = true, features = ["schemars"] }

crates/ruff_dev/src/generate_all.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 
 use crate::{
     generate_cli_help, generate_docs, generate_json_schema, generate_ty_cli_reference,
-    generate_ty_env_vars_reference, generate_ty_options, generate_ty_rules, generate_ty_schema,
+    generate_ty_options, generate_ty_rules, generate_ty_schema,
 };
 
 pub(crate) const REGENERATE_ALL_COMMAND: &str = "cargo dev generate-all";
@@ -44,8 +44,5 @@ pub(crate) fn main(args: &Args) -> Result<()> {
     generate_ty_options::main(&generate_ty_options::Args { mode: args.mode })?;
     generate_ty_rules::main(&generate_ty_rules::Args { mode: args.mode })?;
     generate_ty_cli_reference::main(&generate_ty_cli_reference::Args { mode: args.mode })?;
-    generate_ty_env_vars_reference::main(&generate_ty_env_vars_reference::Args {
-        mode: args.mode,
-    })?;
     Ok(())
 }

crates/ruff_dev/src/generate_ty_env_vars_reference.rs

@@ -1,119 +0,0 @@
-//! Generate the environment variables reference from `ty_static::EnvVars`.
-
-use std::collections::BTreeSet;
-use std::fs;
-use std::path::PathBuf;
-
-use anyhow::bail;
-use pretty_assertions::StrComparison;
-
-use ty_static::EnvVars;
-
-use crate::generate_all::Mode;
-
-#[derive(clap::Args)]
-pub(crate) struct Args {
-    #[arg(long, default_value_t, value_enum)]
-    pub(crate) mode: Mode,
-}
-
-pub(crate) fn main(args: &Args) -> anyhow::Result<()> {
-    let reference_string = generate();
-    let filename = "environment.md";
-    let reference_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .join("crates")
-        .join("ty")
-        .join("docs")
-        .join(filename);
-
-    match args.mode {
-        Mode::DryRun => {
-            println!("{reference_string}");
-        }
-        Mode::Check => match fs::read_to_string(&reference_path) {
-            Ok(current) => {
-                if current == reference_string {
-                    println!("Up-to-date: {filename}");
-                } else {
-                    let comparison = StrComparison::new(&current, &reference_string);
-                    bail!(
-                        "{filename} changed, please run `cargo dev generate-ty-env-vars-reference`:\n{comparison}"
-                    );
-                }
-            }
-            Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
-                bail!(
-                    "{filename} not found, please run `cargo dev generate-ty-env-vars-reference`"
-                );
-            }
-            Err(err) => {
-                bail!(
-                    "{filename} changed, please run `cargo dev generate-ty-env-vars-reference`:\n{err}"
-                );
-            }
-        },
-        Mode::Write => {
-            // Ensure the docs directory exists
-            if let Some(parent) = reference_path.parent() {
-                fs::create_dir_all(parent)?;
-            }
-
-            match fs::read_to_string(&reference_path) {
-                Ok(current) => {
-                    if current == reference_string {
-                        println!("Up-to-date: {filename}");
-                    } else {
-                        println!("Updating: {filename}");
-                        fs::write(&reference_path, reference_string.as_bytes())?;
-                    }
-                }
-                Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
-                    println!("Updating: {filename}");
-                    fs::write(&reference_path, reference_string.as_bytes())?;
-                }
-                Err(err) => {
-                    bail!(
-                        "{filename} changed, please run `cargo dev generate-ty-env-vars-reference`:\n{err}"
-                    );
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn generate() -> String {
-    let mut output = String::new();
-
-    output.push_str("# Environment variables\n\n");
-
-    // Partition and sort environment variables into TY_ and external variables.
-    let (ty_vars, external_vars): (BTreeSet<_>, BTreeSet<_>) = EnvVars::metadata()
-        .iter()
-        .partition(|(var, _)| var.starts_with("TY_"));
-
-    output.push_str("ty defines and respects the following environment variables:\n\n");
-
-    for (var, doc) in ty_vars {
-        output.push_str(&render(var, doc));
-    }
-
-    output.push_str("## Externally-defined variables\n\n");
-    output.push_str("ty also reads the following externally defined environment variables:\n\n");
-
-    for (var, doc) in external_vars {
-        output.push_str(&render(var, doc));
-    }
-
-    output
-}
-
-/// Render an environment variable and its documentation.
-fn render(var: &str, doc: &str) -> String {
-    format!("### `{var}`\n\n{doc}\n\n")
-}

crates/ruff_dev/src/main.rs

@@ -18,7 +18,6 @@ mod generate_json_schema;
 mod generate_options;
 mod generate_rules_table;
 mod generate_ty_cli_reference;
-mod generate_ty_env_vars_reference;
 mod generate_ty_options;
 mod generate_ty_rules;
 mod generate_ty_schema;
@@ -54,8 +53,6 @@ enum Command {
     /// Generate a Markdown-compatible listing of configuration options.
     GenerateOptions,
     GenerateTyOptions(generate_ty_options::Args),
-    /// Generate environment variables reference for ty.
-    GenerateTyEnvVarsReference(generate_ty_env_vars_reference::Args),
     /// Generate CLI help.
     GenerateCliHelp(generate_cli_help::Args),
     /// Generate Markdown docs.
@@ -101,7 +98,6 @@ fn main() -> Result<ExitCode> {
         Command::GenerateTyRules(args) => generate_ty_rules::main(&args)?,
         Command::GenerateOptions => println!("{}", generate_options::generate()),
         Command::GenerateTyOptions(args) => generate_ty_options::main(&args)?,
-        Command::GenerateTyEnvVarsReference(args) => generate_ty_env_vars_reference::main(&args)?,
         Command::GenerateCliHelp(args) => generate_cli_help::main(&args)?,
         Command::GenerateDocs(args) => generate_docs::main(&args)?,
         Command::PrintAST(args) => print_ast::main(&args)?,

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.3"
+version = "0.12.2"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S112.py

@@ -1,30 +1,29 @@
-for _ in []:
-    try:
-        pass
-    except Exception:
-        continue
+try:
+    pass
+except Exception:
+    continue
 
-    try:
-        pass
-    except:
-        continue
+try:
+    pass
+except:
+    continue
 
-    try:
-        pass
-    except (Exception,):
-        continue
+try:
+    pass
+except (Exception,):
+    continue
 
-    try:
-        pass
-    except (Exception, ValueError):
-        continue
+try:
+    pass
+except (Exception, ValueError):
+    continue
 
-    try:
-        pass
-    except ValueError:
-        continue
+try:
+    pass
+except ValueError:
+    continue
 
-    try:
-        pass
-    except (ValueError,):
-        continue
+try:
+    pass
+except (ValueError,):
+    continue

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B017.py

@@ -1,10 +1,10 @@
 """
 Should emit:
-B017 - on lines 24, 28, 46, 49, 52, and 58
+B017 - on lines 23 and 41
 """
 import asyncio
 import unittest
-import pytest, contextlib
+import pytest
 
 CONSTANT = True
 

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B017_1.py

@@ -1,28 +0,0 @@
-"""
-Should emit:
-B017 - on lines 20, 21, 25, and 26
-"""
-import unittest
-import pytest
-
-
-def something_else() -> None:
-    for i in (1, 2, 3):
-        print(i)
-
-
-class Foo:
-    pass
-
-
-class Foobar(unittest.TestCase):
-    def call_form_raises(self) -> None:
-        self.assertRaises(Exception, something_else)
-        self.assertRaises(BaseException, something_else)
-
-
-def test_pytest_call_form() -> None:
-    pytest.raises(Exception, something_else)
-    pytest.raises(BaseException, something_else)
-
-    pytest.raises(Exception, something_else, match="hello")

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B031.py

@@ -185,45 +185,38 @@ for _section, section_items in groupby(items, key=lambda p: p[1]):
     collect_shop_items(shopper, section_items)
 
 # Shouldn't trigger the warning when there is a return statement.
-def foo():
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            return section_items
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
         collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        return section_items
+    collect_shop_items(shopper, section_items)
 
 # Should trigger the warning for duplicate access, even if is a return statement after.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            collect_shop_items(shopper, section_items)
-            return
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)
+        return
 
 # Should trigger the warning for duplicate access, even if is a return in another branch.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            collect_shop_items(shopper, section_items)
-            collect_shop_items(shopper, section_items)
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)
 
 # Should trigger, since only one branch has a return statement.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            collect_shop_items(shopper, section_items)
-        collect_shop_items(shopper, section_items)  # B031
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+    collect_shop_items(shopper, section_items)  # B031
 
 # Let's redefine the `groupby` function to make sure we pick up the correct one.
 # NOTE: This should always be at the end of the file.

crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py

@@ -26,9 +26,8 @@ abc(**{'a': b}, **{'a': c})  # PIE804
 abc(a=1, **{'a': c}, **{'b': c})  # PIE804
 
 # Some values need to be parenthesized.
-def foo():
-    abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-    abc(foo=1, **{'bar': (yield 1)})  # PIE804
+abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+abc(foo=1, **{'bar': (yield 1)})  # PIE804
 
 # https://github.com/astral-sh/ruff/issues/18036
 # The autofix for this is unsafe due to the comments inside the dictionary.

crates/ruff_linter/resources/test/fixtures/flake8_return/RET504.py

@@ -422,35 +422,6 @@ def func(a: dict[str, int]) -> list[dict[str, int]]:
         services = a["services"]
         return services
 
-
-# See: https://github.com/astral-sh/ruff/issues/14052
-def outer() -> list[object]:
-    @register
-    async def inner() -> None:
-        print(layout)
-
-    layout = [...]
-    return layout
-
-def outer() -> list[object]:
-    with open("") as f:
-        async def inner() -> None:
-            print(layout)
-
-    layout = [...]
-    return layout
-
-
-def outer() -> list[object]:
-    def inner():
-        with open("") as f:
-            async def inner_inner() -> None:
-                print(layout)
-
-    layout = [...]
-    return layout
-
-
 # See: https://github.com/astral-sh/ruff/issues/18411
 def f():
     (#=

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM115.py

@@ -27,9 +27,8 @@ with contextlib.ExitStack() as stack:
     close_files = stack.pop_all().close
 
 # OK
-async def foo():
-    with contextlib.AsyncExitStack() as exit_stack:
-        f = await exit_stack.enter_async_context(open("filename"))
+with contextlib.AsyncExitStack() as exit_stack:
+    f = await exit_stack.enter_async_context(open("filename"))
 
 # OK (false negative)
 with contextlib.ExitStack():
@@ -276,10 +275,9 @@ class ExampleClassTests(TestCase):
         cls.enterClassContext(open("filename"))
 
 # OK
-async def foo():
-    class ExampleAsyncTests(IsolatedAsyncioTestCase):
-        async def test_something(self):
-            await self.enterAsyncContext(open("filename"))
+class ExampleAsyncTests(IsolatedAsyncioTestCase):
+    async def test_something(self):
+        await self.enterAsyncContext(open("filename"))
 
 # OK
 class ExampleTests(TestCase):

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM116.py

@@ -1,99 +1,98 @@
-def foo():
-    # Errors
-    a = "hello"
+# Errors
+a = "hello"
 
-    # SIM116
-    if a == "foo":
-        return "bar"
-    elif a == "bar":
-        return "baz"
-    elif a == "boo":
-        return "ooh"
+# SIM116
+if a == "foo":
+    return "bar"
+elif a == "bar":
+    return "baz"
+elif a == "boo":
+    return "ooh"
+else:
+    return 42
+
+# SIM116
+if a == 1:
+    return (1, 2, 3)
+elif a == 2:
+    return (4, 5, 6)
+elif a == 3:
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# SIM116
+if a == 1:
+    return (1, 2, 3)
+elif a == 2:
+    return (4, 5, 6)
+elif a == 3:
+    return (7, 8, 9)
+
+# SIM116
+if a == "hello 'sir'":
+    return (1, 2, 3)
+elif a == 'goodbye "mam"':
+    return (4, 5, 6)
+elif a == """Fairwell 'mister'""":
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# SIM116
+if a == b"one":
+    return 1
+elif a == b"two":
+    return 2
+elif a == b"three":
+    return 3
+
+# SIM116
+if a == "hello 'sir'":
+    return ("hello'", 'hi"', 3)
+elif a == 'goodbye "mam"':
+    return (4, 5, 6)
+elif a == """Fairwell 'mister'""":
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# OK
+if a == "foo":
+    return "bar"
+elif a == "bar":
+    return baz()
+elif a == "boo":
+    return "ooh"
+else:
+    return 42
+
+# OK
+if a == b"one":
+    return 1
+elif b == b"two":
+    return 2
+elif a == b"three":
+    return 3
+
+# SIM116
+if func_name == "create":
+    return "A"
+elif func_name == "modify":
+    return "M"
+elif func_name == "remove":
+    return "D"
+elif func_name == "move":
+    return "MV"
+
+# OK
+def no_return_in_else(platform):
+    if platform == "linux":
+        return "auditwheel repair -w {dest_dir} {wheel}"
+    elif platform == "macos":
+        return "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
+    elif platform == "windows":
+        return ""
     else:
-        return 42
-
-    # SIM116
-    if a == 1:
-        return (1, 2, 3)
-    elif a == 2:
-        return (4, 5, 6)
-    elif a == 3:
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # SIM116
-    if a == 1:
-        return (1, 2, 3)
-    elif a == 2:
-        return (4, 5, 6)
-    elif a == 3:
-        return (7, 8, 9)
-
-    # SIM116
-    if a == "hello 'sir'":
-        return (1, 2, 3)
-    elif a == 'goodbye "mam"':
-        return (4, 5, 6)
-    elif a == """Fairwell 'mister'""":
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # SIM116
-    if a == b"one":
-        return 1
-    elif a == b"two":
-        return 2
-    elif a == b"three":
-        return 3
-
-    # SIM116
-    if a == "hello 'sir'":
-        return ("hello'", 'hi"', 3)
-    elif a == 'goodbye "mam"':
-        return (4, 5, 6)
-    elif a == """Fairwell 'mister'""":
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # OK
-    if a == "foo":
-        return "bar"
-    elif a == "bar":
-        return baz()
-    elif a == "boo":
-        return "ooh"
-    else:
-        return 42
-
-    # OK
-    if a == b"one":
-        return 1
-    elif b == b"two":
-        return 2
-    elif a == b"three":
-        return 3
-
-    # SIM116
-    if func_name == "create":
-        return "A"
-    elif func_name == "modify":
-        return "M"
-    elif func_name == "remove":
-        return "D"
-    elif func_name == "move":
-        return "MV"
-
-    # OK
-    def no_return_in_else(platform):
-        if platform == "linux":
-            return "auditwheel repair -w {dest_dir} {wheel}"
-        elif platform == "macos":
-            return "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
-        elif platform == "windows":
-            return ""
-        else:
-            msg = f"Unknown platform: {platform!r}"
-            raise ValueError(msg)
+        msg = f"Unknown platform: {platform!r}"
+        raise ValueError(msg)

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TC008.py

@@ -50,23 +50,3 @@ class Baz:
     class Nested:
         a: TypeAlias = 'Baz'  # OK
         type A = 'Baz'  # TC008
-
-# O should have parenthesis added
-o: TypeAlias = """int
-| None"""
-type O = """int
-| None"""
-
-# P, Q, and R should not have parenthesis added
-p: TypeAlias = ("""int
-| None""")
-type P = ("""int
-| None""")
-
-q: TypeAlias = """(int
-| None)"""
-type Q = """(int
-| None)"""
-
-r: TypeAlias = """int | None"""
-type R = """int | None"""

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/whitespace.py

@@ -1,6 +0,0 @@
-# Regression test for: https://github.com/astral-sh/ruff/issues/19175
-# there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash
-from typing import TYPE_CHECKING\
-
-if TYPE_CHECKING: import builtins
-builtins.print("!")

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH203.py

@@ -1,4 +1,4 @@
-import os.path, pathlib
+import os.path
 from pathlib import Path
 from os.path import getatime
 
@@ -10,26 +10,3 @@ os.path.getatime(Path("filename"))
 getatime("filename")
 getatime(b"filename")
 getatime(Path("filename"))
-
-
-file = __file__
-
-os.path.getatime(file)
-os.path.getatime(filename="filename")
-os.path.getatime(filename=Path("filename"))
-
-os.path.getatime(  # comment 1
-    # comment 2
-    "filename"  # comment 3
-    # comment 4
-    ,  # comment 5
-    # comment 6
-)  # comment 7
-
-os.path.getatime("file" + "name")
-
-getatime(Path("filename").resolve())
-
-os.path.getatime(pathlib.Path("filename"))
-
-getatime(Path("dir") / "file.txt")

crates/ruff_linter/resources/test/fixtures/pycodestyle/E27.py

@@ -81,5 +81,4 @@ match(foo):
 # https://github.com/astral-sh/ruff/issues/12094
 pass;
 
-def foo():
-    yield, x
+yield, x

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py

@@ -125,19 +125,3 @@ class ClassForCommentEnthusiasts(BaseClass):
             self
             # also a comment
         ).f()
-
-
-# Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed
-class Ord(int):
-    def __len__(self):
-        return super(Ord, self, uhoh=True, **{"error": True}).bit_length()
-
-class ExampleWithKeywords:
-    def method1(self):
-        super(ExampleWithKeywords, self, invalid=True).some_method()  # Should emit diagnostic but NOT be fixed
-    
-    def method2(self):
-        super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method()  # Should emit diagnostic but NOT be fixed
-    
-    def method3(self):
-        super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords

crates/ruff_linter/src/checkers/ast/analyze/bindings.rs

@@ -4,8 +4,8 @@ use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::rules::{
-    flake8_import_conventions, flake8_pyi, flake8_pytest_style, flake8_return,
-    flake8_type_checking, pyflakes, pylint, pyupgrade, refurb, ruff,
+    flake8_import_conventions, flake8_pyi, flake8_pytest_style, flake8_type_checking, pyflakes,
+    pylint, pyupgrade, refurb, ruff,
 };
 
 /// Run lint rules over the [`Binding`]s.
@@ -25,20 +25,11 @@ pub(crate) fn bindings(checker: &Checker) {
         Rule::ForLoopWrites,
         Rule::CustomTypeVarForSelf,
         Rule::PrivateTypeParameter,
-        Rule::UnnecessaryAssign,
     ]) {
         return;
     }
 
     for (binding_id, binding) in checker.semantic.bindings.iter_enumerated() {
-        if checker.is_rule_enabled(Rule::UnnecessaryAssign) {
-            if binding.kind.is_function_definition() {
-                flake8_return::rules::unnecessary_assign(
-                    checker,
-                    binding.statement(checker.semantic()).unwrap(),
-                );
-            }
-        }
         if checker.is_rule_enabled(Rule::UnusedVariable) {
             if binding.kind.is_bound_exception()
                 && binding.is_unused()

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -7,9 +7,7 @@ use ruff_python_semantic::analyze::typing;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
-use crate::preview::{
-    is_assert_raises_exception_call_enabled, is_optional_as_none_in_union_enabled,
-};
+use crate::preview::is_optional_as_none_in_union_enabled;
 use crate::registry::Rule;
 use crate::rules::{
     airflow, flake8_2020, flake8_async, flake8_bandit, flake8_boolean_trap, flake8_bugbear,
@@ -1039,84 +1037,46 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 flake8_simplify::rules::zip_dict_keys_and_values(checker, call);
             }
             if checker.any_rule_enabled(&[
+                Rule::OsPathAbspath,
                 Rule::OsChmod,
                 Rule::OsMkdir,
                 Rule::OsMakedirs,
                 Rule::OsRename,
                 Rule::OsReplace,
+                Rule::OsRmdir,
+                Rule::OsRemove,
+                Rule::OsUnlink,
                 Rule::OsGetcwd,
+                Rule::OsPathExists,
+                Rule::OsPathExpanduser,
+                Rule::OsPathIsdir,
+                Rule::OsPathIsfile,
+                Rule::OsPathIslink,
+                Rule::OsReadlink,
                 Rule::OsStat,
+                Rule::OsPathIsabs,
                 Rule::OsPathJoin,
+                Rule::OsPathBasename,
+                Rule::OsPathDirname,
                 Rule::OsPathSamefile,
                 Rule::OsPathSplitext,
                 Rule::BuiltinOpen,
                 Rule::PyPath,
+                Rule::OsPathGetatime,
+                Rule::OsPathGetmtime,
+                Rule::OsPathGetctime,
                 Rule::Glob,
                 Rule::OsListdir,
                 Rule::OsSymlink,
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
             }
-            if let Some(qualified_name) = checker.semantic().resolve_qualified_name(&call.func) {
-                let segments = qualified_name.segments();
-                if checker.is_rule_enabled(Rule::OsPathGetsize) {
-                    flake8_use_pathlib::rules::os_path_getsize(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathGetatime) {
-                    flake8_use_pathlib::rules::os_path_getatime(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathGetctime) {
-                    flake8_use_pathlib::rules::os_path_getctime(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathGetmtime) {
-                    flake8_use_pathlib::rules::os_path_getmtime(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathAbspath) {
-                    flake8_use_pathlib::rules::os_path_abspath(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsRmdir) {
-                    flake8_use_pathlib::rules::os_rmdir(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsRemove) {
-                    flake8_use_pathlib::rules::os_remove(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsUnlink) {
-                    flake8_use_pathlib::rules::os_unlink(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathExists) {
-                    flake8_use_pathlib::rules::os_path_exists(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathExpanduser) {
-                    flake8_use_pathlib::rules::os_path_expanduser(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathBasename) {
-                    flake8_use_pathlib::rules::os_path_basename(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathDirname) {
-                    flake8_use_pathlib::rules::os_path_dirname(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathIsabs) {
-                    flake8_use_pathlib::rules::os_path_isabs(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathIsdir) {
-                    flake8_use_pathlib::rules::os_path_isdir(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathIsfile) {
-                    flake8_use_pathlib::rules::os_path_isfile(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsPathIslink) {
-                    flake8_use_pathlib::rules::os_path_islink(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsReadlink) {
-                    flake8_use_pathlib::rules::os_readlink(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
-                    flake8_use_pathlib::rules::path_constructor_current_directory(
-                        checker, call, segments,
-                    );
-                }
+            if checker.is_rule_enabled(Rule::OsPathGetsize) {
+                flake8_use_pathlib::rules::os_path_getsize(checker, call);
+            }
+            if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
+                flake8_use_pathlib::rules::path_constructor_current_directory(checker, call);
             }
-
             if checker.is_rule_enabled(Rule::OsSepSplit) {
                 flake8_use_pathlib::rules::os_sep_split(checker, call);
             }
@@ -1270,11 +1230,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::NonOctalPermissions) {
                 ruff::rules::non_octal_permissions(checker, call);
             }
-            if checker.is_rule_enabled(Rule::AssertRaisesException)
-                && is_assert_raises_exception_call_enabled(checker.settings())
-            {
-                flake8_bugbear::rules::assert_raises_exception_call(checker, call);
-            }
         }
         Expr::Dict(dict) => {
             if checker.any_rule_enabled(&[

crates/ruff_linter/src/checkers/ast/analyze/statement.rs

@@ -207,6 +207,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 Rule::UnnecessaryReturnNone,
                 Rule::ImplicitReturnValue,
                 Rule::ImplicitReturn,
+                Rule::UnnecessaryAssign,
                 Rule::SuperfluousElseReturn,
                 Rule::SuperfluousElseRaise,
                 Rule::SuperfluousElseContinue,

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -64,6 +64,7 @@ use ruff_text_size::{Ranged, TextRange, TextSize};
 use crate::checkers::ast::annotation::AnnotationContext;
 use crate::docstrings::extraction::ExtractionTarget;
 use crate::importer::{ImportRequest, Importer, ResolutionError};
+use crate::message::diagnostic_from_violation;
 use crate::noqa::NoqaMapping;
 use crate::package::PackageRoot;
 use crate::preview::is_undefined_export_in_dunder_init_enabled;
@@ -3157,7 +3158,7 @@ impl<'a> LintContext<'a> {
     ) -> DiagnosticGuard<'chk, 'a> {
         DiagnosticGuard {
             context: self,
-            diagnostic: Some(kind.into_diagnostic(range, &self.source_file)),
+            diagnostic: Some(diagnostic_from_violation(kind, range, &self.source_file)),
             rule: T::rule(),
         }
     }
@@ -3176,7 +3177,7 @@ impl<'a> LintContext<'a> {
         if self.is_rule_enabled(rule) {
             Some(DiagnosticGuard {
                 context: self,
-                diagnostic: Some(kind.into_diagnostic(range, &self.source_file)),
+                diagnostic: Some(diagnostic_from_violation(kind, range, &self.source_file)),
                 rule,
             })
         } else {

crates/ruff_linter/src/codes.rs

@@ -919,27 +919,27 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Tryceratops, "401") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseLogMessage),
 
         // flake8-use-pathlib
-        (Flake8UsePathlib, "100") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathAbspath),
+        (Flake8UsePathlib, "100") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathAbspath),
         (Flake8UsePathlib, "101") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsChmod),
         (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMkdir),
         (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMakedirs),
         (Flake8UsePathlib, "104") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsRename),
         (Flake8UsePathlib, "105") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsReplace),
-        (Flake8UsePathlib, "106") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRmdir),
-        (Flake8UsePathlib, "107") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRemove),
-        (Flake8UsePathlib, "108") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsUnlink),
+        (Flake8UsePathlib, "106") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsRmdir),
+        (Flake8UsePathlib, "107") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsRemove),
+        (Flake8UsePathlib, "108") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsUnlink),
         (Flake8UsePathlib, "109") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsGetcwd),
-        (Flake8UsePathlib, "110") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathExists),
-        (Flake8UsePathlib, "111") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathExpanduser),
-        (Flake8UsePathlib, "112") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsdir),
-        (Flake8UsePathlib, "113") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsfile),
-        (Flake8UsePathlib, "114") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIslink),
-        (Flake8UsePathlib, "115") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsReadlink),
+        (Flake8UsePathlib, "110") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathExists),
+        (Flake8UsePathlib, "111") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathExpanduser),
+        (Flake8UsePathlib, "112") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathIsdir),
+        (Flake8UsePathlib, "113") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathIsfile),
+        (Flake8UsePathlib, "114") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathIslink),
+        (Flake8UsePathlib, "115") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsReadlink),
         (Flake8UsePathlib, "116") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsStat),
-        (Flake8UsePathlib, "117") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathIsabs),
+        (Flake8UsePathlib, "117") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathIsabs),
         (Flake8UsePathlib, "118") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathJoin),
-        (Flake8UsePathlib, "119") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathBasename),
-        (Flake8UsePathlib, "120") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathDirname),
+        (Flake8UsePathlib, "119") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathBasename),
+        (Flake8UsePathlib, "120") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathDirname),
         (Flake8UsePathlib, "121") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathSamefile),
         (Flake8UsePathlib, "122") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsPathSplitext),
         (Flake8UsePathlib, "123") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::BuiltinOpen),

crates/ruff_linter/src/fix/edits.rs

@@ -618,7 +618,8 @@ mod tests {
     use crate::fix::edits::{
         add_to_dunder_all, make_redundant_alias, next_stmt_break, trailing_semicolon,
     };
-    use crate::{Edit, Fix, Locator, Violation};
+    use crate::message::diagnostic_from_violation;
+    use crate::{Edit, Fix, Locator};
 
     /// Parse the given source using [`Mode::Module`] and return the first statement.
     fn parse_first_stmt(source: &str) -> Result<Stmt> {
@@ -749,8 +750,8 @@ x = 1 \
         let diag = {
             use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
             let mut iter = edits.into_iter();
-            // The choice of rule here is arbitrary.
-            let mut diagnostic = MissingNewlineAtEndOfFile.into_diagnostic(
+            let mut diagnostic = diagnostic_from_violation(
+                MissingNewlineAtEndOfFile, // The choice of rule here is arbitrary.
                 TextRange::default(),
                 &SourceFileBuilder::new("<filename>", "<code>").finish(),
             );

crates/ruff_linter/src/fix/mod.rs

@@ -172,10 +172,11 @@ mod tests {
     use ruff_source_file::SourceFileBuilder;
     use ruff_text_size::{Ranged, TextSize};
 
+    use crate::Locator;
     use crate::fix::{FixResult, apply_fixes};
+    use crate::message::diagnostic_from_violation;
     use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
     use crate::{Edit, Fix};
-    use crate::{Locator, Violation};
     use ruff_db::diagnostic::Diagnostic;
 
     fn create_diagnostics(
@@ -186,7 +187,8 @@ mod tests {
         edit.into_iter()
             .map(|edit| {
                 // The choice of rule here is arbitrary.
-                let mut diagnostic = MissingNewlineAtEndOfFile.into_diagnostic(
+                let mut diagnostic = diagnostic_from_violation(
+                    MissingNewlineAtEndOfFile,
                     edit.range(),
                     &SourceFileBuilder::new(filename, source).finish(),
                 );

crates/ruff_linter/src/importer/insertion.rs

@@ -5,7 +5,6 @@ use ruff_python_ast::Stmt;
 use ruff_python_ast::helpers::is_docstring_stmt;
 use ruff_python_codegen::Stylist;
 use ruff_python_parser::{TokenKind, Tokens};
-use ruff_python_trivia::is_python_whitespace;
 use ruff_python_trivia::{PythonWhitespace, textwrap::indent};
 use ruff_source_file::{LineRanges, UniversalNewlineIterator};
 use ruff_text_size::{Ranged, TextSize};
@@ -307,7 +306,7 @@ fn match_semicolon(s: &str) -> Option<TextSize> {
 fn match_continuation(s: &str) -> Option<TextSize> {
     for (offset, c) in s.char_indices() {
         match c {
-            _ if is_python_whitespace(c) => continue,
+            ' ' | '\t' => continue,
             '\\' => return Some(TextSize::try_from(offset).unwrap()),
             _ => break,
         }

crates/ruff_linter/src/linter.rs

@@ -514,7 +514,7 @@ pub fn lint_only(
 
     LinterResult {
         has_valid_syntax: parsed.has_valid_syntax(),
-        has_no_syntax_errors: !diagnostics.iter().any(Diagnostic::is_invalid_syntax),
+        has_no_syntax_errors: !diagnostics.iter().any(Diagnostic::is_syntax_error),
         diagnostics,
     }
 }
@@ -629,7 +629,7 @@ pub fn lint_fix<'a>(
 
         if iterations == 0 {
             has_valid_syntax = parsed.has_valid_syntax();
-            has_no_syntax_errors = !diagnostics.iter().any(Diagnostic::is_invalid_syntax);
+            has_no_syntax_errors = !diagnostics.iter().any(Diagnostic::is_syntax_error);
         } else {
             // If the source code had no syntax errors on the first pass, but
             // does on a subsequent pass, then we've introduced a

crates/ruff_linter/src/message/mod.rs

@@ -24,6 +24,7 @@ pub use sarif::SarifEmitter;
 pub use text::TextEmitter;
 
 use crate::Fix;
+use crate::Violation;
 use crate::registry::Rule;
 
 mod azure;
@@ -107,6 +108,28 @@ where
     diagnostic
 }
 
+// TODO(brent) We temporarily allow this to avoid updating all of the call sites to add
+// references. I expect this method to go away or change significantly with the rest of the
+// diagnostic refactor, but if it still exists in this form at the end of the refactor, we
+// should just update the call sites.
+#[expect(clippy::needless_pass_by_value)]
+pub fn diagnostic_from_violation<T: Violation>(
+    kind: T,
+    range: TextRange,
+    file: &SourceFile,
+) -> Diagnostic {
+    create_lint_diagnostic(
+        Violation::message(&kind),
+        Violation::fix_title(&kind),
+        range,
+        None,
+        None,
+        file.clone(),
+        None,
+        T::rule(),
+    )
+}
+
 struct MessageWithLocation<'a> {
     message: &'a Diagnostic,
     start_location: LineColumn,

crates/ruff_linter/src/noqa.rs

@@ -1225,6 +1225,8 @@ mod tests {
     use ruff_source_file::{LineEnding, SourceFileBuilder};
     use ruff_text_size::{TextLen, TextRange, TextSize};
 
+    use crate::Edit;
+    use crate::message::diagnostic_from_violation;
     use crate::noqa::{
         Directive, LexicalError, NoqaLexerOutput, NoqaMapping, add_noqa_inner, lex_codes,
         lex_file_exemption, lex_inline_noqa,
@@ -1232,7 +1234,6 @@ mod tests {
     use crate::rules::pycodestyle::rules::{AmbiguousVariableName, UselessSemicolon};
     use crate::rules::pyflakes::rules::UnusedVariable;
     use crate::rules::pyupgrade::rules::PrintfStringFormatting;
-    use crate::{Edit, Violation};
     use crate::{Locator, generate_noqa_edits};
 
     fn assert_lexed_ranges_match_slices(
@@ -2831,10 +2832,10 @@ mod tests {
         assert_eq!(output, format!("{contents}"));
 
         let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
-        let messages = [UnusedVariable {
-            name: "x".to_string(),
-        }
-        .into_diagnostic(
+        let messages = [diagnostic_from_violation(
+            UnusedVariable {
+                name: "x".to_string(),
+            },
             TextRange::new(TextSize::from(0), TextSize::from(0)),
             &source_file,
         )];
@@ -2855,14 +2856,15 @@ mod tests {
 
         let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
         let messages = [
-            AmbiguousVariableName("x".to_string()).into_diagnostic(
+            diagnostic_from_violation(
+                AmbiguousVariableName("x".to_string()),
                 TextRange::new(TextSize::from(0), TextSize::from(0)),
                 &source_file,
             ),
-            UnusedVariable {
-                name: "x".to_string(),
-            }
-            .into_diagnostic(
+            diagnostic_from_violation(
+                UnusedVariable {
+                    name: "x".to_string(),
+                },
                 TextRange::new(TextSize::from(0), TextSize::from(0)),
                 &source_file,
             ),
@@ -2885,14 +2887,15 @@ mod tests {
 
         let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
         let messages = [
-            AmbiguousVariableName("x".to_string()).into_diagnostic(
+            diagnostic_from_violation(
+                AmbiguousVariableName("x".to_string()),
                 TextRange::new(TextSize::from(0), TextSize::from(0)),
                 &source_file,
             ),
-            UnusedVariable {
-                name: "x".to_string(),
-            }
-            .into_diagnostic(
+            diagnostic_from_violation(
+                UnusedVariable {
+                    name: "x".to_string(),
+                },
                 TextRange::new(TextSize::from(0), TextSize::from(0)),
                 &source_file,
             ),
@@ -2928,8 +2931,11 @@ print(
 "#;
         let noqa_line_for = [TextRange::new(8.into(), 68.into())].into_iter().collect();
         let source_file = SourceFileBuilder::new(path.to_string_lossy(), source).finish();
-        let messages = [PrintfStringFormatting
-            .into_diagnostic(TextRange::new(12.into(), 79.into()), &source_file)];
+        let messages = [diagnostic_from_violation(
+            PrintfStringFormatting,
+            TextRange::new(12.into(), 79.into()),
+            &source_file,
+        )];
         let comment_ranges = CommentRanges::default();
         let edits = generate_noqa_edits(
             path,
@@ -2958,8 +2964,11 @@ foo;
 bar =
 ";
         let source_file = SourceFileBuilder::new(path.to_string_lossy(), source).finish();
-        let messages =
-            [UselessSemicolon.into_diagnostic(TextRange::new(4.into(), 5.into()), &source_file)];
+        let messages = [diagnostic_from_violation(
+            UselessSemicolon,
+            TextRange::new(4.into(), 5.into()),
+            &source_file,
+        )];
         let noqa_line_for = NoqaMapping::default();
         let comment_ranges = CommentRanges::default();
         let edits = generate_noqa_edits(

crates/ruff_linter/src/preview.rs

@@ -54,85 +54,6 @@ pub(crate) const fn is_fix_manual_list_comprehension_enabled(settings: &LinterSe
 pub(crate) const fn is_fix_os_path_getsize_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
-// https://github.com/astral-sh/ruff/pull/18922
-pub(crate) const fn is_fix_os_path_getmtime_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/18922
-pub(crate) const fn is_fix_os_path_getatime_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/18922
-pub(crate) const fn is_fix_os_path_getctime_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_abspath_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_rmdir_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_unlink_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_remove_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_exists_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_expanduser_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_isdir_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_isfile_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_islink_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_isabs_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_readlink_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_basename_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19213
-pub(crate) const fn is_fix_os_path_dirname_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
 
 // https://github.com/astral-sh/ruff/pull/11436
 // https://github.com/astral-sh/ruff/pull/11168
@@ -190,8 +111,3 @@ pub(crate) const fn is_safe_super_call_with_parameters_fix_enabled(
 ) -> bool {
     settings.preview.is_enabled()
 }
-
-// https://github.com/astral-sh/ruff/pull/19063
-pub(crate) const fn is_assert_raises_exception_call_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}

crates/ruff_linter/src/pyproject_toml.rs

@@ -6,10 +6,11 @@ use ruff_text_size::{TextRange, TextSize};
 use ruff_db::diagnostic::Diagnostic;
 use ruff_source_file::SourceFile;
 
+use crate::IOError;
+use crate::message::diagnostic_from_violation;
 use crate::registry::Rule;
 use crate::rules::ruff::rules::InvalidPyprojectToml;
 use crate::settings::LinterSettings;
-use crate::{IOError, Violation};
 
 /// RUF200
 pub fn lint_pyproject_toml(source_file: &SourceFile, settings: &LinterSettings) -> Vec<Diagnostic> {
@@ -29,8 +30,11 @@ pub fn lint_pyproject_toml(source_file: &SourceFile, settings: &LinterSettings)
                     source_file.name(),
                 );
                 if settings.rules.enabled(Rule::IOError) {
-                    let diagnostic =
-                        IOError { message }.into_diagnostic(TextRange::default(), source_file);
+                    let diagnostic = diagnostic_from_violation(
+                        IOError { message },
+                        TextRange::default(),
+                        source_file,
+                    );
                     messages.push(diagnostic);
                 } else {
                     warn!(
@@ -52,8 +56,11 @@ pub fn lint_pyproject_toml(source_file: &SourceFile, settings: &LinterSettings)
 
     if settings.rules.enabled(Rule::InvalidPyprojectToml) {
         let toml_err = err.message().to_string();
-        let diagnostic =
-            InvalidPyprojectToml { message: toml_err }.into_diagnostic(range, source_file);
+        let diagnostic = diagnostic_from_violation(
+            InvalidPyprojectToml { message: toml_err },
+            range,
+            source_file,
+        );
         messages.push(diagnostic);
     }
 

crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_imports.rs

@@ -283,7 +283,7 @@ impl Violation for SuspiciousXmlrpcImport {
 ///
 /// ## Example
 /// ```python
-/// from wsgiref.handlers import CGIHandler
+/// import wsgiref.handlers.CGIHandler
 /// ```
 ///
 /// ## References

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S112_S112.py.snap

@@ -1,46 +1,46 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
 ---
-S112.py:4:5: S112 `try`-`except`-`continue` detected, consider logging the exception
+S112.py:3:1: S112 `try`-`except`-`continue` detected, consider logging the exception
   |
-2 |       try:
-3 |           pass
-4 | /     except Exception:
-5 | |         continue
-  | |________________^ S112
-6 |
-7 |       try:
+1 |   try:
+2 |       pass
+3 | / except Exception:
+4 | |     continue
+  | |____________^ S112
+5 |
+6 |   try:
   |
 
-S112.py:9:5: S112 `try`-`except`-`continue` detected, consider logging the exception
+S112.py:8:1: S112 `try`-`except`-`continue` detected, consider logging the exception
    |
- 7 |       try:
- 8 |           pass
- 9 | /     except:
-10 | |         continue
-   | |________________^ S112
-11 |
-12 |       try:
+ 6 |   try:
+ 7 |       pass
+ 8 | / except:
+ 9 | |     continue
+   | |____________^ S112
+10 |
+11 |   try:
    |
 
-S112.py:14:5: S112 `try`-`except`-`continue` detected, consider logging the exception
+S112.py:13:1: S112 `try`-`except`-`continue` detected, consider logging the exception
    |
-12 |       try:
-13 |           pass
-14 | /     except (Exception,):
-15 | |         continue
-   | |________________^ S112
-16 |
-17 |       try:
+11 |   try:
+12 |       pass
+13 | / except (Exception,):
+14 | |     continue
+   | |____________^ S112
+15 |
+16 |   try:
    |
 
-S112.py:19:5: S112 `try`-`except`-`continue` detected, consider logging the exception
+S112.py:18:1: S112 `try`-`except`-`continue` detected, consider logging the exception
    |
-17 |       try:
-18 |           pass
-19 | /     except (Exception, ValueError):
-20 | |         continue
-   | |________________^ S112
-21 |
-22 |       try:
+16 |   try:
+17 |       pass
+18 | / except (Exception, ValueError):
+19 | |     continue
+   | |____________^ S112
+20 |
+21 |   try:
    |

crates/ruff_linter/src/rules/flake8_bugbear/mod.rs

@@ -16,14 +16,11 @@ mod tests {
     use crate::settings::LinterSettings;
     use crate::test::test_path;
 
-    use crate::settings::types::PreviewMode;
-
     use ruff_python_ast::PythonVersion;
 
     #[test_case(Rule::AbstractBaseClassWithoutAbstractMethod, Path::new("B024.py"))]
     #[test_case(Rule::AssertFalse, Path::new("B011.py"))]
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_0.py"))]
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_1.py"))]
+    #[test_case(Rule::AssertRaisesException, Path::new("B017.py"))]
     #[test_case(Rule::AssignmentToOsEnviron, Path::new("B003.py"))]
     #[test_case(Rule::CachedInstanceMethod, Path::new("B019.py"))]
     #[test_case(Rule::ClassAsDataStructure, Path::new("class_as_data_structure.py"))]
@@ -177,23 +174,4 @@ mod tests {
         assert_diagnostics!(snapshot, diagnostics);
         Ok(())
     }
-
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_0.py"))]
-    #[test_case(Rule::AssertRaisesException, Path::new("B017_1.py"))]
-    fn rules_preview(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_bugbear").join(path).as_path(),
-            &LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
 }

crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, Arguments, Expr, WithItem};
+use ruff_python_ast::{self as ast, Expr, WithItem};
 use ruff_text_size::Ranged;
 
 use crate::Violation;
@@ -56,48 +56,6 @@ impl fmt::Display for ExceptionKind {
     }
 }
 
-fn detect_blind_exception(
-    semantic: &ruff_python_semantic::SemanticModel<'_>,
-    func: &Expr,
-    arguments: &Arguments,
-) -> Option<ExceptionKind> {
-    let is_assert_raises = matches!(
-        func,
-        &Expr::Attribute(ast::ExprAttribute { ref attr, .. }) if attr.as_str() == "assertRaises"
-    );
-
-    let is_pytest_raises = semantic
-        .resolve_qualified_name(func)
-        .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["pytest", "raises"]));
-
-    if !(is_assert_raises || is_pytest_raises) {
-        return None;
-    }
-
-    if is_pytest_raises {
-        if arguments.find_keyword("match").is_some() {
-            return None;
-        }
-
-        if arguments
-            .find_positional(1)
-            .is_some_and(|arg| matches!(arg, Expr::StringLiteral(_) | Expr::BytesLiteral(_)))
-        {
-            return None;
-        }
-    }
-
-    let first_arg = arguments.args.first()?;
-
-    let builtin_symbol = semantic.resolve_builtin_symbol(first_arg)?;
-
-    match builtin_symbol {
-        "Exception" => Some(ExceptionKind::Exception),
-        "BaseException" => Some(ExceptionKind::BaseException),
-        _ => None,
-    }
-}
-
 /// B017
 pub(crate) fn assert_raises_exception(checker: &Checker, items: &[WithItem]) {
     for item in items {
@@ -115,31 +73,33 @@ pub(crate) fn assert_raises_exception(checker: &Checker, items: &[WithItem]) {
             continue;
         }
 
-        if let Some(exception) =
-            detect_blind_exception(checker.semantic(), func.as_ref(), arguments)
+        let [arg] = &*arguments.args else {
+            continue;
+        };
+
+        let semantic = checker.semantic();
+
+        let Some(builtin_symbol) = semantic.resolve_builtin_symbol(arg) else {
+            continue;
+        };
+
+        let exception = match builtin_symbol {
+            "Exception" => ExceptionKind::Exception,
+            "BaseException" => ExceptionKind::BaseException,
+            _ => continue,
+        };
+
+        if !(matches!(func.as_ref(), Expr::Attribute(ast::ExprAttribute { attr, .. }) if attr == "assertRaises")
+            || semantic
+                .resolve_qualified_name(func)
+                .is_some_and(|qualified_name| {
+                    matches!(qualified_name.segments(), ["pytest", "raises"])
+                })
+                && arguments.find_keyword("match").is_none())
         {
-            checker.report_diagnostic(AssertRaisesException { exception }, item.range());
+            continue;
         }
-    }
-}
-
-/// B017 (call form)
-pub(crate) fn assert_raises_exception_call(
-    checker: &Checker,
-    ast::ExprCall {
-        func,
-        arguments,
-        range,
-        node_index: _,
-    }: &ast::ExprCall,
-) {
-    let semantic = checker.semantic();
-
-    if arguments.args.len() < 2 && arguments.find_argument("func", 1).is_none() {
-        return;
-    }
-
-    if let Some(exception) = detect_blind_exception(semantic, func.as_ref(), arguments) {
-        checker.report_diagnostic(AssertRaisesException { exception }, *range);
+
+        checker.report_diagnostic(AssertRaisesException { exception }, item.range());
     }
 }

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B017_0.py:23:14: B017 Do not assert blind exception: `Exception`
+B017.py:23:14: B017 Do not assert blind exception: `Exception`
    |
 21 | class Foobar(unittest.TestCase):
 22 |     def evil_raises(self) -> None:
@@ -10,7 +10,7 @@ B017_0.py:23:14: B017 Do not assert blind exception: `Exception`
 24 |             raise Exception("Evil I say!")
    |
 
-B017_0.py:27:14: B017 Do not assert blind exception: `BaseException`
+B017.py:27:14: B017 Do not assert blind exception: `BaseException`
    |
 26 |     def also_evil_raises(self) -> None:
 27 |         with self.assertRaises(BaseException):
@@ -18,7 +18,7 @@ B017_0.py:27:14: B017 Do not assert blind exception: `BaseException`
 28 |             raise Exception("Evil I say!")
    |
 
-B017_0.py:45:10: B017 Do not assert blind exception: `Exception`
+B017.py:45:10: B017 Do not assert blind exception: `Exception`
    |
 44 | def test_pytest_raises():
 45 |     with pytest.raises(Exception):
@@ -26,7 +26,7 @@ B017_0.py:45:10: B017 Do not assert blind exception: `Exception`
 46 |         raise ValueError("Hello")
    |
 
-B017_0.py:48:10: B017 Do not assert blind exception: `Exception`
+B017.py:48:10: B017 Do not assert blind exception: `Exception`
    |
 46 |         raise ValueError("Hello")
 47 |
@@ -35,7 +35,7 @@ B017_0.py:48:10: B017 Do not assert blind exception: `Exception`
 49 |         raise ValueError("Hello")
    |
 
-B017_0.py:57:36: B017 Do not assert blind exception: `Exception`
+B017.py:57:36: B017 Do not assert blind exception: `Exception`
    |
 55 |         raise ValueError("This is also fine")
 56 |

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B017_B017_1.py.snap

@@ -1,4 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B031_B031.py.snap

@@ -195,31 +195,31 @@ B031.py:144:33: B031 Using the generator returned from `itertools.groupby()` mor
 146 | for group in groupby(items, key=lambda p: p[1]):
     |
 
-B031.py:203:41: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
+B031.py:200:37: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
     |
-201 |         if _section == "greens":
-202 |             collect_shop_items(shopper, section_items)
-203 |             collect_shop_items(shopper, section_items)
-    |                                         ^^^^^^^^^^^^^ B031
-204 |             return
-    |
-
-B031.py:215:41: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
-    |
-213 |         elif _section == "frozen items":
-214 |             collect_shop_items(shopper, section_items)
-215 |             collect_shop_items(shopper, section_items)
-    |                                         ^^^^^^^^^^^^^ B031
-216 |
-217 | # Should trigger, since only one branch has a return statement.
-    |
-
-B031.py:226:37: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
-    |
-224 |         elif _section == "frozen items":
-225 |             collect_shop_items(shopper, section_items)
-226 |         collect_shop_items(shopper, section_items)  # B031
+198 |     if _section == "greens":
+199 |         collect_shop_items(shopper, section_items)
+200 |         collect_shop_items(shopper, section_items)
     |                                     ^^^^^^^^^^^^^ B031
-227 |
-228 | # Let's redefine the `groupby` function to make sure we pick up the correct one.
+201 |         return
+    |
+
+B031.py:210:37: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
+    |
+208 |     elif _section == "frozen items":
+209 |         collect_shop_items(shopper, section_items)
+210 |         collect_shop_items(shopper, section_items)
+    |                                     ^^^^^^^^^^^^^ B031
+211 |
+212 | # Should trigger, since only one branch has a return statement.
+    |
+
+B031.py:219:33: B031 Using the generator returned from `itertools.groupby()` more than once will do nothing on the second usage
+    |
+217 |     elif _section == "frozen items":
+218 |         collect_shop_items(shopper, section_items)
+219 |     collect_shop_items(shopper, section_items)  # B031
+    |                                 ^^^^^^^^^^^^^ B031
+220 |
+221 | # Let's redefine the `groupby` function to make sure we pick up the correct one.
     |

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_0.py.snap

@@ -1,45 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-B017_0.py:23:14: B017 Do not assert blind exception: `Exception`
-   |
-21 | class Foobar(unittest.TestCase):
-22 |     def evil_raises(self) -> None:
-23 |         with self.assertRaises(Exception):
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-24 |             raise Exception("Evil I say!")
-   |
-
-B017_0.py:27:14: B017 Do not assert blind exception: `BaseException`
-   |
-26 |     def also_evil_raises(self) -> None:
-27 |         with self.assertRaises(BaseException):
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-28 |             raise Exception("Evil I say!")
-   |
-
-B017_0.py:45:10: B017 Do not assert blind exception: `Exception`
-   |
-44 | def test_pytest_raises():
-45 |     with pytest.raises(Exception):
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^ B017
-46 |         raise ValueError("Hello")
-   |
-
-B017_0.py:48:10: B017 Do not assert blind exception: `Exception`
-   |
-46 |         raise ValueError("Hello")
-47 |
-48 |     with pytest.raises(Exception), pytest.raises(ValueError):
-   |          ^^^^^^^^^^^^^^^^^^^^^^^^ B017
-49 |         raise ValueError("Hello")
-   |
-
-B017_0.py:57:36: B017 Do not assert blind exception: `Exception`
-   |
-55 |         raise ValueError("This is also fine")
-56 |
-57 |     with contextlib.nullcontext(), pytest.raises(Exception):
-   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^ B017
-58 |         raise ValueError("Multiple context managers")
-   |

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B017_B017_1.py.snap

@@ -1,37 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-B017_1.py:20:9: B017 Do not assert blind exception: `Exception`
-   |
-18 | class Foobar(unittest.TestCase):
-19 |     def call_form_raises(self) -> None:
-20 |         self.assertRaises(Exception, something_else)
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-21 |         self.assertRaises(BaseException, something_else)
-   |
-
-B017_1.py:21:9: B017 Do not assert blind exception: `BaseException`
-   |
-19 |     def call_form_raises(self) -> None:
-20 |         self.assertRaises(Exception, something_else)
-21 |         self.assertRaises(BaseException, something_else)
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-   |
-
-B017_1.py:25:5: B017 Do not assert blind exception: `Exception`
-   |
-24 | def test_pytest_call_form() -> None:
-25 |     pytest.raises(Exception, something_else)
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-26 |     pytest.raises(BaseException, something_else)
-   |
-
-B017_1.py:26:5: B017 Do not assert blind exception: `BaseException`
-   |
-24 | def test_pytest_call_form() -> None:
-25 |     pytest.raises(Exception, something_else)
-26 |     pytest.raises(BaseException, something_else)
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
-27 |
-28 |     pytest.raises(Exception, something_else, match="hello")
-   |

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap

@@ -190,73 +190,72 @@ PIE804.py:26:22: PIE804 [*] Unnecessary `dict` kwargs
    26 |+abc(a=1, **{'a': c}, b=c)  # PIE804
 27 27 | 
 28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
+29 29 | abc(foo=1, **{'bar': (bar := 1)})  # PIE804
 
-PIE804.py:30:16: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:29:12: PIE804 [*] Unnecessary `dict` kwargs
    |
 28 | # Some values need to be parenthesized.
-29 | def foo():
-30 |     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-   |                ^^^^^^^^^^^^^^^^^^^^^ PIE804
-31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
+29 | abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+   |            ^^^^^^^^^^^^^^^^^^^^^ PIE804
+30 | abc(foo=1, **{'bar': (yield 1)})  # PIE804
+   |
+   = help: Remove unnecessary kwargs
+
+ℹ Safe fix
+26 26 | abc(a=1, **{'a': c}, **{'b': c})  # PIE804
+27 27 | 
+28 28 | # Some values need to be parenthesized.
+29    |-abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+   29 |+abc(foo=1, bar=(bar := 1))  # PIE804
+30 30 | abc(foo=1, **{'bar': (yield 1)})  # PIE804
+31 31 | 
+32 32 | # https://github.com/astral-sh/ruff/issues/18036
+
+PIE804.py:30:12: PIE804 [*] Unnecessary `dict` kwargs
+   |
+28 | # Some values need to be parenthesized.
+29 | abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+30 | abc(foo=1, **{'bar': (yield 1)})  # PIE804
+   |            ^^^^^^^^^^^^^^^^^^^^ PIE804
+31 |
+32 | # https://github.com/astral-sh/ruff/issues/18036
    |
    = help: Remove unnecessary kwargs
 
 ℹ Safe fix
 27 27 | 
 28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
-30    |-    abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-   30 |+    abc(foo=1, bar=(bar := 1))  # PIE804
-31 31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
-32 32 | 
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
+29 29 | abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+30    |-abc(foo=1, **{'bar': (yield 1)})  # PIE804
+   30 |+abc(foo=1, bar=(yield 1))  # PIE804
+31 31 | 
+32 32 | # https://github.com/astral-sh/ruff/issues/18036
+33 33 | # The autofix for this is unsafe due to the comments inside the dictionary.
 
-PIE804.py:31:16: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:35:5: PIE804 [*] Unnecessary `dict` kwargs
    |
-29 | def foo():
-30 |     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-31 |     abc(foo=1, **{'bar': (yield 1)})  # PIE804
-   |                ^^^^^^^^^^^^^^^^^^^^ PIE804
-32 |
-33 | # https://github.com/astral-sh/ruff/issues/18036
-   |
-   = help: Remove unnecessary kwargs
-
-ℹ Safe fix
-28 28 | # Some values need to be parenthesized.
-29 29 | def foo():
-30 30 |     abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-31    |-    abc(foo=1, **{'bar': (yield 1)})  # PIE804
-   31 |+    abc(foo=1, bar=(yield 1))  # PIE804
-32 32 | 
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
-34 34 | # The autofix for this is unsafe due to the comments inside the dictionary.
-
-PIE804.py:36:5: PIE804 [*] Unnecessary `dict` kwargs
-   |
-34 |   # The autofix for this is unsafe due to the comments inside the dictionary.
-35 |   foo(
-36 | /     **{
-37 | |         # Comment 1
-38 | |         "x": 1.0,
-39 | |         # Comment 2
-40 | |         "y": 2.0,
-41 | |     }
+33 |   # The autofix for this is unsafe due to the comments inside the dictionary.
+34 |   foo(
+35 | /     **{
+36 | |         # Comment 1
+37 | |         "x": 1.0,
+38 | |         # Comment 2
+39 | |         "y": 2.0,
+40 | |     }
    | |_____^ PIE804
-42 |   )
+41 |   )
    |
    = help: Remove unnecessary kwargs
 
 ℹ Unsafe fix
-33 33 | # https://github.com/astral-sh/ruff/issues/18036
-34 34 | # The autofix for this is unsafe due to the comments inside the dictionary.
-35 35 | foo(
-36    |-    **{
-37    |-        # Comment 1
-38    |-        "x": 1.0,
-39    |-        # Comment 2
-40    |-        "y": 2.0,
-41    |-    }
-   36 |+    x=1.0, y=2.0
-42 37 | )
+32 32 | # https://github.com/astral-sh/ruff/issues/18036
+33 33 | # The autofix for this is unsafe due to the comments inside the dictionary.
+34 34 | foo(
+35    |-    **{
+36    |-        # Comment 1
+37    |-        "x": 1.0,
+38    |-        # Comment 2
+39    |-        "y": 2.0,
+40    |-    }
+   35 |+    x=1.0, y=2.0
+41 36 | )

crates/ruff_linter/src/rules/flake8_pyi/rules/unrecognized_platform.rs

@@ -21,9 +21,7 @@ use crate::registry::Rule;
 ///
 /// ## Example
 /// ```pyi
-/// import sys
-///
-/// if sys.platform == "xunil"[::-1]:
+/// if sys.platform.startswith("linux"):
 ///     # Linux specific definitions
 ///     ...
 /// else:
@@ -33,8 +31,6 @@ use crate::registry::Rule;
 ///
 /// Instead, use a simple string comparison, such as `==` or `!=`:
 /// ```pyi
-/// import sys
-///
 /// if sys.platform == "linux":
 ///     # Linux specific definitions
 ///     ...
@@ -69,15 +65,11 @@ impl Violation for UnrecognizedPlatformCheck {
 ///
 /// ## Example
 /// ```pyi
-/// import sys
-///
 /// if sys.platform == "linus": ...
 /// ```
 ///
 /// Use instead:
 /// ```pyi
-/// import sys
-///
 /// if sys.platform == "linux": ...
 /// ```
 ///

crates/ruff_linter/src/rules/flake8_return/rules/function.rs

@@ -539,21 +539,7 @@ fn implicit_return(checker: &Checker, function_def: &ast::StmtFunctionDef, stmt:
 }
 
 /// RET504
-pub(crate) fn unnecessary_assign(checker: &Checker, function_stmt: &Stmt) {
-    let Stmt::FunctionDef(function_def) = function_stmt else {
-        return;
-    };
-    let Some(stack) = create_stack(checker, function_def) else {
-        return;
-    };
-
-    if !result_exists(&stack.returns) {
-        return;
-    }
-
-    let Some(function_scope) = checker.semantic().function_scope(function_def) else {
-        return;
-    };
+fn unnecessary_assign(checker: &Checker, stack: &Stack) {
     for (assign, return_, stmt) in &stack.assignment_return {
         // Identify, e.g., `return x`.
         let Some(value) = return_.value.as_ref() else {
@@ -597,22 +583,6 @@ pub(crate) fn unnecessary_assign(checker: &Checker, function_stmt: &Stmt) {
             continue;
         }
 
-        let Some(assigned_binding) = function_scope
-            .get(assigned_id)
-            .map(|binding_id| checker.semantic().binding(binding_id))
-        else {
-            continue;
-        };
-        // Check if there's any reference made to `assigned_binding` in another scope, e.g, nested
-        // functions. If there is, ignore them.
-        if assigned_binding
-            .references()
-            .map(|reference_id| checker.semantic().reference(reference_id))
-            .any(|reference| reference.scope_id() != assigned_binding.scope)
-        {
-            continue;
-        }
-
         let mut diagnostic = checker.report_diagnostic(
             UnnecessaryAssign {
                 name: assigned_id.to_string(),
@@ -695,21 +665,24 @@ fn superfluous_elif_else(checker: &Checker, stack: &Stack) {
     }
 }
 
-fn create_stack<'a>(
-    checker: &'a Checker,
-    function_def: &'a ast::StmtFunctionDef,
-) -> Option<Stack<'a>> {
-    let ast::StmtFunctionDef { body, .. } = function_def;
+/// Run all checks from the `flake8-return` plugin.
+pub(crate) fn function(checker: &Checker, function_def: &ast::StmtFunctionDef) {
+    let ast::StmtFunctionDef {
+        decorator_list,
+        returns,
+        body,
+        ..
+    } = function_def;
 
     // Find the last statement in the function.
     let Some(last_stmt) = body.last() else {
         // Skip empty functions.
-        return None;
+        return;
     };
 
     // Skip functions that consist of a single return statement.
     if body.len() == 1 && matches!(last_stmt, Stmt::Return(_)) {
-        return None;
+        return;
     }
 
     // Traverse the function body, to collect the stack.
@@ -723,29 +696,9 @@ fn create_stack<'a>(
 
     // Avoid false positives for generators.
     if stack.is_generator {
-        return None;
+        return;
     }
 
-    Some(stack)
-}
-
-/// Run all checks from the `flake8-return` plugin, but `RET504` which is ran
-/// after the semantic model is fully built.
-pub(crate) fn function(checker: &Checker, function_def: &ast::StmtFunctionDef) {
-    let ast::StmtFunctionDef {
-        decorator_list,
-        returns,
-        body,
-        ..
-    } = function_def;
-
-    let Some(stack) = create_stack(checker, function_def) else {
-        return;
-    };
-    let Some(last_stmt) = body.last() else {
-        return;
-    };
-
     if checker.any_rule_enabled(&[
         Rule::SuperfluousElseReturn,
         Rule::SuperfluousElseRaise,
@@ -768,6 +721,10 @@ pub(crate) fn function(checker: &Checker, function_def: &ast::StmtFunctionDef) {
         if checker.is_rule_enabled(Rule::ImplicitReturn) {
             implicit_return(checker, function_def, last_stmt);
         }
+
+        if checker.is_rule_enabled(Rule::UnnecessaryAssign) {
+            unnecessary_assign(checker, &stack);
+        }
     } else {
         if checker.is_rule_enabled(Rule::UnnecessaryReturnNone) {
             // Skip functions that have a return annotation that is not `None`.

crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap

@@ -247,6 +247,8 @@ RET504.py:423:16: RET504 [*] Unnecessary assignment to `services` before `return
 422 |         services = a["services"]
 423 |         return services
     |                ^^^^^^^^ RET504
+424 |
+425 | # See: https://github.com/astral-sh/ruff/issues/18411
     |
     = help: Remove unnecessary assignment
 
@@ -258,46 +260,46 @@ RET504.py:423:16: RET504 [*] Unnecessary assignment to `services` before `return
 423     |-        return services
     422 |+        return a["services"]
 424 423 | 
-425 424 | 
-426 425 | # See: https://github.com/astral-sh/ruff/issues/14052
+425 424 | # See: https://github.com/astral-sh/ruff/issues/18411
+426 425 | def f():
 
-RET504.py:458:12: RET504 [*] Unnecessary assignment to `x` before `return` statement
+RET504.py:429:12: RET504 [*] Unnecessary assignment to `x` before `return` statement
     |
-456 |     (#=
-457 |     x) = 1
-458 |     return x
+427 |     (#=
+428 |     x) = 1
+429 |     return x
     |            ^ RET504
-459 |
-460 | def f():
+430 |
+431 | def f():
     |
     = help: Remove unnecessary assignment
 
 ℹ Unsafe fix
-453 453 | 
-454 454 | # See: https://github.com/astral-sh/ruff/issues/18411
-455 455 | def f():
-456     |-    (#=
-457     |-    x) = 1
-458     |-    return x
-    456 |+    return 1
-459 457 | 
-460 458 | def f():
-461 459 |     x = (1
+424 424 | 
+425 425 | # See: https://github.com/astral-sh/ruff/issues/18411
+426 426 | def f():
+427     |-    (#=
+428     |-    x) = 1
+429     |-    return x
+    427 |+    return 1
+430 428 | 
+431 429 | def f():
+432 430 |     x = (1
 
-RET504.py:463:12: RET504 [*] Unnecessary assignment to `x` before `return` statement
+RET504.py:434:12: RET504 [*] Unnecessary assignment to `x` before `return` statement
     |
-461 |     x = (1
-462 |               )
-463 |     return x
+432 |     x = (1
+433 |               )
+434 |     return x
     |            ^ RET504
     |
     = help: Remove unnecessary assignment
 
 ℹ Unsafe fix
-458 458 |     return x
-459 459 | 
-460 460 | def f():
-461     |-    x = (1
-    461 |+    return (1
-462 462 |               )
-463     |-    return x
+429 429 |     return x
+430 430 | 
+431 431 | def f():
+432     |-    x = (1
+    432 |+    return (1
+433 433 |               )
+434     |-    return x

crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs

@@ -18,22 +18,17 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Example
 /// ```python
-/// def find_phrase(x):
-///     if x == 1:
-///         return "Hello"
-///     elif x == 2:
-///         return "Goodbye"
-///     elif x == 3:
-///         return "Good morning"
-///     else:
-///         return "Goodnight"
+/// if x == 1:
+///     return "Hello"
+/// elif x == 2:
+///     return "Goodbye"
+/// else:
+///     return "Goodnight"
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// def find_phrase(x):
-///     phrases = {1: "Hello", 2: "Goodye", 3: "Good morning"}
-///     return phrases.get(x, "Goodnight")
+/// return {1: "Hello", 2: "Goodbye"}.get(x, "Goodnight")
 /// ```
 #[derive(ViolationMetadata)]
 pub(crate) struct IfElseBlockInsteadOfDictLookup;

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM115_SIM115.py.snap

@@ -50,285 +50,285 @@ SIM115.py:12:5: SIM115 Use a context manager for opening files
 14 | f.close()
    |
 
-SIM115.py:40:9: SIM115 Use a context manager for opening files
+SIM115.py:39:9: SIM115 Use a context manager for opening files
    |
-38 | # SIM115
-39 | with contextlib.ExitStack():
-40 |     f = open("filename")
+37 | # SIM115
+38 | with contextlib.ExitStack():
+39 |     f = open("filename")
    |         ^^^^ SIM115
-41 |
-42 | # OK
+40 |
+41 | # OK
+   |
+
+SIM115.py:80:5: SIM115 Use a context manager for opening files
+   |
+78 | import fileinput
+79 |
+80 | f = tempfile.NamedTemporaryFile()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+81 | f = tempfile.TemporaryFile()
+82 | f = tempfile.SpooledTemporaryFile()
    |
 
 SIM115.py:81:5: SIM115 Use a context manager for opening files
    |
-79 | import fileinput
-80 |
-81 | f = tempfile.NamedTemporaryFile()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-82 | f = tempfile.TemporaryFile()
-83 | f = tempfile.SpooledTemporaryFile()
+80 | f = tempfile.NamedTemporaryFile()
+81 | f = tempfile.TemporaryFile()
+   |     ^^^^^^^^^^^^^^^^^^^^^^ SIM115
+82 | f = tempfile.SpooledTemporaryFile()
+83 | f = tarfile.open("foo.tar")
    |
 
 SIM115.py:82:5: SIM115 Use a context manager for opening files
    |
-81 | f = tempfile.NamedTemporaryFile()
-82 | f = tempfile.TemporaryFile()
-   |     ^^^^^^^^^^^^^^^^^^^^^^ SIM115
-83 | f = tempfile.SpooledTemporaryFile()
-84 | f = tarfile.open("foo.tar")
+80 | f = tempfile.NamedTemporaryFile()
+81 | f = tempfile.TemporaryFile()
+82 | f = tempfile.SpooledTemporaryFile()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+83 | f = tarfile.open("foo.tar")
+84 | f = TarFile("foo.tar").open()
    |
 
 SIM115.py:83:5: SIM115 Use a context manager for opening files
    |
-81 | f = tempfile.NamedTemporaryFile()
-82 | f = tempfile.TemporaryFile()
-83 | f = tempfile.SpooledTemporaryFile()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-84 | f = tarfile.open("foo.tar")
-85 | f = TarFile("foo.tar").open()
+81 | f = tempfile.TemporaryFile()
+82 | f = tempfile.SpooledTemporaryFile()
+83 | f = tarfile.open("foo.tar")
+   |     ^^^^^^^^^^^^ SIM115
+84 | f = TarFile("foo.tar").open()
+85 | f = tarfile.TarFile("foo.tar").open()
    |
 
 SIM115.py:84:5: SIM115 Use a context manager for opening files
    |
-82 | f = tempfile.TemporaryFile()
-83 | f = tempfile.SpooledTemporaryFile()
-84 | f = tarfile.open("foo.tar")
-   |     ^^^^^^^^^^^^ SIM115
-85 | f = TarFile("foo.tar").open()
-86 | f = tarfile.TarFile("foo.tar").open()
+82 | f = tempfile.SpooledTemporaryFile()
+83 | f = tarfile.open("foo.tar")
+84 | f = TarFile("foo.tar").open()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+85 | f = tarfile.TarFile("foo.tar").open()
+86 | f = tarfile.TarFile().open()
    |
 
 SIM115.py:85:5: SIM115 Use a context manager for opening files
    |
-83 | f = tempfile.SpooledTemporaryFile()
-84 | f = tarfile.open("foo.tar")
-85 | f = TarFile("foo.tar").open()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-86 | f = tarfile.TarFile("foo.tar").open()
-87 | f = tarfile.TarFile().open()
+83 | f = tarfile.open("foo.tar")
+84 | f = TarFile("foo.tar").open()
+85 | f = tarfile.TarFile("foo.tar").open()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+86 | f = tarfile.TarFile().open()
+87 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
    |
 
 SIM115.py:86:5: SIM115 Use a context manager for opening files
    |
-84 | f = tarfile.open("foo.tar")
-85 | f = TarFile("foo.tar").open()
-86 | f = tarfile.TarFile("foo.tar").open()
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-87 | f = tarfile.TarFile().open()
-88 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
+84 | f = TarFile("foo.tar").open()
+85 | f = tarfile.TarFile("foo.tar").open()
+86 | f = tarfile.TarFile().open()
+   |     ^^^^^^^^^^^^^^^^^^^^^^ SIM115
+87 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
+88 | f = io.open("foo.txt")
    |
 
 SIM115.py:87:5: SIM115 Use a context manager for opening files
    |
-85 | f = TarFile("foo.tar").open()
-86 | f = tarfile.TarFile("foo.tar").open()
-87 | f = tarfile.TarFile().open()
-   |     ^^^^^^^^^^^^^^^^^^^^^^ SIM115
-88 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
-89 | f = io.open("foo.txt")
+85 | f = tarfile.TarFile("foo.tar").open()
+86 | f = tarfile.TarFile().open()
+87 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+88 | f = io.open("foo.txt")
+89 | f = io.open_code("foo.txt")
    |
 
 SIM115.py:88:5: SIM115 Use a context manager for opening files
    |
-86 | f = tarfile.TarFile("foo.tar").open()
-87 | f = tarfile.TarFile().open()
-88 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-89 | f = io.open("foo.txt")
-90 | f = io.open_code("foo.txt")
+86 | f = tarfile.TarFile().open()
+87 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
+88 | f = io.open("foo.txt")
+   |     ^^^^^^^ SIM115
+89 | f = io.open_code("foo.txt")
+90 | f = codecs.open("foo.txt")
    |
 
 SIM115.py:89:5: SIM115 Use a context manager for opening files
    |
-87 | f = tarfile.TarFile().open()
-88 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
-89 | f = io.open("foo.txt")
-   |     ^^^^^^^ SIM115
-90 | f = io.open_code("foo.txt")
-91 | f = codecs.open("foo.txt")
+87 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
+88 | f = io.open("foo.txt")
+89 | f = io.open_code("foo.txt")
+   |     ^^^^^^^^^^^^ SIM115
+90 | f = codecs.open("foo.txt")
+91 | f = bz2.open("foo.txt")
    |
 
 SIM115.py:90:5: SIM115 Use a context manager for opening files
    |
-88 | f = zipfile.ZipFile("foo.zip").open("foo.txt")
-89 | f = io.open("foo.txt")
-90 | f = io.open_code("foo.txt")
-   |     ^^^^^^^^^^^^ SIM115
-91 | f = codecs.open("foo.txt")
-92 | f = bz2.open("foo.txt")
+88 | f = io.open("foo.txt")
+89 | f = io.open_code("foo.txt")
+90 | f = codecs.open("foo.txt")
+   |     ^^^^^^^^^^^ SIM115
+91 | f = bz2.open("foo.txt")
+92 | f = gzip.open("foo.txt")
    |
 
 SIM115.py:91:5: SIM115 Use a context manager for opening files
    |
-89 | f = io.open("foo.txt")
-90 | f = io.open_code("foo.txt")
-91 | f = codecs.open("foo.txt")
-   |     ^^^^^^^^^^^ SIM115
-92 | f = bz2.open("foo.txt")
-93 | f = gzip.open("foo.txt")
+89 | f = io.open_code("foo.txt")
+90 | f = codecs.open("foo.txt")
+91 | f = bz2.open("foo.txt")
+   |     ^^^^^^^^ SIM115
+92 | f = gzip.open("foo.txt")
+93 | f = dbm.open("foo.db")
    |
 
 SIM115.py:92:5: SIM115 Use a context manager for opening files
    |
-90 | f = io.open_code("foo.txt")
-91 | f = codecs.open("foo.txt")
-92 | f = bz2.open("foo.txt")
-   |     ^^^^^^^^ SIM115
-93 | f = gzip.open("foo.txt")
-94 | f = dbm.open("foo.db")
+90 | f = codecs.open("foo.txt")
+91 | f = bz2.open("foo.txt")
+92 | f = gzip.open("foo.txt")
+   |     ^^^^^^^^^ SIM115
+93 | f = dbm.open("foo.db")
+94 | f = dbm.gnu.open("foo.db")
    |
 
 SIM115.py:93:5: SIM115 Use a context manager for opening files
    |
-91 | f = codecs.open("foo.txt")
-92 | f = bz2.open("foo.txt")
-93 | f = gzip.open("foo.txt")
-   |     ^^^^^^^^^ SIM115
-94 | f = dbm.open("foo.db")
-95 | f = dbm.gnu.open("foo.db")
+91 | f = bz2.open("foo.txt")
+92 | f = gzip.open("foo.txt")
+93 | f = dbm.open("foo.db")
+   |     ^^^^^^^^ SIM115
+94 | f = dbm.gnu.open("foo.db")
+95 | f = dbm.ndbm.open("foo.db")
    |
 
 SIM115.py:94:5: SIM115 Use a context manager for opening files
    |
-92 | f = bz2.open("foo.txt")
-93 | f = gzip.open("foo.txt")
-94 | f = dbm.open("foo.db")
-   |     ^^^^^^^^ SIM115
-95 | f = dbm.gnu.open("foo.db")
-96 | f = dbm.ndbm.open("foo.db")
+92 | f = gzip.open("foo.txt")
+93 | f = dbm.open("foo.db")
+94 | f = dbm.gnu.open("foo.db")
+   |     ^^^^^^^^^^^^ SIM115
+95 | f = dbm.ndbm.open("foo.db")
+96 | f = dbm.dumb.open("foo.db")
    |
 
 SIM115.py:95:5: SIM115 Use a context manager for opening files
    |
-93 | f = gzip.open("foo.txt")
-94 | f = dbm.open("foo.db")
-95 | f = dbm.gnu.open("foo.db")
-   |     ^^^^^^^^^^^^ SIM115
-96 | f = dbm.ndbm.open("foo.db")
-97 | f = dbm.dumb.open("foo.db")
+93 | f = dbm.open("foo.db")
+94 | f = dbm.gnu.open("foo.db")
+95 | f = dbm.ndbm.open("foo.db")
+   |     ^^^^^^^^^^^^^ SIM115
+96 | f = dbm.dumb.open("foo.db")
+97 | f = lzma.open("foo.xz")
    |
 
 SIM115.py:96:5: SIM115 Use a context manager for opening files
    |
-94 | f = dbm.open("foo.db")
-95 | f = dbm.gnu.open("foo.db")
-96 | f = dbm.ndbm.open("foo.db")
+94 | f = dbm.gnu.open("foo.db")
+95 | f = dbm.ndbm.open("foo.db")
+96 | f = dbm.dumb.open("foo.db")
    |     ^^^^^^^^^^^^^ SIM115
-97 | f = dbm.dumb.open("foo.db")
-98 | f = lzma.open("foo.xz")
+97 | f = lzma.open("foo.xz")
+98 | f = lzma.LZMAFile("foo.xz")
    |
 
 SIM115.py:97:5: SIM115 Use a context manager for opening files
    |
-95 | f = dbm.gnu.open("foo.db")
-96 | f = dbm.ndbm.open("foo.db")
-97 | f = dbm.dumb.open("foo.db")
-   |     ^^^^^^^^^^^^^ SIM115
-98 | f = lzma.open("foo.xz")
-99 | f = lzma.LZMAFile("foo.xz")
+95 | f = dbm.ndbm.open("foo.db")
+96 | f = dbm.dumb.open("foo.db")
+97 | f = lzma.open("foo.xz")
+   |     ^^^^^^^^^ SIM115
+98 | f = lzma.LZMAFile("foo.xz")
+99 | f = shelve.open("foo.db")
    |
 
 SIM115.py:98:5: SIM115 Use a context manager for opening files
     |
- 96 | f = dbm.ndbm.open("foo.db")
- 97 | f = dbm.dumb.open("foo.db")
- 98 | f = lzma.open("foo.xz")
-    |     ^^^^^^^^^ SIM115
- 99 | f = lzma.LZMAFile("foo.xz")
-100 | f = shelve.open("foo.db")
+ 96 | f = dbm.dumb.open("foo.db")
+ 97 | f = lzma.open("foo.xz")
+ 98 | f = lzma.LZMAFile("foo.xz")
+    |     ^^^^^^^^^^^^^ SIM115
+ 99 | f = shelve.open("foo.db")
+100 | f = tokenize.open("foo.py")
     |
 
 SIM115.py:99:5: SIM115 Use a context manager for opening files
     |
- 97 | f = dbm.dumb.open("foo.db")
- 98 | f = lzma.open("foo.xz")
- 99 | f = lzma.LZMAFile("foo.xz")
-    |     ^^^^^^^^^^^^^ SIM115
-100 | f = shelve.open("foo.db")
-101 | f = tokenize.open("foo.py")
+ 97 | f = lzma.open("foo.xz")
+ 98 | f = lzma.LZMAFile("foo.xz")
+ 99 | f = shelve.open("foo.db")
+    |     ^^^^^^^^^^^ SIM115
+100 | f = tokenize.open("foo.py")
+101 | f = wave.open("foo.wav")
     |
 
 SIM115.py:100:5: SIM115 Use a context manager for opening files
     |
- 98 | f = lzma.open("foo.xz")
- 99 | f = lzma.LZMAFile("foo.xz")
-100 | f = shelve.open("foo.db")
-    |     ^^^^^^^^^^^ SIM115
-101 | f = tokenize.open("foo.py")
-102 | f = wave.open("foo.wav")
+ 98 | f = lzma.LZMAFile("foo.xz")
+ 99 | f = shelve.open("foo.db")
+100 | f = tokenize.open("foo.py")
+    |     ^^^^^^^^^^^^^ SIM115
+101 | f = wave.open("foo.wav")
+102 | f = tarfile.TarFile.taropen("foo.tar")
     |
 
 SIM115.py:101:5: SIM115 Use a context manager for opening files
     |
- 99 | f = lzma.LZMAFile("foo.xz")
-100 | f = shelve.open("foo.db")
-101 | f = tokenize.open("foo.py")
-    |     ^^^^^^^^^^^^^ SIM115
-102 | f = wave.open("foo.wav")
-103 | f = tarfile.TarFile.taropen("foo.tar")
+ 99 | f = shelve.open("foo.db")
+100 | f = tokenize.open("foo.py")
+101 | f = wave.open("foo.wav")
+    |     ^^^^^^^^^ SIM115
+102 | f = tarfile.TarFile.taropen("foo.tar")
+103 | f = fileinput.input("foo.txt")
     |
 
 SIM115.py:102:5: SIM115 Use a context manager for opening files
     |
-100 | f = shelve.open("foo.db")
-101 | f = tokenize.open("foo.py")
-102 | f = wave.open("foo.wav")
-    |     ^^^^^^^^^ SIM115
-103 | f = tarfile.TarFile.taropen("foo.tar")
-104 | f = fileinput.input("foo.txt")
+100 | f = tokenize.open("foo.py")
+101 | f = wave.open("foo.wav")
+102 | f = tarfile.TarFile.taropen("foo.tar")
+    |     ^^^^^^^^^^^^^^^^^^^^^^^ SIM115
+103 | f = fileinput.input("foo.txt")
+104 | f = fileinput.FileInput("foo.txt")
     |
 
 SIM115.py:103:5: SIM115 Use a context manager for opening files
     |
-101 | f = tokenize.open("foo.py")
-102 | f = wave.open("foo.wav")
-103 | f = tarfile.TarFile.taropen("foo.tar")
-    |     ^^^^^^^^^^^^^^^^^^^^^^^ SIM115
-104 | f = fileinput.input("foo.txt")
-105 | f = fileinput.FileInput("foo.txt")
+101 | f = wave.open("foo.wav")
+102 | f = tarfile.TarFile.taropen("foo.tar")
+103 | f = fileinput.input("foo.txt")
+    |     ^^^^^^^^^^^^^^^ SIM115
+104 | f = fileinput.FileInput("foo.txt")
     |
 
 SIM115.py:104:5: SIM115 Use a context manager for opening files
     |
-102 | f = wave.open("foo.wav")
-103 | f = tarfile.TarFile.taropen("foo.tar")
-104 | f = fileinput.input("foo.txt")
-    |     ^^^^^^^^^^^^^^^ SIM115
-105 | f = fileinput.FileInput("foo.txt")
-    |
-
-SIM115.py:105:5: SIM115 Use a context manager for opening files
-    |
-103 | f = tarfile.TarFile.taropen("foo.tar")
-104 | f = fileinput.input("foo.txt")
-105 | f = fileinput.FileInput("foo.txt")
+102 | f = tarfile.TarFile.taropen("foo.tar")
+103 | f = fileinput.input("foo.txt")
+104 | f = fileinput.FileInput("foo.txt")
     |     ^^^^^^^^^^^^^^^^^^^ SIM115
-106 |
-107 | with contextlib.suppress(Exception):
+105 |
+106 | with contextlib.suppress(Exception):
     |
 
-SIM115.py:241:9: SIM115 Use a context manager for opening files
+SIM115.py:240:9: SIM115 Use a context manager for opening files
     |
-239 | def aliased():
-240 |     from shelve import open as open_shelf
-241 |     x = open_shelf("foo.dbm")
+238 | def aliased():
+239 |     from shelve import open as open_shelf
+240 |     x = open_shelf("foo.dbm")
     |         ^^^^^^^^^^ SIM115
-242 |     x.close()
+241 |     x.close()
     |
 
-SIM115.py:245:9: SIM115 Use a context manager for opening files
+SIM115.py:244:9: SIM115 Use a context manager for opening files
     |
-244 |     from tarfile import TarFile as TF
-245 |     f = TF("foo").open()
+243 |     from tarfile import TarFile as TF
+244 |     f = TF("foo").open()
     |         ^^^^^^^^^^^^^^ SIM115
-246 |     f.close()
+245 |     f.close()
     |
 
-SIM115.py:258:5: SIM115 Use a context manager for opening files
+SIM115.py:257:5: SIM115 Use a context manager for opening files
     |
-257 | # SIM115
-258 | f = dbm.sqlite3.open("foo.db")
+256 | # SIM115
+257 | f = dbm.sqlite3.open("foo.db")
     |     ^^^^^^^^^^^^^^^^ SIM115
-259 | f.close()
+258 | f.close()
     |

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM116_SIM116.py.snap

@@ -1,110 +1,110 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_simplify/mod.rs
 ---
-SIM116.py:6:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:5:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
- 5 |       # SIM116
- 6 | /     if a == "foo":
- 7 | |         return "bar"
- 8 | |     elif a == "bar":
- 9 | |         return "baz"
-10 | |     elif a == "boo":
-11 | |         return "ooh"
-12 | |     else:
-13 | |         return 42
-   | |_________________^ SIM116
-14 |
-15 |       # SIM116
+ 4 |   # SIM116
+ 5 | / if a == "foo":
+ 6 | |     return "bar"
+ 7 | | elif a == "bar":
+ 8 | |     return "baz"
+ 9 | | elif a == "boo":
+10 | |     return "ooh"
+11 | | else:
+12 | |     return 42
+   | |_____________^ SIM116
+13 |
+14 |   # SIM116
    |
 
-SIM116.py:16:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:15:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-15 |       # SIM116
-16 | /     if a == 1:
-17 | |         return (1, 2, 3)
-18 | |     elif a == 2:
-19 | |         return (4, 5, 6)
-20 | |     elif a == 3:
-21 | |         return (7, 8, 9)
-22 | |     else:
-23 | |         return (10, 11, 12)
-   | |___________________________^ SIM116
-24 |
-25 |       # SIM116
+14 |   # SIM116
+15 | / if a == 1:
+16 | |     return (1, 2, 3)
+17 | | elif a == 2:
+18 | |     return (4, 5, 6)
+19 | | elif a == 3:
+20 | |     return (7, 8, 9)
+21 | | else:
+22 | |     return (10, 11, 12)
+   | |_______________________^ SIM116
+23 |
+24 |   # SIM116
    |
 
-SIM116.py:26:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:25:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-25 |       # SIM116
-26 | /     if a == 1:
-27 | |         return (1, 2, 3)
-28 | |     elif a == 2:
-29 | |         return (4, 5, 6)
-30 | |     elif a == 3:
-31 | |         return (7, 8, 9)
-   | |________________________^ SIM116
-32 |
-33 |       # SIM116
+24 |   # SIM116
+25 | / if a == 1:
+26 | |     return (1, 2, 3)
+27 | | elif a == 2:
+28 | |     return (4, 5, 6)
+29 | | elif a == 3:
+30 | |     return (7, 8, 9)
+   | |____________________^ SIM116
+31 |
+32 |   # SIM116
    |
 
-SIM116.py:34:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:33:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-33 |       # SIM116
-34 | /     if a == "hello 'sir'":
-35 | |         return (1, 2, 3)
-36 | |     elif a == 'goodbye "mam"':
-37 | |         return (4, 5, 6)
-38 | |     elif a == """Fairwell 'mister'""":
-39 | |         return (7, 8, 9)
-40 | |     else:
-41 | |         return (10, 11, 12)
-   | |___________________________^ SIM116
-42 |
-43 |       # SIM116
+32 |   # SIM116
+33 | / if a == "hello 'sir'":
+34 | |     return (1, 2, 3)
+35 | | elif a == 'goodbye "mam"':
+36 | |     return (4, 5, 6)
+37 | | elif a == """Fairwell 'mister'""":
+38 | |     return (7, 8, 9)
+39 | | else:
+40 | |     return (10, 11, 12)
+   | |_______________________^ SIM116
+41 |
+42 |   # SIM116
    |
 
-SIM116.py:44:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:43:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-43 |       # SIM116
-44 | /     if a == b"one":
-45 | |         return 1
-46 | |     elif a == b"two":
-47 | |         return 2
-48 | |     elif a == b"three":
-49 | |         return 3
-   | |________________^ SIM116
-50 |
-51 |       # SIM116
+42 |   # SIM116
+43 | / if a == b"one":
+44 | |     return 1
+45 | | elif a == b"two":
+46 | |     return 2
+47 | | elif a == b"three":
+48 | |     return 3
+   | |____________^ SIM116
+49 |
+50 |   # SIM116
    |
 
-SIM116.py:52:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:51:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-51 |       # SIM116
-52 | /     if a == "hello 'sir'":
-53 | |         return ("hello'", 'hi"', 3)
-54 | |     elif a == 'goodbye "mam"':
-55 | |         return (4, 5, 6)
-56 | |     elif a == """Fairwell 'mister'""":
-57 | |         return (7, 8, 9)
-58 | |     else:
-59 | |         return (10, 11, 12)
-   | |___________________________^ SIM116
-60 |
-61 |       # OK
+50 |   # SIM116
+51 | / if a == "hello 'sir'":
+52 | |     return ("hello'", 'hi"', 3)
+53 | | elif a == 'goodbye "mam"':
+54 | |     return (4, 5, 6)
+55 | | elif a == """Fairwell 'mister'""":
+56 | |     return (7, 8, 9)
+57 | | else:
+58 | |     return (10, 11, 12)
+   | |_______________________^ SIM116
+59 |
+60 |   # OK
    |
 
-SIM116.py:80:5: SIM116 Use a dictionary instead of consecutive `if` statements
+SIM116.py:79:1: SIM116 Use a dictionary instead of consecutive `if` statements
    |
-79 |       # SIM116
-80 | /     if func_name == "create":
-81 | |         return "A"
-82 | |     elif func_name == "modify":
-83 | |         return "M"
-84 | |     elif func_name == "remove":
-85 | |         return "D"
-86 | |     elif func_name == "move":
-87 | |         return "MV"
-   | |___________________^ SIM116
-88 |
-89 |       # OK
+78 |   # SIM116
+79 | / if func_name == "create":
+80 | |     return "A"
+81 | | elif func_name == "modify":
+82 | |     return "M"
+83 | | elif func_name == "remove":
+84 | |     return "D"
+85 | | elif func_name == "move":
+86 | |     return "MV"
+   | |_______________^ SIM116
+87 |
+88 |   # OK
    |

crates/ruff_linter/src/rules/flake8_type_checking/mod.rs

@@ -36,7 +36,6 @@ mod tests {
     #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TC004_8.py"))]
     #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TC004_9.py"))]
     #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("quote.py"))]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("whitespace.py"))]
     #[test_case(Rule::RuntimeStringUnion, Path::new("TC010_1.py"))]
     #[test_case(Rule::RuntimeStringUnion, Path::new("TC010_2.py"))]
     #[test_case(Rule::TypingOnlyFirstPartyImport, Path::new("TC001.py"))]

crates/ruff_linter/src/rules/flake8_type_checking/rules/type_alias_quotes.rs

@@ -11,7 +11,6 @@ use crate::registry::Rule;
 use crate::rules::flake8_type_checking::helpers::quote_type_expression;
 use crate::{AlwaysFixableViolation, Edit, Fix, FixAvailability, Violation};
 use ruff_python_ast::PythonVersion;
-use ruff_python_ast::parenthesize::parenthesized_range;
 
 /// ## What it does
 /// Checks if [PEP 613] explicit type aliases contain references to
@@ -88,15 +87,11 @@ impl Violation for UnquotedTypeAlias {
 /// ## Example
 /// Given:
 /// ```python
-/// from typing import TypeAlias
-///
 /// OptInt: TypeAlias = "int | None"
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// from typing import TypeAlias
-///
 /// OptInt: TypeAlias = int | None
 /// ```
 ///
@@ -292,30 +287,7 @@ pub(crate) fn quoted_type_alias(
 
     let range = annotation_expr.range();
     let mut diagnostic = checker.report_diagnostic(QuotedTypeAlias, range);
-    let fix_string = annotation_expr.value.to_string();
-    let fix_string = if (fix_string.contains('\n') || fix_string.contains('\r'))
-        && parenthesized_range(
-            // Check for parenthesis outside string ("""...""")
-            annotation_expr.into(),
-            checker.semantic().current_statement().into(),
-            checker.comment_ranges(),
-            checker.locator().contents(),
-        )
-        .is_none()
-        && parenthesized_range(
-            // Check for parenthesis inside string """(...)"""
-            expr.into(),
-            annotation_expr.into(),
-            checker.comment_ranges(),
-            checker.locator().contents(),
-        )
-        .is_none()
-    {
-        format!("({fix_string})")
-    } else {
-        fix_string
-    };
-    let edit = Edit::range_replacement(fix_string, range);
+    let edit = Edit::range_replacement(annotation_expr.value.to_string(), range);
     if checker.comment_ranges().intersects(range) {
         diagnostic.set_fix(Fix::unsafe_edit(edit));
     } else {

crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs

@@ -44,7 +44,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// ```python
 /// from __future__ import annotations
 ///
-/// from . import local_module
+/// import local_module
 ///
 ///
 /// def func(sized: local_module.Container) -> int:
@@ -58,7 +58,7 @@ use crate::{Fix, FixAvailability, Violation};
 /// from typing import TYPE_CHECKING
 ///
 /// if TYPE_CHECKING:
-///     from . import local_module
+///     import local_module
 ///
 ///
 /// def func(sized: local_module.Container) -> int:

crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap

@@ -409,8 +409,6 @@ TC008.py:52:18: TC008 [*] Remove quotes from type alias
 51 |         a: TypeAlias = 'Baz'  # OK
 52 |         type A = 'Baz'  # TC008
    |                  ^^^^^ TC008
-53 |
-54 | # O should have parenthesis added
    |
    = help: Remove quotes
 
@@ -420,187 +418,3 @@ TC008.py:52:18: TC008 [*] Remove quotes from type alias
 51 51 |         a: TypeAlias = 'Baz'  # OK
 52    |-        type A = 'Baz'  # TC008
    52 |+        type A = Baz  # TC008
-53 53 | 
-54 54 | # O should have parenthesis added
-55 55 | o: TypeAlias = """int
-
-TC008.py:55:16: TC008 [*] Remove quotes from type alias
-   |
-54 |   # O should have parenthesis added
-55 |   o: TypeAlias = """int
-   |  ________________^
-56 | | | None"""
-   | |_________^ TC008
-57 |   type O = """int
-58 |   | None"""
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-52 52 |         type A = 'Baz'  # TC008
-53 53 | 
-54 54 | # O should have parenthesis added
-55    |-o: TypeAlias = """int
-56    |-| None"""
-   55 |+o: TypeAlias = (int
-   56 |+| None)
-57 57 | type O = """int
-58 58 | | None"""
-59 59 | 
-
-TC008.py:57:10: TC008 [*] Remove quotes from type alias
-   |
-55 |   o: TypeAlias = """int
-56 |   | None"""
-57 |   type O = """int
-   |  __________^
-58 | | | None"""
-   | |_________^ TC008
-59 |
-60 |   # P, Q, and R should not have parenthesis added
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-54 54 | # O should have parenthesis added
-55 55 | o: TypeAlias = """int
-56 56 | | None"""
-57    |-type O = """int
-58    |-| None"""
-   57 |+type O = (int
-   58 |+| None)
-59 59 | 
-60 60 | # P, Q, and R should not have parenthesis added
-61 61 | p: TypeAlias = ("""int
-
-TC008.py:61:17: TC008 [*] Remove quotes from type alias
-   |
-60 |   # P, Q, and R should not have parenthesis added
-61 |   p: TypeAlias = ("""int
-   |  _________________^
-62 | | | None""")
-   | |_________^ TC008
-63 |   type P = ("""int
-64 |   | None""")
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-58 58 | | None"""
-59 59 | 
-60 60 | # P, Q, and R should not have parenthesis added
-61    |-p: TypeAlias = ("""int
-62    |-| None""")
-   61 |+p: TypeAlias = (int
-   62 |+| None)
-63 63 | type P = ("""int
-64 64 | | None""")
-65 65 | 
-
-TC008.py:63:11: TC008 [*] Remove quotes from type alias
-   |
-61 |   p: TypeAlias = ("""int
-62 |   | None""")
-63 |   type P = ("""int
-   |  ___________^
-64 | | | None""")
-   | |_________^ TC008
-65 |
-66 |   q: TypeAlias = """(int
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-60 60 | # P, Q, and R should not have parenthesis added
-61 61 | p: TypeAlias = ("""int
-62 62 | | None""")
-63    |-type P = ("""int
-64    |-| None""")
-   63 |+type P = (int
-   64 |+| None)
-65 65 | 
-66 66 | q: TypeAlias = """(int
-67 67 | | None)"""
-
-TC008.py:66:16: TC008 [*] Remove quotes from type alias
-   |
-64 |   | None""")
-65 |
-66 |   q: TypeAlias = """(int
-   |  ________________^
-67 | | | None)"""
-   | |__________^ TC008
-68 |   type Q = """(int
-69 |   | None)"""
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-63 63 | type P = ("""int
-64 64 | | None""")
-65 65 | 
-66    |-q: TypeAlias = """(int
-67    |-| None)"""
-   66 |+q: TypeAlias = (int
-   67 |+| None)
-68 68 | type Q = """(int
-69 69 | | None)"""
-70 70 | 
-
-TC008.py:68:10: TC008 [*] Remove quotes from type alias
-   |
-66 |   q: TypeAlias = """(int
-67 |   | None)"""
-68 |   type Q = """(int
-   |  __________^
-69 | | | None)"""
-   | |__________^ TC008
-70 |
-71 |   r: TypeAlias = """int | None"""
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-65 65 | 
-66 66 | q: TypeAlias = """(int
-67 67 | | None)"""
-68    |-type Q = """(int
-69    |-| None)"""
-   68 |+type Q = (int
-   69 |+| None)
-70 70 | 
-71 71 | r: TypeAlias = """int | None"""
-72 72 | type R = """int | None"""
-
-TC008.py:71:16: TC008 [*] Remove quotes from type alias
-   |
-69 | | None)"""
-70 |
-71 | r: TypeAlias = """int | None"""
-   |                ^^^^^^^^^^^^^^^^ TC008
-72 | type R = """int | None"""
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-68 68 | type Q = """(int
-69 69 | | None)"""
-70 70 | 
-71    |-r: TypeAlias = """int | None"""
-   71 |+r: TypeAlias = int | None
-72 72 | type R = """int | None"""
-
-TC008.py:72:10: TC008 [*] Remove quotes from type alias
-   |
-71 | r: TypeAlias = """int | None"""
-72 | type R = """int | None"""
-   |          ^^^^^^^^^^^^^^^^ TC008
-   |
-   = help: Remove quotes
-
-ℹ Safe fix
-69 69 | | None)"""
-70 70 | 
-71 71 | r: TypeAlias = """int | None"""
-72    |-type R = """int | None"""
-   72 |+type R = int | None

crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap

@@ -1,22 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
----
-whitespace.py:5:26: TC004 [*] Move import `builtins` out of type-checking block. Import is used for more than type hinting.
-  |
-3 | from typing import TYPE_CHECKING\
-4 |
-5 | if TYPE_CHECKING: import builtins
-  |                          ^^^^^^^^ TC004
-6 | builtins.print("!")
-  |
-  = help: Move out of type-checking block
-
-ℹ Unsafe fix
-1 1 | # Regression test for: https://github.com/astral-sh/ruff/issues/19175
-2 2 | # there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash
-3   |-from typing import TYPE_CHECKING\
-  3 |+from typing import TYPE_CHECKING; import builtins\
-4 4 | 
-5   |-if TYPE_CHECKING: import builtins
-  5 |+if TYPE_CHECKING: pass
-6 6 | builtins.print("!")

crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs

@@ -1,74 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::importer::ImportRequest;
-use crate::{Applicability, Edit, Fix, Violation};
-use ruff_python_ast::{self as ast};
-use ruff_python_ast::{Expr, ExprCall};
-use ruff_text_size::Ranged;
-
-pub(crate) fn is_keyword_only_argument_non_default(arguments: &ast::Arguments, name: &str) -> bool {
-    arguments
-        .find_keyword(name)
-        .is_some_and(|keyword| !keyword.value.is_none_literal_expr())
-}
-
-pub(crate) fn is_pathlib_path_call(checker: &Checker, expr: &Expr) -> bool {
-    expr.as_call_expr().is_some_and(|expr_call| {
-        checker
-            .semantic()
-            .resolve_qualified_name(&expr_call.func)
-            .is_some_and(|name| matches!(name.segments(), ["pathlib", "Path"]))
-    })
-}
-
-/// We check functions that take only 1 argument,  this does not apply to functions
-/// with `dir_fd` argument, because `dir_fd` is not supported by pathlib,
-/// so check if it's set to non-default values
-pub(crate) fn check_os_pathlib_single_arg_calls(
-    checker: &Checker,
-    call: &ExprCall,
-    attr: &str,
-    fn_argument: &str,
-    fix_enabled: bool,
-    violation: impl Violation,
-) {
-    if call.arguments.len() != 1 {
-        return;
-    }
-
-    let Some(arg) = call.arguments.find_argument_value(fn_argument, 0) else {
-        return;
-    };
-
-    let arg_code = checker.locator().slice(arg.range());
-    let range = call.range();
-
-    let mut diagnostic = checker.report_diagnostic(violation, call.func.range());
-
-    if fix_enabled {
-        diagnostic.try_set_fix(|| {
-            let (import_edit, binding) = checker.importer().get_or_import_symbol(
-                &ImportRequest::import("pathlib", "Path"),
-                call.start(),
-                checker.semantic(),
-            )?;
-
-            let applicability = if checker.comment_ranges().intersects(range) {
-                Applicability::Unsafe
-            } else {
-                Applicability::Safe
-            };
-
-            let replacement = if is_pathlib_path_call(checker, arg) {
-                format!("{arg_code}.{attr}")
-            } else {
-                format!("{binding}({arg_code}).{attr}")
-            };
-
-            Ok(Fix::applicable_edits(
-                Edit::range_replacement(replacement, range),
-                [import_edit],
-                applicability,
-            ))
-        });
-    }
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs

@@ -1,5 +1,4 @@
 //! Rules from [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/).
-mod helpers;
 pub(crate) mod rules;
 pub(crate) mod violations;
 
@@ -80,53 +79,8 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Path::new("full_name.py"))]
-    #[test_case(Path::new("import_as.py"))]
-    #[test_case(Path::new("import_from_as.py"))]
-    #[test_case(Path::new("import_from.py"))]
-    fn preview_rules(path: &Path) -> Result<()> {
-        let snapshot = format!("preview_{}", path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_use_pathlib").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rules(vec![
-                    Rule::OsPathAbspath,
-                    Rule::OsChmod,
-                    Rule::OsMkdir,
-                    Rule::OsMakedirs,
-                    Rule::OsRename,
-                    Rule::OsReplace,
-                    Rule::OsRmdir,
-                    Rule::OsRemove,
-                    Rule::OsUnlink,
-                    Rule::OsGetcwd,
-                    Rule::OsPathExists,
-                    Rule::OsPathExpanduser,
-                    Rule::OsPathIsdir,
-                    Rule::OsPathIsfile,
-                    Rule::OsPathIslink,
-                    Rule::OsReadlink,
-                    Rule::OsStat,
-                    Rule::OsPathIsabs,
-                    Rule::OsPathJoin,
-                    Rule::OsPathBasename,
-                    Rule::OsPathDirname,
-                    Rule::OsPathSamefile,
-                    Rule::OsPathSplitext,
-                    Rule::BuiltinOpen,
-                ])
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
-
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202_2.py"))]
-    #[test_case(Rule::OsPathGetatime, Path::new("PTH203.py"))]
-    #[test_case(Rule::OsPathGetmtime, Path::new("PTH204.py"))]
-    #[test_case(Rule::OsPathGetctime, Path::new("PTH205.py"))]
     fn preview_flake8_use_pathlib(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/invalid_pathlib_with_suffix.rs

@@ -19,20 +19,12 @@ use ruff_text_size::Ranged;
 /// ## Example
 ///
 /// ```python
-/// from pathlib import Path
-///
-/// path = Path()
-///
 /// path.with_suffix("py")
 /// ```
 ///
 /// Use instead:
 ///
 /// ```python
-/// from pathlib import Path
-///
-/// path = Path()
-///
 /// path.with_suffix(".py")
 /// ```
 ///

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/mod.rs

@@ -1,45 +1,19 @@
 pub(crate) use glob_rule::*;
 pub(crate) use invalid_pathlib_with_suffix::*;
-pub(crate) use os_path_abspath::*;
-pub(crate) use os_path_basename::*;
-pub(crate) use os_path_dirname::*;
-pub(crate) use os_path_exists::*;
-pub(crate) use os_path_expanduser::*;
 pub(crate) use os_path_getatime::*;
 pub(crate) use os_path_getctime::*;
 pub(crate) use os_path_getmtime::*;
 pub(crate) use os_path_getsize::*;
-pub(crate) use os_path_isabs::*;
-pub(crate) use os_path_isdir::*;
-pub(crate) use os_path_isfile::*;
-pub(crate) use os_path_islink::*;
-pub(crate) use os_readlink::*;
-pub(crate) use os_remove::*;
-pub(crate) use os_rmdir::*;
 pub(crate) use os_sep_split::*;
-pub(crate) use os_unlink::*;
 pub(crate) use path_constructor_current_directory::*;
 pub(crate) use replaceable_by_pathlib::*;
 
 mod glob_rule;
 mod invalid_pathlib_with_suffix;
-mod os_path_abspath;
-mod os_path_basename;
-mod os_path_dirname;
-mod os_path_exists;
-mod os_path_expanduser;
 mod os_path_getatime;
 mod os_path_getctime;
 mod os_path_getmtime;
 mod os_path_getsize;
-mod os_path_isabs;
-mod os_path_isdir;
-mod os_path_isfile;
-mod os_path_islink;
-mod os_readlink;
-mod os_remove;
-mod os_rmdir;
 mod os_sep_split;
-mod os_unlink;
 mod path_constructor_current_directory;
 mod replaceable_by_pathlib;

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_abspath.rs

@@ -1,74 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_abspath_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
-
-/// ## What it does
-/// Checks for uses of `os.path.abspath`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.path`. When possible, using `Path` object
-/// methods such as `Path.resolve()` can improve readability over the `os.path`
-/// module's counterparts (e.g., `os.path.abspath()`).
-///
-/// ## Examples
-/// ```python
-/// import os
-///
-/// file_path = os.path.abspath("../path/to/file")
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// file_path = Path("../path/to/file").resolve()
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
-/// ## References
-/// - [Python documentation: `Path.resolve`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.resolve)
-/// - [Python documentation: `os.path.abspath`](https://docs.python.org/3/library/os.path.html#os.path.abspath)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsPathAbspath;
-
-impl Violation for OsPathAbspath {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.path.abspath()` should be replaced by `Path.resolve()`".to_string()
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path(...).resolve()`".to_string())
-    }
-}
-
-/// PTH100
-pub(crate) fn os_path_abspath(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "abspath"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "resolve()",
-        "path",
-        is_fix_os_path_abspath_enabled(checker.settings()),
-        OsPathAbspath,
-    );
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_basename.rs

@@ -1,73 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_basename_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
-
-/// ## What it does
-/// Checks for uses of `os.path.basename`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.path`. When possible, using `Path` object
-/// methods such as `Path.name` can improve readability over the `os.path`
-/// module's counterparts (e.g., `os.path.basename()`).
-///
-/// ## Examples
-/// ```python
-/// import os
-///
-/// os.path.basename(__file__)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// Path(__file__).name
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
-/// ## References
-/// - [Python documentation: `PurePath.name`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.name)
-/// - [Python documentation: `os.path.basename`](https://docs.python.org/3/library/os.path.html#os.path.basename)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsPathBasename;
-
-impl Violation for OsPathBasename {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.path.basename()` should be replaced by `Path.name`".to_string()
-    }
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path(...).name`".to_string())
-    }
-}
-
-/// PTH119
-pub(crate) fn os_path_basename(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "basename"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "name",
-        "p",
-        is_fix_os_path_basename_enabled(checker.settings()),
-        OsPathBasename,
-    );
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_dirname.rs

@@ -1,73 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_dirname_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
-
-/// ## What it does
-/// Checks for uses of `os.path.dirname`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.path`. When possible, using `Path` object
-/// methods such as `Path.parent` can improve readability over the `os.path`
-/// module's counterparts (e.g., `os.path.dirname()`).
-///
-/// ## Examples
-/// ```python
-/// import os
-///
-/// os.path.dirname(__file__)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// Path(__file__).parent
-/// ```
-///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## References
-/// - [Python documentation: `PurePath.parent`](https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.parent)
-/// - [Python documentation: `os.path.dirname`](https://docs.python.org/3/library/os.path.html#os.path.dirname)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsPathDirname;
-
-impl Violation for OsPathDirname {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.path.dirname()` should be replaced by `Path.parent`".to_string()
-    }
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path(...).parent`".to_string())
-    }
-}
-
-/// PTH120
-pub(crate) fn os_path_dirname(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "dirname"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "parent",
-        "p",
-        is_fix_os_path_dirname_enabled(checker.settings()),
-        OsPathDirname,
-    );
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_exists.rs

@@ -1,73 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_exists_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
-
-/// ## What it does
-/// Checks for uses of `os.path.exists`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.path`. When possible, using `Path` object
-/// methods such as `Path.exists()` can improve readability over the `os.path`
-/// module's counterparts (e.g., `os.path.exists()`).
-///
-/// ## Examples
-/// ```python
-/// import os
-///
-/// os.path.exists("file.py")
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// Path("file.py").exists()
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
-/// ## References
-/// - [Python documentation: `Path.exists`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.exists)
-/// - [Python documentation: `os.path.exists`](https://docs.python.org/3/library/os.path.html#os.path.exists)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsPathExists;
-
-impl Violation for OsPathExists {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.path.exists()` should be replaced by `Path.exists()`".to_string()
-    }
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path(...).exists()`".to_string())
-    }
-}
-
-/// PTH110
-pub(crate) fn os_path_exists(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "exists"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "exists()",
-        "path",
-        is_fix_os_path_exists_enabled(checker.settings()),
-        OsPathExists,
-    );
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_expanduser.rs

@@ -1,73 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_expanduser_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
-
-/// ## What it does
-/// Checks for uses of `os.path.expanduser`.
-///
-/// ## Why is this bad?
-/// `pathlib` offers a high-level API for path manipulation, as compared to
-/// the lower-level API offered by `os.path`. When possible, using `Path` object
-/// methods such as `Path.expanduser()` can improve readability over the `os.path`
-/// module's counterparts (e.g., as `os.path.expanduser()`).
-///
-/// ## Examples
-/// ```python
-/// import os
-///
-/// os.path.expanduser("~/films/Monty Python")
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from pathlib import Path
-///
-/// Path("~/films/Monty Python").expanduser()
-/// ```
-///
-/// ## Known issues
-/// While using `pathlib` can improve the readability and type safety of your code,
-/// it can be less performant than the lower-level alternatives that work directly with strings,
-/// especially on older versions of Python.
-///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
-/// ## References
-/// - [Python documentation: `Path.expanduser`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.expanduser)
-/// - [Python documentation: `os.path.expanduser`](https://docs.python.org/3/library/os.path.html#os.path.expanduser)
-/// - [PEP 428 – The pathlib module – object-oriented filesystem paths](https://peps.python.org/pep-0428/)
-/// - [Correspondence between `os` and `pathlib`](https://docs.python.org/3/library/pathlib.html#correspondence-to-tools-in-the-os-module)
-/// - [Why you should be using pathlib](https://treyhunner.com/2018/12/why-you-should-be-using-pathlib/)
-/// - [No really, pathlib is great](https://treyhunner.com/2019/01/no-really-pathlib-is-great/)
-#[derive(ViolationMetadata)]
-pub(crate) struct OsPathExpanduser;
-
-impl Violation for OsPathExpanduser {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "`os.path.expanduser()` should be replaced by `Path.expanduser()`".to_string()
-    }
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path(...).expanduser()`".to_string())
-    }
-}
-
-/// PTH111
-pub(crate) fn os_path_expanduser(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "expanduser"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "expanduser()",
-        "path",
-        is_fix_os_path_expanduser_enabled(checker.settings()),
-        OsPathExpanduser,
-    );
-}

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getatime.rs

@@ -1,9 +1,6 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_getatime_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
+
+use crate::Violation;
 
 /// ## What it does
 /// Checks for uses of `os.path.getatime`.
@@ -35,9 +32,6 @@ use ruff_python_ast::ExprCall;
 /// it can be less performant than the lower-level alternatives that work directly with strings,
 /// especially on older versions of Python.
 ///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
 /// ## References
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getatime`](https://docs.python.org/3/library/os.path.html#os.path.getatime)
@@ -49,28 +43,8 @@ use ruff_python_ast::ExprCall;
 pub(crate) struct OsPathGetatime;
 
 impl Violation for OsPathGetatime {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
     #[derive_message_formats]
     fn message(&self) -> String {
         "`os.path.getatime` should be replaced by `Path.stat().st_atime`".to_string()
     }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path.stat(...).st_atime`".to_string())
-    }
-}
-
-/// PTH203
-pub(crate) fn os_path_getatime(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "getatime"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "stat().st_atime",
-        "filename",
-        is_fix_os_path_getatime_enabled(checker.settings()),
-        OsPathGetatime,
-    );
 }

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getctime.rs

@@ -1,9 +1,6 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_getctime_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
+
+use crate::Violation;
 
 /// ## What it does
 /// Checks for uses of `os.path.getctime`.
@@ -35,9 +32,6 @@ use ruff_python_ast::ExprCall;
 /// it can be less performant than the lower-level alternatives that work directly with strings,
 /// especially on older versions of Python.
 ///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
 /// ## References
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getctime`](https://docs.python.org/3/library/os.path.html#os.path.getctime)
@@ -49,29 +43,8 @@ use ruff_python_ast::ExprCall;
 pub(crate) struct OsPathGetctime;
 
 impl Violation for OsPathGetctime {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-
     #[derive_message_formats]
     fn message(&self) -> String {
         "`os.path.getctime` should be replaced by `Path.stat().st_ctime`".to_string()
     }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path.stat(...).st_ctime`".to_string())
-    }
-}
-
-/// PTH205
-pub(crate) fn os_path_getctime(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "getctime"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "stat().st_ctime",
-        "filename",
-        is_fix_os_path_getctime_enabled(checker.settings()),
-        OsPathGetctime,
-    );
 }

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/os_path_getmtime.rs

@@ -1,9 +1,6 @@
-use crate::checkers::ast::Checker;
-use crate::preview::is_fix_os_path_getmtime_enabled;
-use crate::rules::flake8_use_pathlib::helpers::check_os_pathlib_single_arg_calls;
-use crate::{FixAvailability, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::ExprCall;
+
+use crate::Violation;
 
 /// ## What it does
 /// Checks for uses of `os.path.getmtime`.
@@ -35,9 +32,6 @@ use ruff_python_ast::ExprCall;
 /// it can be less performant than the lower-level alternatives that work directly with strings,
 /// especially on older versions of Python.
 ///
-/// ## Fix Safety
-/// This rule's fix is marked as unsafe if the replacement would remove comments attached to the original expression.
-///
 /// ## References
 /// - [Python documentation: `Path.stat`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.stat)
 /// - [Python documentation: `os.path.getmtime`](https://docs.python.org/3/library/os.path.html#os.path.getmtime)
@@ -49,29 +43,8 @@ use ruff_python_ast::ExprCall;
 pub(crate) struct OsPathGetmtime;
 
 impl Violation for OsPathGetmtime {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-
     #[derive_message_formats]
     fn message(&self) -> String {
         "`os.path.getmtime` should be replaced by `Path.stat().st_mtime`".to_string()
     }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Replace with `Path.stat(...).st_mtime`".to_string())
-    }
-}
-
-/// PTH204
-pub(crate) fn os_path_getmtime(checker: &Checker, call: &ExprCall, segments: &[&str]) {
-    if segments != ["os", "path", "getmtime"] {
-        return;
-    }
-    check_os_pathlib_single_arg_calls(
-        checker,
-        call,
-        "stat().st_mtime",
-        "filename",
-        is_fix_os_path_getmtime_enabled(checker.settings()),
-        OsPathGetmtime,
-    );
 }