Add box to stmt

.claude/settings.local.json

@@ -1,67 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(cargo build:*)",
-      "Read(//home/micha/astral/discord.py/discord/**)",
-      "Bash(source:*)",
-      "Bash(./target/profiling/ty check:*)",
-      "Bash(tee:*)",
-      "Read(//home/micha/astral/discord.py/.venv/**)",
-      "Read(//home/micha/astral/discord.py/**)",
-      "Bash(perf record:*)",
-      "Bash(perf report:*)",
-      "Bash(time:*)",
-      "Bash(../ruff/target/profiling/ty check discord/audit_logs.py -vv)",
-      "Bash(sed:*)",
-      "Read(//home/micha/git/TypeScript/**)",
-      "Bash(cargo test:*)",
-      "Bash(MDTEST_TEST_FILTER='union_types.md - Union types - Unions of tuples' cargo test -p ty_python_semantic --test mdtest -- mdtest__union_types)",
-      "Bash(timeout 10 cargo test --package ty_python_semantic --lib types::tests::divergent_type)",
-      "Bash(timeout 30 cargo test:*)",
-      "Bash(git stash:*)",
-      "Bash(timeout 60 time:*)",
-      "Bash(for i in 1 2 3 4 5)",
-      "Bash(do echo \"Run $i:\")",
-      "Bash(done)",
-      "Bash(for i in 1 2 3)",
-      "Bash(cargo fuzz run:*)",
-      "Bash(timeout 60 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(for:*)",
-      "Bash(do echo \"=== Checking $crash ===\")",
-      "Bash(uvx ty@latest check \"$crash\")",
-      "Bash(do echo \"=== $crash ===\")",
-      "Bash(while read crash)",
-      "Bash(cargo fuzz cmin:*)",
-      "Bash(cargo +nightly fuzz cmin:*)",
-      "Bash(timeout 120 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(awk:*)",
-      "Bash(while read file)",
-      "Bash(cat:*)",
-      "Bash(uvx ty@latest:*)",
-      "Bash(do cp \"$crash\" /tmp/isolated_crash.py)",
-      "Bash(echo \"=== $crash ===\")",
-      "Bash(do echo \"=== test$i.py ===\")",
-      "Bash(do echo \"=== Testing $crash ===\")",
-      "Bash(tree:*)",
-      "Bash(cut:*)",
-      "Bash(grep:*)",
-      "Bash(ls:*)",
-      "Bash(xargs basename:*)",
-      "Bash(wc:*)",
-      "Bash(find:*)",
-      "Bash({} ;)",
-      "Bash(git checkout:*)",
-      "Bash(do)",
-      "Bash(if ! grep -q \"use crate::types\" \"$f\")",
-      "Bash(! grep -q \"crate::types::\" \"$f\")",
-      "Bash(then)",
-      "Bash(else)",
-      "Bash(fi)",
-      "Bash(1)",
-      "Bash(__NEW_LINE__ echo \"Done\")",
-      "Bash(rm:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

.gitattributes

@@ -22,7 +22,6 @@ crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_CR.py text eol=cr
 crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_LF.py text eol=lf
 
 crates/ruff_python_parser/resources/inline linguist-generated=true
-crates/ty_python_semantic/resources/mdtest/external/*.lock linguist-generated=true
 
 ruff.schema.json -diff linguist-generated=true text=auto eol=lf
 ty.schema.json -diff linguist-generated=true text=auto eol=lf

.github/actionlint.yaml

@@ -4,12 +4,10 @@
 self-hosted-runner:
   # Various runners we use that aren't recognized out-of-the-box by actionlint:
   labels:
-    - depot-ubuntu-24.04-4
     - depot-ubuntu-latest-8
     - depot-ubuntu-22.04-16
     - depot-ubuntu-22.04-32
     - depot-windows-2022-16
-    - depot-ubuntu-22.04-arm-4
     - github-windows-2025-x86_64-8
     - github-windows-2025-x86_64-16
     - codspeed-macro

.github/mypy-primer-ty.toml

@@ -4,6 +4,5 @@
 # Enable off-by-default rules.
 [rules]
 possibly-unresolved-reference = "warn"
-possibly-missing-import = "warn"
 unused-ignore-comment = "warn"
 division-by-zero = "warn"

.github/workflows/ci.yaml

@@ -952,7 +952,7 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -960,9 +960,9 @@ jobs:
           mode: simulation
           run: cargo codspeed run
 
-  benchmarks-instrumented-ty-build:
-    name: "benchmarks instrumented ty (build)"
-    runs-on: depot-ubuntu-24.04-4
+  benchmarks-instrumented-ty:
+    name: "benchmarks instrumented (ty)"
+    runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
       github.repository == 'astral-sh/ruff' &&
@@ -971,6 +971,9 @@ jobs:
         needs.determine_changes.outputs.ty == 'true'
       )
     timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -980,6 +983,7 @@ jobs:
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -990,64 +994,28 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-instrumented-ty-run:
-    name: "benchmarks instrumented ty (${{ matrix.benchmark }})"
-    runs-on: ubuntu-24.04
-    needs: benchmarks-instrumented-ty-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      fail-fast: false
-      matrix:
-        benchmark:
-          - "check_file|micro|anyio"
-          - "attrs|hydra|datetype"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4.3.0
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
         with:
           mode: simulation
-          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"
+          run: cargo codspeed run
 
-  benchmarks-walltime-build:
-    name: "benchmarks walltime (build)"
-    # We only run this job if `github.repository == 'astral-sh/ruff'`,
-    # so hardcoding depot here is fine
-    runs-on: depot-ubuntu-22.04-arm-4
+  benchmarks-walltime:
+    name: "benchmarks walltime (${{ matrix.benchmarks }})"
+    runs-on: codspeed-macro
     needs: determine_changes
     if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
+    strategy:
+      matrix:
+        benchmarks:
+          - "medium|multithreaded"
+          - "small|large"
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -1068,51 +1036,7 @@ jobs:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build -m walltime --features "codspeed,ty_walltime" --profile profiling --no-default-features -p ruff_benchmark
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-walltime-run:
-    name: "benchmarks walltime (${{ matrix.benchmark }})"
-    runs-on: codspeed-macro
-    needs: benchmarks-walltime-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      matrix:
-        benchmark:
-          - colour_science
-          - "pandas|tanjun|altair"
-          - "static_frame|sympy"
-          - "pydantic|multithreaded|freqtrade"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime
+        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -1123,4 +1047,4 @@ jobs:
           CODSPEED_PERF_ENABLED: false
         with:
           mode: walltime
-          run: cargo codspeed run --bench ty_walltime -m walltime "${{ matrix.benchmark }}"
+          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"

.github/workflows/daily_fuzz.yaml

@@ -62,7 +62,7 @@ jobs:
     name: Create an issue if the daily fuzz surfaced any bugs
     runs-on: ubuntu-latest
     needs: fuzz
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result != 'success' }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result == 'failure' }}
     permissions:
       issues: write
     steps:

.github/workflows/mypy_primer.yaml

@@ -6,11 +6,6 @@ on:
   pull_request:
     paths:
       - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
       - "crates/ruff_db"
       - "crates/ruff_python_ast"
       - "crates/ruff_python_parser"

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -123,7 +123,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -174,7 +174,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -250,7 +250,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive

.github/workflows/sync_typeshed.yaml

@@ -16,7 +16,8 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Formats the code again
+#    c. Attempts to update any snapshots that might have changed
+#       (this sub-step is allowed to fail)
 #    d. Commits the changes and pushes them to the same upstream branch
 #    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
@@ -197,6 +198,42 @@ jobs:
         run: |
           rm "${VENDORED_TYPESHED}/pyproject.toml"
           git commit -am "Remove pyproject.toml file"
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - name: "Install Rust toolchain"
+        if: ${{ success() }}
+        run: rustup show
+      - name: "Install mold"
+        if: ${{ success() }}
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Install cargo nextest"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-nextest
+      - name: "Install cargo insta"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-insta
+      - name: Update snapshots
+        if: ${{ success() }}
+        run: |
+          cargo r \
+          --profile=profiling \
+          -p ty_completion_eval \
+          -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
+
+          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
+          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
+          #
+          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
+          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
+          # We don't care about other tests failing here, we just want snapshots updated where possible,
+          # so we use `|| true` here to ignore the exit code.
+          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
+      - name: Commit snapshot changes
+        if: ${{ success() }}
+        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
       - name: Push changes upstream and create a PR
         if: ${{ success() }}
         run: |
@@ -208,7 +245,7 @@ jobs:
     name: Create an issue if the typeshed sync failed
     runs-on: ubuntu-latest
     needs: [sync, docstrings-windows, docstrings-macos-and-pr]
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result != 'success' || needs.docstrings-windows.result != 'success' || needs.docstrings-macos-and-pr.result != 'success') }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result == 'failure' || needs.docstrings-windows.result == 'failure' || needs.docstrings-macos-and-pr.result == 'failure') }}
     permissions:
       issues: write
     steps:

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

@@ -17,6 +17,7 @@ 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:
@@ -66,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --repository ruff \
@@ -111,13 +112,22 @@ jobs:
 
           cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"
 
-      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload full report"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         with:
-          name: full-report
-          path: dist/
+          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)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
 
       # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
       # Make sure to update the bot if you rename the artifact.

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

@@ -14,6 +14,7 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
 
 jobs:
   ty-ecosystem-report:
@@ -30,12 +31,12 @@ jobs:
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
         with:
-          enable-cache: true
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
           workspaces: "ruff"
-          lookup-only: false
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
 
       - name: Install Rust toolchain
         run: rustup show
@@ -51,7 +52,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --verbose \
@@ -69,10 +70,11 @@ jobs:
             ecosystem-diagnostics.json \
             --output dist/index.html
 
-      # NOTE: astral-sh-bot uses this artifact to publish the ecosystem report.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload ecosystem report"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}

.github/workflows/typing_conformance.yaml

@@ -6,11 +6,6 @@ on:
   pull_request:
     paths:
       - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
       - "crates/ruff_db"
       - "crates/ruff_python_ast"
       - "crates/ruff_python_parser"

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: |
     .github/workflows/release.yml|
     crates/ty_vendored/vendor/.*|
     crates/ty_project/resources/.*|
-    crates/ty_python_types/resources/corpus/.*|
+    crates/ty_python_semantic/resources/corpus/.*|
     crates/ty/docs/(configuration|rules|cli|environment).md|
     crates/ruff_benchmark/resources/.*|
     crates/ruff_linter/resources/.*|

CHANGELOG.md

@@ -1,96 +1,5 @@
 # Changelog
 
-## 0.14.10
-
-Released on 2025-12-18.
-
-### Preview features
-
-- [formatter] Fluent formatting of method chains ([#21369](https://github.com/astral-sh/ruff/pull/21369))
-- [formatter] Keep lambda parameters on one line and parenthesize the body if it expands ([#21385](https://github.com/astral-sh/ruff/pull/21385))
-- \[`flake8-implicit-str-concat`\] New rule to prevent implicit string concatenation in collections (`ISC004`) ([#21972](https://github.com/astral-sh/ruff/pull/21972))
-- \[`flake8-use-pathlib`\] Make fixes unsafe when types change in compound statements (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#22009](https://github.com/astral-sh/ruff/pull/22009))
-- \[`refurb`\] Extend support for `Path.open` (`FURB101`, `FURB103`) ([#21080](https://github.com/astral-sh/ruff/pull/21080))
-
-### Bug fixes
-
-- \[`pyupgrade`\] Fix parsing named Unicode escape sequences (`UP032`) ([#21901](https://github.com/astral-sh/ruff/pull/21901))
-
-### Rule changes
-
-- \[`eradicate`\] Ignore `ruff:disable` and `ruff:enable` comments in `ERA001` ([#22038](https://github.com/astral-sh/ruff/pull/22038))
-- \[`flake8-pytest-style`\] Allow `match` and `check` keyword arguments without an expected exception type (`PT010`) ([#21964](https://github.com/astral-sh/ruff/pull/21964))
-- [syntax-errors] Annotated name cannot be global ([#20868](https://github.com/astral-sh/ruff/pull/20868))
-
-### Documentation
-
-- Add `uv` and `ty` to the Ruff README ([#21996](https://github.com/astral-sh/ruff/pull/21996))
-- Document known lambda formatting deviations from Black ([#21954](https://github.com/astral-sh/ruff/pull/21954))
-- Update `setup.md` ([#22024](https://github.com/astral-sh/ruff/pull/22024))
-- \[`flake8-bandit`\] Fix broken link (`S704`) ([#22039](https://github.com/astral-sh/ruff/pull/22039))
-
-### Other changes
-
-- Fix playground Share button showing "Copied!" before clipboard copy completes ([#21942](https://github.com/astral-sh/ruff/pull/21942))
-
-### Contributors
-
-- [@dylwil3](https://github.com/dylwil3)
-- [@charliecloudberry](https://github.com/charliecloudberry)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@chirizxc](https://github.com/chirizxc)
-- [@ntBre](https://github.com/ntBre)
-- [@zanieb](https://github.com/zanieb)
-- [@amyreese](https://github.com/amyreese)
-- [@hauntsaninja](https://github.com/hauntsaninja)
-- [@11happy](https://github.com/11happy)
-- [@mahiro72](https://github.com/mahiro72)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@phongddo](https://github.com/phongddo)
-- [@PeterJCLaw](https://github.com/PeterJCLaw)
-
-## 0.14.9
-
-Released on 2025-12-11.
-
-### Preview features
-
-- \[`ruff`\] New `RUF100` diagnostics for unused range suppressions ([#21783](https://github.com/astral-sh/ruff/pull/21783))
-- \[`pylint`\] Detect subclasses of builtin exceptions (`PLW0133`) ([#21382](https://github.com/astral-sh/ruff/pull/21382))
-
-### Bug fixes
-
-- Fix comment placement in lambda parameters ([#21868](https://github.com/astral-sh/ruff/pull/21868))
-- Skip over trivia tokens after re-lexing ([#21895](https://github.com/astral-sh/ruff/pull/21895))
-- \[`flake8-bandit`\] Fix false positive when using non-standard `CSafeLoader` path (S506). ([#21830](https://github.com/astral-sh/ruff/pull/21830))
-- \[`flake8-bugbear`\] Accept immutable slice default arguments (`B008`) ([#21823](https://github.com/astral-sh/ruff/pull/21823))
-
-### Rule changes
-
-- \[`pydocstyle`\] Suppress `D417` for parameters with `Unpack` annotations ([#21816](https://github.com/astral-sh/ruff/pull/21816))
-
-### Performance
-
-- Use `memchr` for computing line indexes ([#21838](https://github.com/astral-sh/ruff/pull/21838))
-
-### Documentation
-
-- Document `*.pyw` is included by default in preview ([#21885](https://github.com/astral-sh/ruff/pull/21885))
-- Document range suppressions, reorganize suppression docs ([#21884](https://github.com/astral-sh/ruff/pull/21884))
-- Update mkdocs-material to 9.7.0 (Insiders now free) ([#21797](https://github.com/astral-sh/ruff/pull/21797))
-
-### Contributors
-
-- [@Avasam](https://github.com/Avasam)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@amyreese](https://github.com/amyreese)
-- [@phongddo](https://github.com/phongddo)
-- [@prakhar1144](https://github.com/prakhar1144)
-- [@mahiro72](https://github.com/mahiro72)
-- [@ntBre](https://github.com/ntBre)
-- [@LoicRiegel](https://github.com/LoicRiegel)
-
 ## 0.14.8
 
 Released on 2025-12-04.

Cargo.lock

@@ -254,21 +254,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -959,18 +944,6 @@ dependencies = [
  "parking_lot_core",
 ]
 
-[[package]]
-name = "datatest-stable"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a867d7322eb69cf3a68a5426387a25b45cb3b9c5ee41023ee6cea92e2afadd82"
-dependencies = [
- "camino",
- "fancy-regex",
- "libtest-mimic 0.8.1",
- "walkdir",
-]
-
 [[package]]
 name = "derive-where"
 version = "1.6.0"
@@ -1004,6 +977,27 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dir-test"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
+dependencies = [
+ "dir-test-macros",
+]
+
+[[package]]
+name = "dir-test-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -1144,17 +1138,6 @@ dependencies = [
  "windows-sys 0.61.0",
 ]
 
-[[package]]
-name = "fancy-regex"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
-dependencies = [
- "bit-set",
- "regex-automata",
- "regex-syntax",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1642,6 +1625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0"
 dependencies = [
  "console 0.15.11",
+ "globset",
  "once_cell",
  "pest",
  "pest_derive",
@@ -1649,6 +1633,7 @@ dependencies = [
  "ron",
  "serde",
  "similar",
+ "walkdir",
 ]
 
 [[package]]
@@ -1934,18 +1919,6 @@ dependencies = [
  "threadpool",
 ]
 
-[[package]]
-name = "libtest-mimic"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
-dependencies = [
- "anstream",
- "anstyle",
- "clap",
- "escape8259",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -2887,7 +2860,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3083,7 +3056,6 @@ dependencies = [
  "ty",
  "ty_project",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "url",
 ]
@@ -3130,9 +3102,7 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "zip",
 ]
 
@@ -3148,7 +3118,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3308,7 +3278,6 @@ dependencies = [
  "anyhow",
  "clap",
  "countme",
- "datatest-stable",
  "insta",
  "itertools 0.14.0",
  "memchr",
@@ -3378,7 +3347,6 @@ dependencies = [
  "bitflags 2.10.0",
  "bstr",
  "compact_str",
- "datatest-stable",
  "get-size2",
  "insta",
  "itertools 0.14.0",
@@ -3507,7 +3475,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.10"
+version = "0.14.8"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3622,8 +3590,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3647,13 +3615,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 
 [[package]]
 name = "salsa-macros"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4343,7 +4311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fe242ee9e646acec9ab73a5c540e8543ed1b107f0ce42be831e0775d423c396"
 dependencies = [
  "ignore",
- "libtest-mimic 0.7.3",
+ "libtest-mimic",
  "snapbox",
 ]
 
@@ -4372,13 +4340,11 @@ dependencies = [
  "ruff_python_trivia",
  "salsa",
  "tempfile",
- "tikv-jemallocator",
  "toml",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
  "ty_combine",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
  "ty_server",
@@ -4393,6 +4359,7 @@ dependencies = [
  "ordermap",
  "ruff_db",
  "ruff_python_ast",
+ "ty_python_semantic",
 ]
 
 [[package]]
@@ -4410,8 +4377,8 @@ dependencies = [
  "tempfile",
  "toml",
  "ty_ide",
- "ty_module_resolver",
  "ty_project",
+ "ty_python_semantic",
  "walkdir",
 ]
 
@@ -4441,33 +4408,8 @@ dependencies = [
  "salsa",
  "smallvec",
  "tracing",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
- "ty_python_types",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_module_resolver"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "camino",
- "compact_str",
- "get-size2",
- "insta",
- "ruff_db",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_stdlib",
- "rustc-hash",
- "salsa",
- "strum",
- "strum_macros",
- "tempfile",
- "thiserror 2.0.17",
- "tracing",
  "ty_vendored",
 ]
 
@@ -4505,9 +4447,7 @@ dependencies = [
  "toml",
  "tracing",
  "ty_combine",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "ty_vendored",
 ]
@@ -4521,12 +4461,19 @@ dependencies = [
  "bitvec",
  "camino",
  "colored 3.0.0",
+ "compact_str",
+ "dir-test",
+ "drop_bomb",
  "get-size2",
+ "glob",
  "hashbrown 0.16.1",
  "indexmap",
+ "indoc",
  "insta",
  "itertools 0.14.0",
+ "memchr",
  "ordermap",
+ "pretty_assertions",
  "quickcheck",
  "quickcheck_macros",
  "ruff_annotate_snippets",
@@ -4536,7 +4483,9 @@ dependencies = [
  "ruff_macros",
  "ruff_memory_usage",
  "ruff_python_ast",
+ "ruff_python_literal",
  "ruff_python_parser",
+ "ruff_python_stdlib",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
@@ -4550,57 +4499,10 @@ dependencies = [
  "strsim",
  "strum",
  "strum_macros",
+ "tempfile",
+ "test-case",
  "thiserror 2.0.17",
  "tracing",
- "ty_combine",
- "ty_module_resolver",
- "ty_static",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_python_types"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "bitflags 2.10.0",
- "camino",
- "compact_str",
- "datatest-stable",
- "drop_bomb",
- "get-size2",
- "glob",
- "indexmap",
- "indoc",
- "insta",
- "itertools 0.14.0",
- "memchr",
- "ordermap",
- "pretty_assertions",
- "quickcheck",
- "quickcheck_macros",
- "ruff_db",
- "ruff_diagnostics",
- "ruff_macros",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_literal",
- "ruff_python_parser",
- "ruff_python_stdlib",
- "ruff_source_file",
- "ruff_text_size",
- "rustc-hash",
- "salsa",
- "schemars",
- "serde",
- "serde_json",
- "smallvec",
- "static_assertions",
- "strum",
- "strum_macros",
- "test-case",
- "tracing",
- "ty_module_resolver",
  "ty_python_semantic",
  "ty_static",
  "ty_test",
@@ -4640,7 +4542,6 @@ dependencies = [
  "tracing-subscriber",
  "ty_combine",
  "ty_ide",
- "ty_module_resolver",
  "ty_project",
  "ty_python_semantic",
 ]
@@ -4681,9 +4582,7 @@ dependencies = [
  "thiserror 2.0.17",
  "toml",
  "tracing",
- "ty_module_resolver",
  "ty_python_semantic",
- "ty_python_types",
  "ty_static",
  "ty_vendored",
 ]

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.90"
+rust-version = "1.89"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -45,10 +45,8 @@ ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
 ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
-ty_module_resolver = { path = "crates/ty_module_resolver" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
-ty_python_types = { path = "crates/ty_python_types" }
 ty_server = { path = "crates/ty_server" }
 ty_static = { path = "crates/ty_static" }
 ty_test = { path = "crates/ty_test" }
@@ -83,7 +81,7 @@ compact_str = "0.9.0"
 criterion = { version = "0.7.0", default-features = false }
 crossbeam = { version = "0.8.4" }
 dashmap = { version = "6.0.1" }
-datatest-stable = { version = "0.3.3" }
+dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
 etcetera = { version = "0.11.0" }
@@ -148,7 +146,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "ce80691fa0b87dc2fd2235a26544e63e5e43d8d3", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",

README.md

@@ -57,11 +57,8 @@ Ruff is extremely actively developed and used in major open-source projects like
 
 ...and [many more](#whos-using-ruff).
 
-Ruff is backed by [Astral](https://astral.sh), the creators of
-[uv](https://github.com/astral-sh/uv) and [ty](https://github.com/astral-sh/ty).
-
-Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff), or the
-original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
+Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
+or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
 ## Testimonials
 
@@ -150,8 +147,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.14.10/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.10/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.8/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.8/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -184,7 +181,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.14.10
+  rev: v0.14.8
   hooks:
     # Run the linter.
     - id: ruff-check

_typos.toml

@@ -4,7 +4,6 @@ extend-exclude = [
     "crates/ty_vendored/vendor/**/*",
     "**/resources/**/*",
     "**/snapshots/**/*",
-    "crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs",
     # Completion tests tend to have a lot of incomplete
     # words naturally. It's annoying to have to make all
     # of them actually words. So just ignore typos here.

crates/ruff/Cargo.toml

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

crates/ruff/src/args.rs

@@ -10,7 +10,7 @@ use anyhow::bail;
 use clap::builder::Styles;
 use clap::builder::styling::{AnsiColor, Effects};
 use clap::builder::{TypedValueParser, ValueParserFactory};
-use clap::{Parser, Subcommand};
+use clap::{Parser, Subcommand, command};
 use colored::Colorize;
 use itertools::Itertools;
 use path_absolutize::path_dedot;

crates/ruff/src/lib.rs

@@ -9,7 +9,7 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use clap::CommandFactory;
 use colored::Colorize;
-use log::error;
+use log::{error, warn};
 use notify::{RecursiveMode, Watcher, recommended_watcher};
 
 use args::{GlobalConfigArgs, ServerCommand};

crates/ruff/tests/cli/snapshots/cli__format__output_format_github.snap

@@ -14,6 +14,6 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,endLine=2::input.py:1:1: unformatted: File would be reformatted
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
 
 ----- stderr -----

crates/ruff_benchmark/Cargo.toml

@@ -19,32 +19,32 @@ doctest = false
 [[bench]]
 name = "linter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "lexer"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "parser"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "formatter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "ty"
 harness = false
-required-features = ["ty_instrumented"]
+required-features = ["instrumented"]
 
 [[bench]]
 name = "ty_walltime"
 harness = false
-required-features = ["ty_walltime"]
+required-features = ["walltime"]
 
 [dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
@@ -67,32 +67,25 @@ tracing = { workspace = true }
 workspace = true
 
 [features]
-default = ["ty_instrumented", "ty_walltime", "ruff_instrumented"]
-# Enables the ruff instrumented benchmarks
-ruff_instrumented = [
+default = ["instrumented", "walltime"]
+# Enables the benchmark that should only run with codspeed's instrumented runner
+instrumented = [
     "criterion",
     "ruff_linter",
     "ruff_python_formatter",
     "ruff_python_parser",
     "ruff_python_trivia",
-    "mimalloc",
-    "tikv-jemallocator",
-]
-# Enables the ty instrumented benchmarks
-ty_instrumented = [
-    "criterion",
     "ty_project",
-    "ruff_python_trivia",
 ]
 codspeed = ["codspeed-criterion-compat"]
-# Enables the ty_walltime benchmarks
-ty_walltime = ["ruff_db/os", "ty_project", "divan"]
+# Enables benchmark that should only run with codspeed's walltime runner.
+walltime = ["ruff_db/os", "ty_project", "divan"]
 
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true, optional = true }
+[target.'cfg(target_os = "windows")'.dev-dependencies]
+mimalloc = { workspace = true }
 
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
+tikv-jemallocator = { workspace = true }
 
 [dev-dependencies]
 rustc-hash = { workspace = true }

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    13106,
+    13030,
 );
 
 static TANJUN: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    1100,
+    950,
 );
 
 #[track_caller]
@@ -235,55 +235,30 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
         });
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn altair(bencher: Bencher) {
-    run_single_threaded(bencher, &ALTAIR);
+#[bench(args=[&ALTAIR, &FREQTRADE, &TANJUN], sample_size=2, sample_count=3)]
+fn small(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn freqtrade(bencher: Bencher) {
-    run_single_threaded(bencher, &FREQTRADE);
+#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
+fn medium(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn tanjun(bencher: Bencher) {
-    run_single_threaded(bencher, &TANJUN);
+#[bench(args=[&SYMPY, &PYDANTIC], sample_size=1, sample_count=2)]
+fn large(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }
 
-#[bench(sample_size = 2, sample_count = 3)]
-fn pydantic(bencher: Bencher) {
-    run_single_threaded(bencher, &PYDANTIC);
-}
-
-#[bench(sample_size = 1, sample_count = 3)]
-fn static_frame(bencher: Bencher) {
-    run_single_threaded(bencher, &STATIC_FRAME);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn colour_science(bencher: Bencher) {
-    run_single_threaded(bencher, &COLOUR_SCIENCE);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn pandas(bencher: Bencher) {
-    run_single_threaded(bencher, &PANDAS);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn sympy(bencher: Bencher) {
-    run_single_threaded(bencher, &SYMPY);
-}
-
-#[bench(sample_size = 3, sample_count = 8)]
-fn multithreaded(bencher: Bencher) {
+#[bench(args=[&ALTAIR], sample_size=3, sample_count=8)]
+fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
 
     bencher
-        .with_inputs(|| ALTAIR.setup_iteration())
+        .with_inputs(|| benchmark.setup_iteration())
         .bench_local_values(|db| {
             thread_pool.install(|| {
-                check_project(&db, ALTAIR.project.name, ALTAIR.max_diagnostics);
+                check_project(&db, benchmark.project.name, benchmark.max_diagnostics);
                 db
             })
         });

crates/ruff_benchmark/src/lib.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-#[cfg(any(feature = "ty_instrumented", feature = "ruff_instrumented"))]
+#[cfg(feature = "instrumented")]
 pub mod criterion;
 pub mod real_world_projects;
 

crates/ruff_db/src/cancellation.rs

@@ -1,51 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-/// Signals a [`CancellationToken`] that it should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationTokenSource {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl Default for CancellationTokenSource {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CancellationTokenSource {
-    pub fn new() -> Self {
-        Self {
-            cancelled: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    pub fn is_cancellation_requested(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    /// Creates a new token that uses this source.
-    pub fn token(&self) -> CancellationToken {
-        CancellationToken {
-            cancelled: self.cancelled.clone(),
-        }
-    }
-
-    /// Requests cancellation for operations using this token.
-    pub fn cancel(&self) {
-        self.cancelled
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-}
-
-/// Token signals whether an operation should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationToken {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl CancellationToken {
-    pub fn is_cancelled(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-}

crates/ruff_db/src/diagnostic/mod.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fmt::Formatter, path::Path, sync::Arc};
+use std::{fmt::Formatter, path::Path, sync::Arc};
 
 use ruff_diagnostics::{Applicability, Fix};
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};
@@ -11,7 +11,6 @@ pub use self::render::{
     ceil_char_boundary,
     github::{DisplayGithubDiagnostics, GithubRenderer},
 };
-use crate::cancellation::CancellationToken;
 use crate::{Db, files::File};
 
 mod render;
@@ -411,6 +410,11 @@ impl Diagnostic {
         self.id().is_invalid_syntax()
     }
 
+    /// Returns the message body to display to the user.
+    pub fn body(&self) -> &str {
+        self.primary_message()
+    }
+
     /// Returns the message of the first sub-diagnostic with a `Help` severity.
     ///
     /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
@@ -1308,8 +1312,6 @@ pub struct DisplayDiagnosticConfig {
     show_fix_diff: bool,
     /// The lowest applicability that should be shown when reporting diagnostics.
     fix_applicability: Applicability,
-
-    cancellation_token: Option<CancellationToken>,
 }
 
 impl DisplayDiagnosticConfig {
@@ -1383,20 +1385,6 @@ impl DisplayDiagnosticConfig {
     pub fn fix_applicability(&self) -> Applicability {
         self.fix_applicability
     }
-
-    pub fn with_cancellation_token(
-        mut self,
-        token: Option<CancellationToken>,
-    ) -> DisplayDiagnosticConfig {
-        self.cancellation_token = token;
-        self
-    }
-
-    pub fn is_canceled(&self) -> bool {
-        self.cancellation_token
-            .as_ref()
-            .is_some_and(|token| token.is_cancelled())
-    }
 }
 
 impl Default for DisplayDiagnosticConfig {
@@ -1410,7 +1398,6 @@ impl Default for DisplayDiagnosticConfig {
             show_fix_status: false,
             show_fix_diff: false,
             fix_applicability: Applicability::Safe,
-            cancellation_token: None,
         }
     }
 }
@@ -1487,15 +1474,6 @@ pub enum ConciseMessage<'a> {
     Custom(&'a str),
 }
 
-impl<'a> ConciseMessage<'a> {
-    pub fn to_str(&self) -> Cow<'a, str> {
-        match self {
-            ConciseMessage::MainDiagnostic(s) | ConciseMessage::Custom(s) => Cow::Borrowed(s),
-            ConciseMessage::Both { .. } => Cow::Owned(self.to_string()),
-        }
-    }
-}
-
 impl std::fmt::Display for ConciseMessage<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match *self {
@@ -1512,16 +1490,6 @@ impl std::fmt::Display for ConciseMessage<'_> {
     }
 }
 
-#[cfg(feature = "serde")]
-impl serde::Serialize for ConciseMessage<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.collect_str(self)
-    }
-}
-
 /// A diagnostic message string.
 ///
 /// This is, for all intents and purposes, equivalent to a `Box<str>`.

crates/ruff_db/src/diagnostic/render/azure.rs

@@ -52,7 +52,7 @@ impl AzureRenderer<'_> {
                 f,
                 "code={code};]{body}",
                 code = diag.secondary_code_or_id(),
-                body = diag.concise_message(),
+                body = diag.body(),
             )?;
         }
 

crates/ruff_db/src/diagnostic/render/concise.rs

@@ -28,10 +28,6 @@ impl<'a> ConciseRenderer<'a> {
 
         let sep = fmt_styled(":", stylesheet.separator);
         for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
             if let Some(span) = diag.primary_span() {
                 write!(
                     f,

crates/ruff_db/src/diagnostic/render/full.rs

@@ -53,10 +53,6 @@ impl<'a> FullRenderer<'a> {
             .hyperlink(stylesheet.hyperlink);
 
         for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
             let resolved = Resolved::new(self.resolver, diag, self.config);
             let renderable = resolved.to_renderable(self.config.context);
             for diag in renderable.diagnostics.iter() {

crates/ruff_db/src/diagnostic/render/github.rs

@@ -49,26 +49,14 @@ impl<'a> GithubRenderer<'a> {
                 }
                 .unwrap_or_default();
 
-                // GitHub Actions workflow commands have constraints on error annotations:
-                // - `col` and `endColumn` cannot be set if `line` and `endLine` are different
-                // See: https://github.com/astral-sh/ruff/issues/22074
-                if start_location.line == end_location.line {
-                    write!(
-                        f,
-                        ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                        row = start_location.line,
-                        column = start_location.column,
-                        end_row = end_location.line,
-                        end_column = end_location.column,
-                    )?;
-                } else {
-                    write!(
-                        f,
-                        ",line={row},endLine={end_row}::",
-                        row = start_location.line,
-                        end_row = end_location.line,
-                    )?;
-                }
+                write!(
+                    f,
+                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                    row = start_location.line,
+                    column = start_location.column,
+                    end_row = end_location.line,
+                    end_column = end_location.column,
+                )?;
 
                 write!(
                     f,
@@ -87,7 +75,7 @@ impl<'a> GithubRenderer<'a> {
                 write!(f, "{id}:", id = diagnostic.id())?;
             }
 
-            writeln!(f, " {}", diagnostic.concise_message())?;
+            writeln!(f, " {}", diagnostic.body())?;
         }
 
         Ok(())

crates/ruff_db/src/diagnostic/render/gitlab.rs

@@ -98,7 +98,7 @@ impl Serialize for SerializedMessages<'_> {
             }
             fingerprints.insert(message_fingerprint);
 
-            let description = diagnostic.concise_message();
+            let description = diagnostic.body();
             let check_name = diagnostic.secondary_code_or_id();
             let severity = match diagnostic.severity() {
                 Severity::Info => "info",

crates/ruff_db/src/diagnostic/render/json.rs

@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;
 
-use crate::diagnostic::{ConciseMessage, Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
 
 use super::FileResolver;
 
@@ -101,7 +101,7 @@ pub(super) fn diagnostic_to_json<'a>(
         JsonDiagnostic {
             code: diagnostic.secondary_code_or_id(),
             url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
             fix,
             cell: notebook_cell_index,
             location: start_location.map(JsonLocation::from),
@@ -113,7 +113,7 @@ pub(super) fn diagnostic_to_json<'a>(
         JsonDiagnostic {
             code: diagnostic.secondary_code_or_id(),
             url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
             fix,
             cell: notebook_cell_index,
             location: Some(start_location.unwrap_or_default().into()),
@@ -226,7 +226,7 @@ pub(crate) struct JsonDiagnostic<'a> {
     filename: Option<&'a str>,
     fix: Option<JsonFix<'a>>,
     location: Option<JsonLocation>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
     noqa_row: Option<OneIndexed>,
     url: Option<&'a str>,
 }

crates/ruff_db/src/diagnostic/render/junit.rs

@@ -56,17 +56,17 @@ impl<'a> JunitRenderer<'a> {
                         start_location: location,
                     } = diagnostic;
                     let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.concise_message().to_str());
+                    status.set_message(diagnostic.body());
 
                     if let Some(location) = location {
                         status.set_description(format!(
                             "line {row}, col {col}, {body}",
                             row = location.line,
                             col = location.column,
-                            body = diagnostic.concise_message()
+                            body = diagnostic.body()
                         ));
                     } else {
-                        status.set_description(diagnostic.concise_message().to_str());
+                        status.set_description(diagnostic.body());
                     }
 
                     let code = diagnostic

crates/ruff_db/src/diagnostic/render/pylint.rs

@@ -55,7 +55,7 @@ impl PylintRenderer<'_> {
                 f,
                 "{path}:{row}: [{code}] {body}",
                 path = filename,
-                body = diagnostic.concise_message()
+                body = diagnostic.body()
             )?;
         }
 

crates/ruff_db/src/diagnostic/render/rdjson.rs

@@ -5,7 +5,7 @@ use ruff_diagnostics::{Edit, Fix};
 use ruff_source_file::{LineColumn, SourceCode};
 use ruff_text_size::Ranged;
 
-use crate::diagnostic::{ConciseMessage, Diagnostic};
+use crate::diagnostic::Diagnostic;
 
 use super::FileResolver;
 
@@ -76,7 +76,7 @@ fn diagnostic_to_rdjson<'a>(
     let edits = diagnostic.fix().map(Fix::edits).unwrap_or_default();
 
     RdjsonDiagnostic {
-        message: diagnostic.concise_message(),
+        message: diagnostic.body(),
         location,
         code: RdjsonCode {
             value: diagnostic
@@ -155,7 +155,7 @@ struct RdjsonDiagnostic<'a> {
     code: RdjsonCode<'a>,
     #[serde(skip_serializing_if = "Option::is_none")]
     location: Option<RdjsonLocation<'a>>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     suggestions: Vec<RdjsonSuggestion<'a>>,
 }

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__syntax_errors.snap

@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,endLine=2::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,endLine=4::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline

crates/ruff_db/src/lib.rs

@@ -12,7 +12,6 @@ use std::hash::BuildHasherDefault;
 use std::num::NonZeroUsize;
 use ty_static::EnvVars;
 
-pub mod cancellation;
 pub mod diagnostic;
 pub mod display;
 pub mod file_revision;

crates/ruff_db/src/system/os.rs

@@ -275,16 +275,16 @@ impl OsSystem {
     /// instead of at least one system call for each component between `path` and `prefix`.
     ///
     /// However, using `canonicalize` to resolve the path's casing doesn't work in two cases:
-    /// * if `path` is a symlink, `canonicalize` returns the symlink's target and not the symlink's source path.
-    /// * on Windows: If `path` is a mapped network drive, `canonicalize` returns the UNC path
-    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` returns `\\?\UNC\server\share`).
+    /// * if `path` is a symlink because `canonicalize` then returns the symlink's target and not the symlink's source path.
+    /// * on Windows: If `path` is a mapped network drive because `canonicalize` then returns the UNC path
+    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` then returns `\\?\UNC\server\share`).
     ///
     /// Symlinks and mapped network drives should be rare enough that this fast path is worth trying first,
     /// even if it comes at a cost for those rare use cases.
     fn path_exists_case_sensitive_fast(&self, path: &SystemPath) -> Option<bool> {
         // This is a more forgiving version of `dunce::simplified` that removes all `\\?\` prefixes on Windows.
         // We use this more forgiving version because we don't intend on using either path for anything other than comparison
-        // and the prefix is only relevant when passing the path to other programs and it's longer than 200 something
+        // and the prefix is only relevant when passing the path to other programs and its longer than 200 something
         // characters.
         fn simplify_ignore_verbatim(path: &SystemPath) -> &SystemPath {
             if cfg!(windows) {
@@ -298,7 +298,9 @@ impl OsSystem {
             }
         }
 
-        let Ok(canonicalized) = path.as_std_path().canonicalize() else {
+        let simplified = simplify_ignore_verbatim(path);
+
+        let Ok(canonicalized) = simplified.as_std_path().canonicalize() else {
             // The path doesn't exist or can't be accessed. The path doesn't exist.
             return Some(false);
         };
@@ -307,13 +309,12 @@ impl OsSystem {
             // The original path is valid UTF8 but the canonicalized path isn't. This definitely suggests
             // that a symlink is involved. Fall back to the slow path.
             tracing::debug!(
-                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{path}` is not valid UTF-8"
+                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{simplified}` is not valid UTF-8"
             );
             return None;
         };
 
         let simplified_canonicalized = simplify_ignore_verbatim(&canonicalized);
-        let simplified = simplify_ignore_verbatim(path);
 
         // Test if the paths differ by anything other than casing. If so, that suggests that
         // `path` pointed to a symlink (or some other none reversible path normalization happened).

crates/ruff_db/src/system/test.rs

@@ -1,6 +1,5 @@
 use glob::PatternError;
 use ruff_notebook::{Notebook, NotebookError};
-use rustc_hash::FxHashMap;
 use std::panic::RefUnwindSafe;
 use std::sync::{Arc, Mutex};
 
@@ -21,44 +20,18 @@ use super::walk_directory::WalkDirectoryBuilder;
 ///
 /// ## Warning
 /// Don't use this system for production code. It's intended for testing only.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TestSystem {
     inner: Arc<dyn WritableSystem + RefUnwindSafe + Send + Sync>,
-    /// Environment variable overrides. If a key is present here, it takes precedence
-    /// over the inner system's environment variables.
-    env_overrides: Arc<Mutex<FxHashMap<String, Option<String>>>>,
-}
-
-impl Clone for TestSystem {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            env_overrides: self.env_overrides.clone(),
-        }
-    }
 }
 
 impl TestSystem {
     pub fn new(inner: impl WritableSystem + RefUnwindSafe + Send + Sync + 'static) -> Self {
         Self {
             inner: Arc::new(inner),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 
-    /// Sets an environment variable override. This takes precedence over the inner system.
-    pub fn set_env_var(&self, name: impl Into<String>, value: impl Into<String>) {
-        self.env_overrides
-            .lock()
-            .unwrap()
-            .insert(name.into(), Some(value.into()));
-    }
-
-    /// Removes an environment variable override, making it appear as not set.
-    pub fn remove_env_var(&self, name: impl Into<String>) {
-        self.env_overrides.lock().unwrap().insert(name.into(), None);
-    }
-
     /// Returns the [`InMemorySystem`].
     ///
     /// ## Panics
@@ -174,18 +147,6 @@ impl System for TestSystem {
         self.system().case_sensitivity()
     }
 
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        // Check overrides first
-        if let Some(override_value) = self.env_overrides.lock().unwrap().get(name) {
-            return match override_value {
-                Some(value) => Ok(value.clone()),
-                None => Err(std::env::VarError::NotPresent),
-            };
-        }
-        // Fall back to inner system
-        self.system().env_var(name)
-    }
-
     fn dyn_clone(&self) -> Box<dyn System> {
         Box::new(self.clone())
     }
@@ -195,7 +156,6 @@ impl Default for TestSystem {
     fn default() -> Self {
         Self {
             inner: Arc::new(InMemorySystem::default()),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 }

crates/ruff_dev/Cargo.toml

@@ -14,7 +14,6 @@ license = { workspace = true }
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }

crates/ruff_dev/src/generate_ty_options.rs

@@ -1,13 +1,11 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.
 
-use std::borrow::Cow;
-use std::{fmt::Write, path::PathBuf};
-
 use anyhow::bail;
 use itertools::Itertools;
 use pretty_assertions::StrComparison;
+use std::{fmt::Write, path::PathBuf};
+
 use ruff_options_metadata::{OptionField, OptionSet, OptionsMetadata, Visit};
-use ruff_python_trivia::textwrap;
 use ty_project::metadata::Options;
 
 use crate::{
@@ -146,8 +144,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
 
     if let Some(deprecated) = &field.deprecated {
-        output.push_str("!!! warning \"Deprecated\"\n");
-        output.push_str("    This option has been deprecated");
+        output.push_str("> [!WARN] \"Deprecated\"\n");
+        output.push_str("> This option has been deprecated");
 
         if let Some(since) = deprecated.since {
             write!(output, " in {since}").unwrap();
@@ -167,69 +165,61 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     let _ = writeln!(output, "**Default value**: `{}`", field.default);
     output.push('\n');
     let _ = writeln!(output, "**Type**: `{}`", field.value_type);
-
     output.push('\n');
-    output.push_str("**Example usage**:\n\n");
+    output.push_str("**Example usage** (`pyproject.toml`):\n\n");
+    output.push_str(&format_example(
+        &format_header(
+            field.scope,
+            field.example,
+            parents,
+            ConfigurationFile::PyprojectToml,
+        ),
+        field.example,
+    ));
+    output.push('\n');
+}
 
-    for configuration_file in [ConfigurationFile::PyprojectToml, ConfigurationFile::TyToml] {
-        let (header, example) =
-            format_snippet(field.scope, field.example, parents, configuration_file);
-        output.push_str(&format_tab(configuration_file.name(), &header, &example));
-
-        output.push('\n');
+fn format_example(header: &str, content: &str) -> String {
+    if header.is_empty() {
+        format!("```toml\n{content}\n```\n",)
+    } else {
+        format!("```toml\n{header}\n{content}\n```\n",)
     }
 }
 
-fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
-    let header = if header.is_empty() {
-        String::new()
-    } else {
-        format!("\n    {header}")
-    };
-    format!(
-        "=== \"{}\"\n\n    ```toml{}\n{}\n    ```\n",
-        tab_name,
-        header,
-        textwrap::indent(content, "    ")
-    )
-}
 /// Format the TOML header for the example usage for a given option.
 ///
-/// For example: `[tool.ty.rules]`.
-fn format_snippet<'a>(
+/// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
+fn format_header(
     scope: Option<&str>,
-    example: &'a str,
+    example: &str,
     parents: &[Set],
     configuration: ConfigurationFile,
-) -> (String, Cow<'a, str>) {
-    let mut example = Cow::Borrowed(example);
+) -> String {
+    let tool_parent = match configuration {
+        ConfigurationFile::PyprojectToml => Some("tool.ty"),
+        ConfigurationFile::TyToml => None,
+    };
 
-    let header = configuration
-        .parent_table()
+    let header = tool_parent
         .into_iter()
         .chain(parents.iter().filter_map(|parent| parent.name()))
         .chain(scope)
         .join(".");
 
-    // Rewrite examples starting with `[tool.ty]` or `[[tool.ty]]` to their `ty.toml` equivalent.
-    if matches!(configuration, ConfigurationFile::TyToml) {
-        example = example.replace("[tool.ty.", "[").into();
-    }
-
     // Ex) `[[tool.ty.xx]]`
     if example.starts_with(&format!("[[{header}")) {
-        return (String::new(), example);
+        return String::new();
     }
-
     // Ex) `[tool.ty.rules]`
     if example.starts_with(&format!("[{header}")) {
-        return (String::new(), example);
+        return String::new();
     }
 
     if header.is_empty() {
-        (String::new(), example)
+        String::new()
     } else {
-        (format!("[{header}]"), example)
+        format!("[{header}]")
     }
 }
 
@@ -252,25 +242,10 @@ impl Visit for CollectOptionsVisitor {
 #[derive(Debug, Copy, Clone)]
 enum ConfigurationFile {
     PyprojectToml,
+    #[expect(dead_code)]
     TyToml,
 }
 
-impl ConfigurationFile {
-    const fn name(self) -> &'static str {
-        match self {
-            Self::PyprojectToml => "pyproject.toml",
-            Self::TyToml => "ty.toml",
-        }
-    }
-
-    const fn parent_table(self) -> Option<&'static str> {
-        match self {
-            Self::PyprojectToml => Some("tool.ty"),
-            Self::TyToml => None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

crates/ruff_dev/src/generate_ty_rules.rs

@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }
 
 fn generate_markdown() -> String {
-    let registry = ty_python_types::default_lint_registry();
+    let registry = ty_python_semantic::default_lint_registry();
 
     let mut output = String::new();
 
@@ -63,7 +63,12 @@ fn generate_markdown() -> String {
     let _ = writeln!(&mut output, "# Rules\n");
 
     let mut lints: Vec<_> = registry.lints().iter().collect();
-    lints.sort_by_key(|a| a.name());
+    lints.sort_by(|a, b| {
+        a.default_level()
+            .cmp(&b.default_level())
+            .reverse()
+            .then_with(|| a.name().cmp(&b.name()))
+    });
 
     for lint in lints {
         let _ = writeln!(&mut output, "## `{rule_name}`\n", rule_name = lint.name());
@@ -114,7 +119,7 @@ fn generate_markdown() -> String {
         let _ = writeln!(
             &mut output,
             r#"<small>
-Default level: <a href="../../rules#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
 {status_text} ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}" target="_blank">Related issues</a> ·
 <a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>

crates/ruff_diagnostics/src/edit.rs

@@ -39,7 +39,7 @@ impl Edit {
 
     /// Creates an edit that replaces the content in `range` with `content`.
     pub fn range_replacement(content: String, range: TextRange) -> Self {
-        debug_assert!(!content.is_empty(), "Prefer `Edit::deletion`");
+        debug_assert!(!content.is_empty(), "Prefer `Fix::deletion`");
 
         Self {
             content: Some(Box::from(content)),

crates/ruff_formatter/src/macros.rs

@@ -337,7 +337,7 @@ macro_rules! best_fitting {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::{FormatState, SimpleFormatOptions, VecBuffer};
+    use crate::{FormatState, SimpleFormatOptions, VecBuffer, write};
 
     struct TestFormat;
 
@@ -385,8 +385,8 @@ mod tests {
 
     #[test]
     fn best_fitting_variants_print_as_lists() {
-        use crate::Formatted;
         use crate::prelude::*;
+        use crate::{Formatted, format, format_args};
 
         // The second variant below should be selected when printing at a width of 30
         let formatted_best_fitting = format!(

crates/ruff_graph/Cargo.toml

@@ -16,9 +16,7 @@ ruff_linter = { workspace = true }
 ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 
 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }

crates/ruff_graph/src/collector.rs

@@ -3,7 +3,7 @@ use ruff_python_ast::visitor::source_order::{
     SourceOrderVisitor, walk_expr, walk_module, walk_stmt,
 };
 use ruff_python_ast::{self as ast, Expr, Mod, Stmt};
-use ty_module_resolver::ModuleName;
+use ty_python_semantic::ModuleName;
 
 /// Collect all imports for a given Python file.
 #[derive(Default, Debug)]
@@ -42,13 +42,14 @@ impl<'a> Collector<'a> {
 impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
     fn visit_stmt(&mut self, stmt: &'ast Stmt) {
         match stmt {
-            Stmt::ImportFrom(ast::StmtImportFrom {
-                names,
-                module,
-                level,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::ImportFrom(import_from) => {
+                let ast::StmtImportFrom {
+                    names,
+                    module,
+                    level,
+                    range: _,
+                    node_index: _,
+                } = &**import_from;
                 let module = module.as_deref();
                 let level = *level;
                 for alias in names {
@@ -87,24 +88,26 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
                     }
                 }
             }
-            Stmt::Import(ast::StmtImport {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Import(import_stmt) => {
+                let ast::StmtImport {
+                    names,
+                    range: _,
+                    node_index: _,
+                } = &**import_stmt;
                 for alias in names {
                     if let Some(module_name) = ModuleName::new(alias.name.as_str()) {
                         self.imports.push(CollectedImport::Import(module_name));
                     }
                 }
             }
-            Stmt::If(ast::StmtIf {
-                test,
-                body,
-                elif_else_clauses,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::If(if_stmt) => {
+                let ast::StmtIf {
+                    test,
+                    body,
+                    elif_else_clauses,
+                    range: _,
+                    node_index: _,
+                } = &**if_stmt;
                 // Skip TYPE_CHECKING blocks if not requested
                 if self.type_checking_imports || !is_type_checking_condition(test) {
                     self.visit_body(body);

crates/ruff_graph/src/db.rs

@@ -7,13 +7,11 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{SearchPathSettings, SearchPaths};
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionSource, PythonVersionWithSource, SysPrefixPathOrigin,
+    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };
-use ty_python_types::default_lint_registry;
 
 static EMPTY_VENDORED: std::sync::LazyLock<VendoredFileSystem> = std::sync::LazyLock::new(|| {
     let mut builder = VendoredFileSystemBuilder::new(CompressionMethod::Stored);
@@ -28,7 +26,6 @@ pub struct ModuleDb {
     files: Files,
     system: OsSystem,
     rule_selection: Arc<RuleSelection>,
-    analysis_settings: Arc<AnalysisSettings>,
 }
 
 impl ModuleDb {
@@ -88,13 +85,6 @@ impl SourceDb for ModuleDb {
     }
 }
 
-#[salsa::db]
-impl ty_module_resolver::Db for ModuleDb {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl Db for ModuleDb {
     fn should_check_file(&self, file: File) -> bool {
@@ -112,10 +102,6 @@ impl Db for ModuleDb {
     fn verbose(&self) -> bool {
         false
     }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        &self.analysis_settings
-    }
 }
 
 #[salsa::db]

crates/ruff_graph/src/resolver.rs

@@ -1,6 +1,6 @@
 use ruff_db::files::{File, FilePath, system_path_to_file};
 use ruff_db::system::SystemPath;
-use ty_module_resolver::{
+use ty_python_semantic::{
     ModuleName, resolve_module, resolve_module_confident, resolve_real_module,
     resolve_real_module_confident,
 };

crates/ruff_linter/Cargo.toml

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

crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC004.py

@@ -1,66 +0,0 @@
-facts = (
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-)
-
-facts = [
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-]
-
-facts = {
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-}
-
-facts = {
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-}
-
-facts = (
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-)
-
-facts = [
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-]
-
-facts = {
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-}
-
-facts = (
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-)
-
-facts = [
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-]
-
-facts = (
-    "Lobsters have blue blood.\n"
-    "The liver is the only human organ that can fully regenerate itself.\n"
-    "Clarinets are made almost entirely out of wood from the mpingo tree.\n"
-    "In 1971, astronaut Alan Shepard played golf on the moon.\n"
-)

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT010.py

@@ -9,15 +9,3 @@ def test_ok():
 def test_error():
     with pytest.raises(UnicodeError):
         pass
-
-def test_match_only():
-    with pytest.raises(match="some error message"):
-        pass
-
-def test_check_only():
-    with pytest.raises(check=lambda e: True):
-        pass
-
-def test_match_and_check():
-    with pytest.raises(match="some error message", check=lambda e: True):
-        pass

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

@@ -136,38 +136,4 @@ os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
 os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
 os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
 
-os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
-
-# See: https://github.com/astral-sh/ruff/issues/21794
-import sys
-
-if os.rename("pth1.py", "pth1.py.bak"):
-    print("rename: truthy")
-else:
-    print("rename: falsey")
-
-if os.replace("pth1.py.bak", "pth1.py"):
-    print("replace: truthy")
-else:
-    print("replace: falsey")
-
-try:
-    for _ in os.getcwd():
-        print("getcwd: iterable")
-        break
-except TypeError as e:
-    print("getcwd: not iterable")
-
-try:
-    for _ in os.getcwdb():
-        print("getcwdb: iterable")
-        break
-except TypeError as e:
-    print("getcwdb: not iterable")
-
-try:
-    for _ in os.readlink(sys.executable):
-        print("readlink: iterable")
-        break
-except TypeError as e:
-    print("readlink: not iterable")
+os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)

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

@@ -132,6 +132,7 @@ async def c():
 # Non-errors
 ###
 
+# False-negative: RustPython doesn't parse the `\N{snowman}`.
 "\N{snowman} {}".format(a)
 
 "{".format(a)
@@ -275,6 +276,3 @@ if __name__ == "__main__":
     number = 0
     string = "{}".format(number := number + 1)
     print(string)
-
-# Unicode escape
-"\N{angle}AOB = {angle}°".format(angle=180)

crates/ruff_linter/resources/test/fixtures/refurb/FURB101.py

@@ -138,6 +138,5 @@ with open("file.txt", encoding="utf-8") as f:
 with open("file.txt", encoding="utf-8") as f:
     contents = process_contents(f.read())
 
-with open("file1.txt", encoding="utf-8") as f:
+with open("file.txt", encoding="utf-8") as f:
     contents: str = process_contents(f.read())
-

crates/ruff_linter/resources/test/fixtures/refurb/FURB101_1.py

@@ -1,8 +0,0 @@
-
-from pathlib import Path
-
-with Path("file.txt").open() as f:
-    contents = f.read()
-
-with Path("file.txt").open("r") as f:
-    contents = f.read()

crates/ruff_linter/resources/test/fixtures/refurb/FURB103_1.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-with Path("file.txt").open("w") as f:
-    f.write("test")
-
-with Path("file.txt").open("wb") as f:
-    f.write(b"test")
-
-with Path("file.txt").open(mode="w") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", encoding="utf8") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", errors="ignore") as f:
-    f.write("test")
-
-with Path(foo()).open("w") as f:
-    f.write("test")
-
-p = Path("file.txt")
-with p.open("w") as f:
-    f.write("test")
-
-with Path("foo", "bar", "baz").open("w") as f:
-    f.write("test")

crates/ruff_linter/resources/test/fixtures/ruff/suppressions.py

@@ -86,26 +86,3 @@ def f():
     # Multiple codes but none are used
     # ruff: disable[E741, F401, F841]
     print("hello")
-
-
-def f():
-    # Unknown rule codes
-    # ruff: disable[YF829]
-    # ruff: disable[F841, RQW320]
-    value = 0
-    # ruff: enable[F841, RQW320]
-    # ruff: enable[YF829]
-
-
-def f():
-    # External rule codes should be ignored
-    # ruff: disable[TK421]
-    print("hello")
-    # ruff: enable[TK421]
-
-
-def f():
-    # Empty or missing rule codes
-    # ruff: disable
-    # ruff: disable[]
-    print("hello")

crates/ruff_linter/resources/test/fixtures/semantic_errors/annotated_global.py

@@ -1,38 +0,0 @@
-a: int = 1
-def f1():
-    global a
-    a: str = "foo"  # error
-
-b: int = 1
-def outer():
-    def inner():
-        global b
-        b: str = "nested"  # error
-
-c: int = 1
-def f2():
-    global c
-    c: list[str] = []  # error
-
-d: int = 1
-def f3():
-    global d
-    d: str  # error
-
-e: int = 1
-def f4():
-    e: str = "happy"  # okay
-
-global f
-f: int = 1  # okay
-
-g: int = 1
-global g  # error
-
-class C:
-    x: str
-    global x  # error
-
-class D:
-    global x  # error
-    x: str

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

@@ -214,13 +214,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             range: _,
             node_index: _,
         }) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    elts,
-                );
-            }
             if ctx.is_store() {
                 let check_too_many_expressions =
                     checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
@@ -1336,13 +1329,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
         }
         Expr::Set(set) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    &set.elts,
-                );
-            }
             if checker.is_rule_enabled(Rule::DuplicateValue) {
                 flake8_bugbear::rules::duplicate_value(checker, set);
             }

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

@@ -17,11 +17,12 @@ use ruff_python_ast::PythonVersion;
 /// Run lint rules over a [`Stmt`] syntax node.
 pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
     match stmt {
-        Stmt::Global(ast::StmtGlobal {
-            names,
-            range: _,
-            node_index: _,
-        }) => {
+        Stmt::Global(global) => {
+            let ast::StmtGlobal {
+                names,
+                range: _,
+                node_index: _,
+            } = &**global;
             if checker.is_rule_enabled(Rule::GlobalAtModuleLevel) {
                 pylint::rules::global_at_module_level(checker, stmt);
             }
@@ -31,13 +32,12 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
         }
-        Stmt::Nonlocal(
-            nonlocal @ ast::StmtNonlocal {
+        Stmt::Nonlocal(nonlocal) => {
+            let ast::StmtNonlocal {
                 names,
                 range: _,
                 node_index: _,
-            },
-        ) => {
+            } = &**nonlocal;
             if checker.is_rule_enabled(Rule::AmbiguousVariableName) {
                 for name in names {
                     pycodestyle::rules::ambiguous_variable_name(checker, name, name.range());
@@ -47,8 +47,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::nonlocal_and_global(checker, nonlocal);
             }
         }
-        Stmt::FunctionDef(
-            function_def @ ast::StmtFunctionDef {
+        Stmt::FunctionDef(function_def) => {
+            let ast::StmtFunctionDef {
                 is_async,
                 name,
                 decorator_list,
@@ -58,8 +58,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 type_params: _,
                 range: _,
                 node_index: _,
-            },
-        ) => {
+            } = &**function_def;
             if checker.is_rule_enabled(Rule::DjangoNonLeadingReceiverDecorator) {
                 flake8_django::rules::non_leading_receiver_decorator(checker, decorator_list);
             }
@@ -321,7 +320,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::in_function(checker, name, body);
             }
             if checker.is_rule_enabled(Rule::ReimplementedOperator) {
-                refurb::rules::reimplemented_operator(checker, &function_def.into());
+                refurb::rules::reimplemented_operator(checker, &(&**function_def).into());
             }
             if checker.is_rule_enabled(Rule::SslWithBadDefaults) {
                 flake8_bandit::rules::ssl_with_bad_defaults(checker, function_def);
@@ -356,8 +355,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::return_in_init(checker, stmt);
             }
         }
-        Stmt::ClassDef(
-            class_def @ ast::StmtClassDef {
+        Stmt::ClassDef(class_def) => {
+            let ast::StmtClassDef {
                 name,
                 arguments,
                 type_params: _,
@@ -365,8 +364,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 body,
                 range: _,
                 node_index: _,
-            },
-        ) => {
+            } = &**class_def;
             if checker.is_rule_enabled(Rule::NoClassmethodDecorator) {
                 pylint::rules::no_classmethod_decorator(checker, stmt);
             }
@@ -526,11 +524,12 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::implicit_class_var_in_dataclass(checker, class_def);
             }
         }
-        Stmt::Import(ast::StmtImport {
-            names,
-            range: _,
-            node_index: _,
-        }) => {
+        Stmt::Import(import) => {
+            let ast::StmtImport {
+                names,
+                range: _,
+                node_index: _,
+            } = &**import;
             if checker.is_rule_enabled(Rule::MultipleImportsOnOneLine) {
                 pycodestyle::rules::multiple_imports_on_one_line(checker, stmt, names);
             }
@@ -578,7 +577,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_tidy_imports::rules::banned_module_level_imports(checker, stmt);
             }
 
-            for alias in names {
+            for alias in &import.names {
                 if checker.is_rule_enabled(Rule::NonAsciiImportName) {
                     pylint::rules::non_ascii_module_import(checker, alias);
                 }
@@ -604,7 +603,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     }
                 }
                 if checker.is_rule_enabled(Rule::ManualFromImport) {
-                    pylint::rules::manual_from_import(checker, stmt, alias, names);
+                    pylint::rules::manual_from_import(checker, stmt, alias, &import.names);
                 }
                 if checker.is_rule_enabled(Rule::ImportSelf) {
                     pylint::rules::import_self(checker, alias, checker.module.qualified_name());
@@ -681,17 +680,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
         }
-        Stmt::ImportFrom(
-            import_from @ ast::StmtImportFrom {
-                names,
-                module,
-                level,
-                range: _,
-                node_index: _,
-            },
-        ) => {
-            let level = *level;
-            let module = module.as_deref();
+        Stmt::ImportFrom(import_from) => {
+            let level = import_from.level;
+            let module = import_from.module.as_deref();
             if checker.is_rule_enabled(Rule::ModuleImportNotAtTopOfFile) {
                 pycodestyle::rules::module_import_not_at_top_of_file(checker, stmt);
             }
@@ -699,7 +690,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::import_outside_top_level(checker, stmt);
             }
             if checker.is_rule_enabled(Rule::GlobalStatement) {
-                for name in names {
+                for name in &import_from.names {
                     if let Some(asname) = name.asname.as_ref() {
                         pylint::rules::global_statement(checker, asname);
                     } else {
@@ -708,7 +699,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.is_rule_enabled(Rule::NonAsciiImportName) {
-                for alias in names {
+                for alias in &import_from.names {
                     pylint::rules::non_ascii_module_import(checker, alias);
                 }
             }
@@ -724,7 +715,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.is_rule_enabled(Rule::UnnecessaryBuiltinImport) {
                 if let Some(module) = module {
                     pyupgrade::rules::unnecessary_builtin_import(
-                        checker, stmt, module, names, level,
+                        checker, stmt, module, &import_from.names, level,
                     );
                 }
             }
@@ -760,7 +751,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                         &stmt,
                     );
 
-                    for alias in names {
+                    for alias in &import_from.names {
                         if &alias.name == "*" {
                             continue;
                         }
@@ -789,7 +780,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     flake8_pyi::rules::from_future_import(checker, import_from);
                 }
             }
-            for alias in names {
+            for alias in &import_from.names {
                 if module != Some("__future__") && &alias.name == "*" {
                     // F403
                     checker.report_diagnostic_if_enabled(
@@ -890,7 +881,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     level,
                     module,
-                    names,
+                    &import_from.names,
                     checker.module.qualified_name(),
                 );
             }
@@ -906,14 +897,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_pyi::rules::bytestring_import(checker, import_from);
             }
         }
-        Stmt::Raise(raise @ ast::StmtRaise { exc, .. }) => {
+        Stmt::Raise(raise) => {
             if checker.is_rule_enabled(Rule::RaiseNotImplemented) {
-                if let Some(expr) = exc {
+                if let Some(expr) = &raise.exc {
                     pyflakes::rules::raise_not_implemented(checker, expr);
                 }
             }
             if checker.is_rule_enabled(Rule::RaiseLiteral) {
-                if let Some(exc) = exc {
+                if let Some(exc) = &raise.exc {
                     flake8_bugbear::rules::raise_literal(checker, exc);
                 }
             }
@@ -922,34 +913,34 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 Rule::FStringInException,
                 Rule::DotFormatInException,
             ]) {
-                if let Some(exc) = exc {
+                if let Some(exc) = &raise.exc {
                     flake8_errmsg::rules::string_in_exception(checker, stmt, exc);
                 }
             }
             if checker.is_rule_enabled(Rule::OSErrorAlias) {
-                if let Some(item) = exc {
+                if let Some(item) = &raise.exc {
                     pyupgrade::rules::os_error_alias_raise(checker, item);
                 }
             }
             if checker.is_rule_enabled(Rule::TimeoutErrorAlias) {
                 if checker.target_version() >= PythonVersion::PY310 {
-                    if let Some(item) = exc {
+                    if let Some(item) = &raise.exc {
                         pyupgrade::rules::timeout_error_alias_raise(checker, item);
                     }
                 }
             }
             if checker.is_rule_enabled(Rule::RaiseVanillaClass) {
-                if let Some(expr) = exc {
+                if let Some(expr) = &raise.exc {
                     tryceratops::rules::raise_vanilla_class(checker, expr);
                 }
             }
             if checker.is_rule_enabled(Rule::RaiseVanillaArgs) {
-                if let Some(expr) = exc {
+                if let Some(expr) = &raise.exc {
                     tryceratops::rules::raise_vanilla_args(checker, expr);
                 }
             }
             if checker.is_rule_enabled(Rule::UnnecessaryParenOnRaiseException) {
-                if let Some(expr) = exc {
+                if let Some(expr) = &raise.exc {
                     flake8_raise::rules::unnecessary_paren_on_raise_exception(checker, expr);
                 }
             }
@@ -957,9 +948,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::misplaced_bare_raise(checker, raise);
             }
         }
-        Stmt::AugAssign(aug_assign @ ast::StmtAugAssign { target, .. }) => {
+        Stmt::AugAssign(aug_assign) => {
             if checker.is_rule_enabled(Rule::GlobalStatement) {
-                if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                if let Expr::Name(ast::ExprName { id, .. }) = aug_assign.target.as_ref() {
                     pylint::rules::global_statement(checker, id);
                 }
             }
@@ -967,13 +958,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::sort_dunder_all_aug_assign(checker, aug_assign);
             }
         }
-        Stmt::If(
-            if_ @ ast::StmtIf {
-                test,
-                elif_else_clauses,
-                ..
-            },
-        ) => {
+        Stmt::If(if_) => {
             if checker.is_rule_enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
@@ -1036,33 +1021,33 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     Rule::PatchVersionComparison,
                     Rule::WrongTupleLengthVersionComparison,
                 ]) {
-                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = test.as_ref() {
+                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = if_.test.as_ref() {
                         for value in values {
                             flake8_pyi::rules::unrecognized_version_info(checker, value);
                         }
                     } else {
-                        flake8_pyi::rules::unrecognized_version_info(checker, test);
+                        flake8_pyi::rules::unrecognized_version_info(checker, &if_.test);
                     }
                 }
                 if checker.any_rule_enabled(&[
                     Rule::UnrecognizedPlatformCheck,
                     Rule::UnrecognizedPlatformName,
                 ]) {
-                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = test.as_ref() {
+                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = if_.test.as_ref() {
                         for value in values {
                             flake8_pyi::rules::unrecognized_platform(checker, value);
                         }
                     } else {
-                        flake8_pyi::rules::unrecognized_platform(checker, test);
+                        flake8_pyi::rules::unrecognized_platform(checker, &if_.test);
                     }
                 }
                 if checker.is_rule_enabled(Rule::ComplexIfStatementInStub) {
-                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = test.as_ref() {
+                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = if_.test.as_ref() {
                         for value in values {
                             flake8_pyi::rules::complex_if_statement_in_stub(checker, value);
                         }
                     } else {
-                        flake8_pyi::rules::complex_if_statement_in_stub(checker, test);
+                        flake8_pyi::rules::complex_if_statement_in_stub(checker, &if_.test);
                     }
                 }
             }
@@ -1091,10 +1076,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     }
                 }
 
-                let has_else_clause = elif_else_clauses.iter().any(|clause| clause.test.is_none());
+                let has_else_clause = if_.elif_else_clauses.iter().any(|clause| clause.test.is_none());
 
-                bad_version_info_comparison(checker, test.as_ref(), has_else_clause);
-                for clause in elif_else_clauses {
+                bad_version_info_comparison(checker, if_.test.as_ref(), has_else_clause);
+                for clause in &if_.elif_else_clauses {
                     if let Some(test) = clause.test.as_ref() {
                         bad_version_info_comparison(checker, test, has_else_clause);
                     }
@@ -1105,44 +1090,37 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::if_key_in_dict_del(checker, if_);
             }
             if checker.is_rule_enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, if_.into());
+                ruff::rules::needless_else(checker, (&**if_).into());
             }
         }
-        Stmt::Assert(
-            assert_stmt @ ast::StmtAssert {
-                test,
-                msg,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::Assert(assert_stmt) => {
             if !checker.semantic.in_type_checking_block() {
                 if checker.is_rule_enabled(Rule::Assert) {
                     flake8_bandit::rules::assert_used(checker, stmt);
                 }
             }
             if checker.is_rule_enabled(Rule::AssertTuple) {
-                pyflakes::rules::assert_tuple(checker, stmt, test);
+                pyflakes::rules::assert_tuple(checker, stmt, &assert_stmt.test);
             }
             if checker.is_rule_enabled(Rule::AssertFalse) {
-                flake8_bugbear::rules::assert_false(checker, stmt, test, msg.as_deref());
+                flake8_bugbear::rules::assert_false(checker, stmt, &assert_stmt.test, assert_stmt.msg.as_deref());
             }
             if checker.is_rule_enabled(Rule::PytestAssertAlwaysFalse) {
-                flake8_pytest_style::rules::assert_falsy(checker, stmt, test);
+                flake8_pytest_style::rules::assert_falsy(checker, stmt, &assert_stmt.test);
             }
             if checker.is_rule_enabled(Rule::PytestCompositeAssertion) {
                 flake8_pytest_style::rules::composite_condition(
                     checker,
                     stmt,
-                    test,
-                    msg.as_deref(),
+                    &assert_stmt.test,
+                    assert_stmt.msg.as_deref(),
                 );
             }
             if checker.is_rule_enabled(Rule::AssertOnStringLiteral) {
-                pylint::rules::assert_on_string_literal(checker, test);
+                pylint::rules::assert_on_string_literal(checker, &assert_stmt.test);
             }
             if checker.is_rule_enabled(Rule::InvalidMockAccess) {
-                pygrep_hooks::rules::non_existent_mock_method(checker, test);
+                pygrep_hooks::rules::non_existent_mock_method(checker, &assert_stmt.test);
             }
             if checker.is_rule_enabled(Rule::AssertWithPrintMessage) {
                 ruff::rules::assert_with_print_message(checker, assert_stmt);
@@ -1151,18 +1129,18 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::invalid_assert_message_literal_argument(checker, assert_stmt);
             }
         }
-        Stmt::With(with_stmt @ ast::StmtWith { items, body, .. }) => {
+        Stmt::With(with_stmt) => {
             if checker.is_rule_enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
             if checker.is_rule_enabled(Rule::AssertRaisesException) {
-                flake8_bugbear::rules::assert_raises_exception(checker, items);
+                flake8_bugbear::rules::assert_raises_exception(checker, &with_stmt.items);
             }
             if checker.is_rule_enabled(Rule::PytestRaisesWithMultipleStatements) {
-                flake8_pytest_style::rules::complex_raises(checker, stmt, items, body);
+                flake8_pytest_style::rules::complex_raises(checker, stmt, &with_stmt.items, &with_stmt.body);
             }
             if checker.is_rule_enabled(Rule::PytestWarnsWithMultipleStatements) {
-                flake8_pytest_style::rules::complex_warns(checker, stmt, items, body);
+                flake8_pytest_style::rules::complex_warns(checker, stmt, &with_stmt.items, &with_stmt.body);
             }
             if checker.is_rule_enabled(Rule::MultipleWithStatements) {
                 flake8_simplify::rules::multiple_with_statements(
@@ -1184,10 +1162,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::useless_with_lock(checker, with_stmt);
             }
             if checker.is_rule_enabled(Rule::CancelScopeNoCheckpoint) {
-                flake8_async::rules::cancel_scope_no_checkpoint(checker, with_stmt, items);
+                flake8_async::rules::cancel_scope_no_checkpoint(checker, with_stmt, &with_stmt.items);
             }
         }
-        Stmt::While(while_stmt @ ast::StmtWhile { body, orelse, .. }) => {
+        Stmt::While(while_stmt) => {
             if checker.is_rule_enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
@@ -1195,29 +1173,19 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Stmt(stmt));
             }
             if checker.is_rule_enabled(Rule::UselessElseOnLoop) {
-                pylint::rules::useless_else_on_loop(checker, stmt, body, orelse);
+                pylint::rules::useless_else_on_loop(checker, stmt, &while_stmt.body, &while_stmt.orelse);
             }
             if checker.is_rule_enabled(Rule::TryExceptInLoop) {
-                perflint::rules::try_except_in_loop(checker, body);
+                perflint::rules::try_except_in_loop(checker, &while_stmt.body);
             }
             if checker.is_rule_enabled(Rule::AsyncBusyWait) {
                 flake8_async::rules::async_busy_wait(checker, while_stmt);
             }
             if checker.is_rule_enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, while_stmt.into());
+                ruff::rules::needless_else(checker, (&**while_stmt).into());
             }
         }
-        Stmt::For(
-            for_stmt @ ast::StmtFor {
-                target,
-                body,
-                iter,
-                orelse,
-                is_async,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::For(for_stmt) => {
             if checker.is_rule_enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
@@ -1235,25 +1203,25 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 checker.analyze.for_loops.push(checker.semantic.snapshot());
             }
             if checker.is_rule_enabled(Rule::LoopVariableOverridesIterator) {
-                flake8_bugbear::rules::loop_variable_overrides_iterator(checker, target, iter);
+                flake8_bugbear::rules::loop_variable_overrides_iterator(checker, &for_stmt.target, &for_stmt.iter);
             }
             if checker.is_rule_enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Stmt(stmt));
             }
             if checker.is_rule_enabled(Rule::ReuseOfGroupbyGenerator) {
-                flake8_bugbear::rules::reuse_of_groupby_generator(checker, target, body, iter);
+                flake8_bugbear::rules::reuse_of_groupby_generator(checker, &for_stmt.target, &for_stmt.body, &for_stmt.iter);
             }
             if checker.is_rule_enabled(Rule::UselessElseOnLoop) {
-                pylint::rules::useless_else_on_loop(checker, stmt, body, orelse);
+                pylint::rules::useless_else_on_loop(checker, stmt, &for_stmt.body, &for_stmt.orelse);
             }
             if checker.is_rule_enabled(Rule::RedefinedLoopName) {
                 pylint::rules::redefined_loop_name(checker, stmt);
             }
             if checker.is_rule_enabled(Rule::IterationOverSet) {
-                pylint::rules::iteration_over_set(checker, iter);
+                pylint::rules::iteration_over_set(checker, &for_stmt.iter);
             }
             if checker.is_rule_enabled(Rule::DictIterMissingItems) {
-                pylint::rules::dict_iter_missing_items(checker, target, iter);
+                pylint::rules::dict_iter_missing_items(checker, &for_stmt.target, &for_stmt.iter);
             }
             if checker.is_rule_enabled(Rule::ManualListCopy) {
                 perflint::rules::manual_list_copy(checker, for_stmt);
@@ -1263,7 +1231,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::modified_iterating_set(checker, for_stmt);
             }
             if checker.is_rule_enabled(Rule::UnnecessaryListCast) {
-                perflint::rules::unnecessary_list_cast(checker, iter, body);
+                perflint::rules::unnecessary_list_cast(checker, &for_stmt.iter, &for_stmt.body);
             }
             if checker.is_rule_enabled(Rule::UnnecessaryListIndexLookup) {
                 pylint::rules::unnecessary_list_index_lookup(checker, for_stmt);
@@ -1274,7 +1242,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.is_rule_enabled(Rule::ReadlinesInFor) {
                 refurb::rules::readlines_in_for(checker, for_stmt);
             }
-            if !*is_async {
+            if !for_stmt.is_async {
                 if checker.is_rule_enabled(Rule::ReimplementedBuiltin) {
                     flake8_simplify::rules::convert_for_loop_to_any_all(checker, stmt);
                 }
@@ -1282,7 +1250,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     flake8_simplify::rules::key_in_dict_for(checker, for_stmt);
                 }
                 if checker.is_rule_enabled(Rule::TryExceptInLoop) {
-                    perflint::rules::try_except_in_loop(checker, body);
+                    perflint::rules::try_except_in_loop(checker, &for_stmt.body);
                 }
                 if checker.is_rule_enabled(Rule::ForLoopSetMutations) {
                     refurb::rules::for_loop_set_mutations(checker, for_stmt);
@@ -1292,141 +1260,133 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.is_rule_enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, for_stmt.into());
+                ruff::rules::needless_else(checker, (&**for_stmt).into());
             }
         }
-        Stmt::Try(
-            try_stmt @ ast::StmtTry {
-                body,
-                handlers,
-                orelse,
-                finalbody,
-                ..
-            },
-        ) => {
+        Stmt::Try(try_stmt) => {
             if checker.is_rule_enabled(Rule::TooManyNestedBlocks) {
                 pylint::rules::too_many_nested_blocks(checker, stmt);
             }
             if checker.is_rule_enabled(Rule::JumpStatementInFinally) {
-                flake8_bugbear::rules::jump_statement_in_finally(checker, finalbody);
+                flake8_bugbear::rules::jump_statement_in_finally(checker, &try_stmt.finalbody);
             }
             if checker.is_rule_enabled(Rule::ContinueInFinally) {
                 if checker.target_version() <= PythonVersion::PY38 {
-                    pylint::rules::continue_in_finally(checker, finalbody);
+                    pylint::rules::continue_in_finally(checker, &try_stmt.finalbody);
                 }
             }
             if checker.is_rule_enabled(Rule::DefaultExceptNotLast) {
-                pyflakes::rules::default_except_not_last(checker, handlers, checker.locator);
+                pyflakes::rules::default_except_not_last(checker, &try_stmt.handlers, checker.locator);
             }
             if checker.any_rule_enabled(&[
                 Rule::DuplicateHandlerException,
                 Rule::DuplicateTryBlockException,
             ]) {
-                flake8_bugbear::rules::duplicate_exceptions(checker, handlers);
+                flake8_bugbear::rules::duplicate_exceptions(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::RedundantTupleInExceptionHandler) {
-                flake8_bugbear::rules::redundant_tuple_in_exception_handler(checker, handlers);
+                flake8_bugbear::rules::redundant_tuple_in_exception_handler(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::OSErrorAlias) {
-                pyupgrade::rules::os_error_alias_handlers(checker, handlers);
+                pyupgrade::rules::os_error_alias_handlers(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::TimeoutErrorAlias) {
                 if checker.target_version() >= PythonVersion::PY310 {
-                    pyupgrade::rules::timeout_error_alias_handlers(checker, handlers);
+                    pyupgrade::rules::timeout_error_alias_handlers(checker, &try_stmt.handlers);
                 }
             }
             if checker.is_rule_enabled(Rule::PytestAssertInExcept) {
-                flake8_pytest_style::rules::assert_in_exception_handler(checker, handlers);
+                flake8_pytest_style::rules::assert_in_exception_handler(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::SuppressibleException) {
                 flake8_simplify::rules::suppressible_exception(
-                    checker, stmt, body, handlers, orelse, finalbody,
+                    checker, stmt, &try_stmt.body, &try_stmt.handlers, &try_stmt.orelse, &try_stmt.finalbody,
                 );
             }
             if checker.is_rule_enabled(Rule::ReturnInTryExceptFinally) {
                 flake8_simplify::rules::return_in_try_except_finally(
-                    checker, body, handlers, finalbody,
+                    checker, &try_stmt.body, &try_stmt.handlers, &try_stmt.finalbody,
                 );
             }
             if checker.is_rule_enabled(Rule::TryConsiderElse) {
-                tryceratops::rules::try_consider_else(checker, body, orelse, handlers);
+                tryceratops::rules::try_consider_else(checker, &try_stmt.body, &try_stmt.orelse, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::VerboseRaise) {
-                tryceratops::rules::verbose_raise(checker, handlers);
+                tryceratops::rules::verbose_raise(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::VerboseLogMessage) {
-                tryceratops::rules::verbose_log_message(checker, handlers);
+                tryceratops::rules::verbose_log_message(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::RaiseWithinTry) {
-                tryceratops::rules::raise_within_try(checker, body, handlers);
+                tryceratops::rules::raise_within_try(checker, &try_stmt.body, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::UselessTryExcept) {
-                tryceratops::rules::useless_try_except(checker, handlers);
+                tryceratops::rules::useless_try_except(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::ErrorInsteadOfException) {
-                tryceratops::rules::error_instead_of_exception(checker, handlers);
+                tryceratops::rules::error_instead_of_exception(checker, &try_stmt.handlers);
             }
             if checker.is_rule_enabled(Rule::NeedlessElse) {
-                ruff::rules::needless_else(checker, try_stmt.into());
+                ruff::rules::needless_else(checker, (&**try_stmt).into());
             }
         }
-        Stmt::Assign(assign @ ast::StmtAssign { targets, value, .. }) => {
+        Stmt::Assign(assign) => {
             if checker.is_rule_enabled(Rule::SelfOrClsAssignment) {
-                for target in targets {
+                for target in &assign.targets {
                     pylint::rules::self_or_cls_assignment(checker, target);
                 }
             }
             if checker.is_rule_enabled(Rule::RedeclaredAssignedName) {
-                pylint::rules::redeclared_assigned_name(checker, targets);
+                pylint::rules::redeclared_assigned_name(checker, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::LambdaAssignment) {
-                if let [target] = &targets[..] {
-                    pycodestyle::rules::lambda_assignment(checker, target, value, None, stmt);
+                if let [target] = &assign.targets[..] {
+                    pycodestyle::rules::lambda_assignment(checker, target, &assign.value, None, stmt);
                 }
             }
             if checker.is_rule_enabled(Rule::AssignmentToOsEnviron) {
-                flake8_bugbear::rules::assignment_to_os_environ(checker, targets);
+                flake8_bugbear::rules::assignment_to_os_environ(checker, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::HardcodedPasswordString) {
-                flake8_bandit::rules::assign_hardcoded_password_string(checker, value, targets);
+                flake8_bandit::rules::assign_hardcoded_password_string(checker, &assign.value, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::GlobalStatement) {
-                for target in targets {
-                    if let Expr::Name(ast::ExprName { id, .. }) = target {
-                        pylint::rules::global_statement(checker, id);
+                for target in &assign.targets {
+                    if let Expr::Name(name_expr) = target {
+                        pylint::rules::global_statement(checker, &name_expr.id);
                     }
                 }
             }
             if checker.is_rule_enabled(Rule::UselessMetaclassType) {
-                pyupgrade::rules::useless_metaclass_type(checker, stmt, value, targets);
+                pyupgrade::rules::useless_metaclass_type(checker, stmt, &assign.value, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::ConvertTypedDictFunctionalToClass) {
                 pyupgrade::rules::convert_typed_dict_functional_to_class(
-                    checker, stmt, targets, value,
+                    checker, stmt, &assign.targets, &assign.value,
                 );
             }
             if checker.is_rule_enabled(Rule::ConvertNamedTupleFunctionalToClass) {
                 pyupgrade::rules::convert_named_tuple_functional_to_class(
-                    checker, stmt, targets, value,
+                    checker, stmt, &assign.targets, &assign.value,
                 );
             }
             if checker.is_rule_enabled(Rule::PandasDfVariableName) {
-                pandas_vet::rules::assignment_to_df(checker, targets);
+                pandas_vet::rules::assignment_to_df(checker, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::AirflowVariableNameTaskIdMismatch) {
-                airflow::rules::variable_name_task_id(checker, targets, value);
+                airflow::rules::variable_name_task_id(checker, &assign.targets, &assign.value);
             }
             if checker.is_rule_enabled(Rule::SelfAssigningVariable) {
                 pylint::rules::self_assignment(checker, assign);
             }
             if checker.is_rule_enabled(Rule::TypeParamNameMismatch) {
-                pylint::rules::type_param_name_mismatch(checker, value, targets);
+                pylint::rules::type_param_name_mismatch(checker, &assign.value, &assign.targets);
             }
             if checker.is_rule_enabled(Rule::TypeNameIncorrectVariance) {
-                pylint::rules::type_name_incorrect_variance(checker, value);
+                pylint::rules::type_name_incorrect_variance(checker, &assign.value);
             }
             if checker.is_rule_enabled(Rule::TypeBivariance) {
-                pylint::rules::type_bivariance(checker, value);
+                pylint::rules::type_bivariance(checker, &assign.value);
             }
             if checker.is_rule_enabled(Rule::NonAugmentedAssignment) {
                 pylint::rules::non_augmented_assignment(checker, assign);
@@ -1449,14 +1409,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                         .any(|scope| scope.kind.is_function())
                     {
                         if checker.is_rule_enabled(Rule::UnprefixedTypeParam) {
-                            flake8_pyi::rules::prefix_type_params(checker, value, targets);
+                            flake8_pyi::rules::prefix_type_params(checker, &assign.value, &assign.targets);
                         }
                         if checker.is_rule_enabled(Rule::AssignmentDefaultInStub) {
-                            flake8_pyi::rules::assignment_default_in_stub(checker, targets, value);
+                            flake8_pyi::rules::assignment_default_in_stub(checker, &assign.targets, &assign.value);
                         }
                         if checker.is_rule_enabled(Rule::UnannotatedAssignmentInStub) {
                             flake8_pyi::rules::unannotated_assignment_in_stub(
-                                checker, targets, value,
+                                checker, &assign.targets, &assign.value,
                             );
                         }
                         if checker.is_rule_enabled(Rule::ComplexAssignmentInStub) {
@@ -1464,7 +1424,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                         }
                         if checker.is_rule_enabled(Rule::TypeAliasWithoutAnnotation) {
                             flake8_pyi::rules::type_alias_without_annotation(
-                                checker, value, targets,
+                                checker, &assign.value, &assign.targets,
                             );
                         }
                     }
@@ -1477,15 +1437,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pyupgrade::rules::non_pep695_type_alias_type(checker, assign);
             }
         }
-        Stmt::AnnAssign(
-            assign_stmt @ ast::StmtAnnAssign {
-                target,
-                value,
-                annotation,
-                ..
-            },
-        ) => {
-            if let Some(value) = value {
+        Stmt::AnnAssign(assign_stmt) => {
+            let target = &assign_stmt.target;
+            let annotation = &assign_stmt.annotation;
+            if let Some(value) = &assign_stmt.value {
                 if checker.is_rule_enabled(Rule::LambdaAssignment) {
                     pycodestyle::rules::lambda_assignment(
                         checker,
@@ -1506,7 +1461,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_bugbear::rules::unintentional_type_annotation(
                     checker,
                     target,
-                    value.as_deref(),
+                    assign_stmt.value.as_deref(),
                     stmt,
                 );
             }
@@ -1514,7 +1469,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pyupgrade::rules::non_pep695_type_alias(checker, assign_stmt);
             }
             if checker.is_rule_enabled(Rule::HardcodedPasswordString) {
-                if let Some(value) = value.as_deref() {
+                if let Some(value) = assign_stmt.value.as_deref() {
                     flake8_bandit::rules::assign_hardcoded_password_string(
                         checker,
                         value,
@@ -1526,7 +1481,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::sort_dunder_all_ann_assign(checker, assign_stmt);
             }
             if checker.source_type.is_stub() {
-                if let Some(value) = value {
+                if let Some(value) = &assign_stmt.value {
                     if checker.is_rule_enabled(Rule::AssignmentDefaultInStub) {
                         // Ignore assignments in function bodies; those are covered by other rules.
                         if !checker
@@ -1563,7 +1518,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
         }
-        Stmt::TypeAlias(ast::StmtTypeAlias { name, .. }) => {
+        Stmt::TypeAlias(type_alias) => {
+            let name = &type_alias.name;
             if checker.is_rule_enabled(Rule::SnakeCaseTypeAlias) {
                 flake8_pyi::rules::snake_case_type_alias(checker, name);
             }
@@ -1571,17 +1527,12 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_pyi::rules::t_suffixed_type_alias(checker, name);
             }
         }
-        Stmt::Delete(
-            delete @ ast::StmtDelete {
-                targets,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::Delete(delete) => {
+            let targets = &delete.targets;
             if checker.is_rule_enabled(Rule::GlobalStatement) {
                 for target in targets {
-                    if let Expr::Name(ast::ExprName { id, .. }) = target {
-                        pylint::rules::global_statement(checker, id);
+                    if let Expr::Name(name_expr) = target {
+                        pylint::rules::global_statement(checker, &name_expr.id);
                     }
                 }
             }
@@ -1618,12 +1569,13 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::useless_exception_statement(checker, expr);
             }
         }
-        Stmt::Match(ast::StmtMatch {
-            subject: _,
-            cases,
-            range: _,
-            node_index: _,
-        }) => {
+        Stmt::Match(match_stmt) => {
+            let ast::StmtMatch {
+                subject: _,
+                cases,
+                range: _,
+                node_index: _,
+            } = &**match_stmt;
             if checker.is_rule_enabled(Rule::NanComparison) {
                 pylint::rules::nan_comparison_match(checker, cases);
             }

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

@@ -782,7 +782,10 @@ impl SemanticSyntaxContext for Checker<'_> {
         for scope in self.semantic.current_scopes() {
             match scope.kind {
                 ScopeKind::Class(_) | ScopeKind::Lambda(_) => return false,
-                ScopeKind::Function(ast::StmtFunctionDef { is_async, .. }) => return *is_async,
+                ScopeKind::Function(function_def) => {
+                    let is_async = &function_def.is_async;
+                    return *is_async;
+                }
                 ScopeKind::Generator { .. }
                 | ScopeKind::Module
                 | ScopeKind::Type
@@ -870,9 +873,13 @@ impl SemanticSyntaxContext for Checker<'_> {
 
         for parent in self.semantic.current_statements().skip(1) {
             match parent {
-                Stmt::For(ast::StmtFor { orelse, .. })
-                | Stmt::While(ast::StmtWhile { orelse, .. }) => {
-                    if !orelse.contains(child) {
+                Stmt::For(node) => {
+                    if !node.orelse.contains(child) {
+                        return true;
+                    }
+                }
+                Stmt::While(node) => {
+                    if !node.orelse.contains(child) {
                         return true;
                     }
                 }
@@ -888,7 +895,8 @@ impl SemanticSyntaxContext for Checker<'_> {
 
     fn is_bound_parameter(&self, name: &str) -> bool {
         match self.semantic.current_scope().kind {
-            ScopeKind::Function(ast::StmtFunctionDef { parameters, .. }) => {
+            ScopeKind::Function(function_def) => {
+                let parameters = &function_def.parameters;
                 parameters.includes(name)
             }
             ScopeKind::Class(_)
@@ -932,12 +940,13 @@ impl<'a> Visitor<'a> for Checker<'a> {
             {
                 self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING_BOUNDARY;
             }
-            Stmt::ImportFrom(ast::StmtImportFrom { module, names, .. }) => {
+            Stmt::ImportFrom(node) => {
                 self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING_BOUNDARY;
 
                 // Allow __future__ imports until we see a non-__future__ import.
-                if let Some("__future__") = module.as_deref() {
-                    if names
+                if let Some("__future__") = node.module.as_deref() {
+                    if node
+                        .names
                         .iter()
                         .any(|alias| alias.name.as_str() == "annotations")
                     {
@@ -981,20 +990,22 @@ impl<'a> Visitor<'a> for Checker<'a> {
 
         // Step 1: Binding
         match stmt {
-            Stmt::AugAssign(ast::StmtAugAssign {
-                target,
-                op: _,
-                value: _,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::AugAssign(node) => {
+                let ast::StmtAugAssign {
+                    target,
+                    op: _,
+                    value: _,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 self.handle_node_load(target);
             }
-            Stmt::Import(ast::StmtImport {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Import(node) => {
+                let ast::StmtImport {
+                    names,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 if self.semantic.at_top_level() {
                     self.importer.visit_import(stmt);
                 }
@@ -1043,13 +1054,14 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
             }
-            Stmt::ImportFrom(ast::StmtImportFrom {
-                names,
-                module,
-                level,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::ImportFrom(node) => {
+                let ast::StmtImportFrom {
+                    names,
+                    module,
+                    level,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 if self.semantic.at_top_level() {
                     self.importer.visit_import(stmt);
                 }
@@ -1110,11 +1122,12 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
             }
-            Stmt::Global(ast::StmtGlobal {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Global(node) => {
+                let ast::StmtGlobal {
+                    names,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 if !self.semantic.scope_id.is_global() {
                     for name in names {
                         let binding_id = self.semantic.global_scope().get(name);
@@ -1136,11 +1149,12 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
             }
-            Stmt::Nonlocal(ast::StmtNonlocal {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Nonlocal(node) => {
+                let ast::StmtNonlocal {
+                    names,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 if !self.semantic.scope_id.is_global() {
                     for name in names {
                         if let Some((scope_id, binding_id)) = self.semantic.nonlocal(name) {
@@ -1174,17 +1188,13 @@ impl<'a> Visitor<'a> for Checker<'a> {
 
         // Step 2: Traversal
         match stmt {
-            Stmt::FunctionDef(
-                function_def @ ast::StmtFunctionDef {
-                    name,
-                    body,
-                    parameters,
-                    decorator_list,
-                    returns,
-                    type_params,
-                    ..
-                },
-            ) => {
+            Stmt::FunctionDef(function_def) => {
+                let name = &function_def.name;
+                let body = &function_def.body;
+                let parameters = &function_def.parameters;
+                let decorator_list = &function_def.decorator_list;
+                let returns = &function_def.returns;
+                let type_params = &function_def.type_params;
                 // Visit the decorators and arguments, but avoid the body, which will be
                 // deferred.
                 for decorator in decorator_list {
@@ -1313,16 +1323,12 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     BindingFlags::empty(),
                 );
             }
-            Stmt::ClassDef(
-                class_def @ ast::StmtClassDef {
-                    name,
-                    body,
-                    arguments,
-                    decorator_list,
-                    type_params,
-                    ..
-                },
-            ) => {
+            Stmt::ClassDef(class_def) => {
+                let name = &class_def.name;
+                let body = &class_def.body;
+                let arguments = &class_def.arguments;
+                let decorator_list = &class_def.decorator_list;
+                let type_params = &class_def.type_params;
                 for decorator in decorator_list {
                     self.visit_decorator(decorator);
                 }
@@ -1369,30 +1375,20 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     BindingFlags::empty(),
                 );
             }
-            Stmt::TypeAlias(ast::StmtTypeAlias {
-                range: _,
-                node_index: _,
-                name,
-                type_params,
-                value,
-            }) => {
+            Stmt::TypeAlias(node) => {
                 self.semantic.push_scope(ScopeKind::Type);
-                if let Some(type_params) = type_params {
+                if let Some(type_params) = &node.type_params {
                     self.visit_type_params(type_params);
                 }
-                self.visit_deferred_type_alias_value(value);
+                self.visit_deferred_type_alias_value(&node.value);
                 self.semantic.pop_scope();
-                self.visit_expr(name);
+                self.visit_expr(&node.name);
             }
-            Stmt::Try(
-                try_node @ ast::StmtTry {
-                    body,
-                    handlers,
-                    orelse,
-                    finalbody,
-                    ..
-                },
-            ) => {
+            Stmt::Try(try_node) => {
+                let body = &try_node.body;
+                let handlers = &try_node.handlers;
+                let orelse = &try_node.orelse;
+                let finalbody = &try_node.finalbody;
                 // Iterate over the `body`, then the `handlers`, then the `orelse`, then the
                 // `finalbody`, but treat the body and the `orelse` as a single branch for
                 // flow analysis purposes.
@@ -1418,64 +1414,60 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 self.visit_body(finalbody);
                 self.semantic.pop_branch();
             }
-            Stmt::AnnAssign(ast::StmtAnnAssign {
-                target,
-                annotation,
-                value,
-                ..
-            }) => {
+            Stmt::AnnAssign(node) => {
                 match AnnotationContext::from_model(
                     &self.semantic,
                     self.settings(),
                     self.target_version(),
                 ) {
                     AnnotationContext::RuntimeRequired => {
-                        self.visit_runtime_required_annotation(annotation);
+                        self.visit_runtime_required_annotation(&node.annotation);
                     }
                     AnnotationContext::RuntimeEvaluated
                         if flake8_type_checking::helpers::is_dataclass_meta_annotation(
-                            annotation,
+                            &node.annotation,
                             self.semantic(),
                         ) =>
                     {
-                        self.visit_runtime_required_annotation(annotation);
+                        self.visit_runtime_required_annotation(&node.annotation);
                     }
                     AnnotationContext::RuntimeEvaluated => {
-                        self.visit_runtime_evaluated_annotation(annotation);
+                        self.visit_runtime_evaluated_annotation(&node.annotation);
                     }
                     AnnotationContext::TypingOnly
                         if flake8_type_checking::helpers::is_dataclass_meta_annotation(
-                            annotation,
+                            &node.annotation,
                             self.semantic(),
                         ) =>
                     {
-                        if let Expr::Subscript(subscript) = &**annotation {
+                        if let Expr::Subscript(subscript) = &*node.annotation {
                             // Ex) `InitVar[str]`
                             self.visit_runtime_required_annotation(&subscript.value);
                             self.visit_annotation(&subscript.slice);
                         } else {
                             // Ex) `InitVar`
-                            self.visit_runtime_required_annotation(annotation);
+                            self.visit_runtime_required_annotation(&node.annotation);
                         }
                     }
-                    AnnotationContext::TypingOnly => self.visit_annotation(annotation),
+                    AnnotationContext::TypingOnly => self.visit_annotation(&node.annotation),
                 }
 
-                if let Some(expr) = value {
-                    if self.semantic.match_typing_expr(annotation, "TypeAlias") {
+                if let Some(expr) = &node.value {
+                    if self.semantic.match_typing_expr(&node.annotation, "TypeAlias") {
                         self.visit_annotated_type_alias_value(expr);
                     } else {
                         self.visit_expr(expr);
                     }
                 }
-                self.visit_expr(target);
+                self.visit_expr(&node.target);
             }
-            Stmt::Assert(ast::StmtAssert {
-                test,
-                msg,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Assert(node) => {
+                let ast::StmtAssert {
+                    test,
+                    msg,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 let snapshot = self.semantic.flags;
                 self.semantic.flags |= SemanticModelFlags::ASSERT_STATEMENT;
                 self.visit_boolean_test(test);
@@ -1484,13 +1476,14 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 }
                 self.semantic.flags = snapshot;
             }
-            Stmt::With(ast::StmtWith {
-                items,
-                body,
-                is_async: _,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::With(node) => {
+                let ast::StmtWith {
+                    items,
+                    body,
+                    is_async: _,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 for item in items {
                     self.visit_with_item(item);
                 }
@@ -1498,26 +1491,22 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 self.visit_body(body);
                 self.semantic.pop_branch();
             }
-            Stmt::While(ast::StmtWhile {
-                test,
-                body,
-                orelse,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::While(node) => {
+                let ast::StmtWhile {
+                    test,
+                    body,
+                    orelse,
+                    range: _,
+                    node_index: _,
+                } = &**node;
                 self.visit_boolean_test(test);
                 self.visit_body(body);
                 self.visit_body(orelse);
             }
-            Stmt::If(
-                stmt_if @ ast::StmtIf {
-                    test,
-                    body,
-                    elif_else_clauses,
-                    range: _,
-                    node_index: _,
-                },
-            ) => {
+            Stmt::If(stmt_if) => {
+                let test = &stmt_if.test;
+                let body = &stmt_if.body;
+                let elif_else_clauses = &stmt_if.elif_else_clauses;
                 self.visit_boolean_test(test);
 
                 self.semantic.push_branch();
@@ -1542,14 +1531,14 @@ impl<'a> Visitor<'a> for Checker<'a> {
 
         if self.semantic().at_top_level() || self.semantic().current_scope().kind.is_class() {
             match stmt {
-                Stmt::Assign(ast::StmtAssign { targets, .. }) => {
-                    if let [Expr::Name(_)] = targets.as_slice() {
+                Stmt::Assign(node) => {
+                    if let [Expr::Name(_)] = node.targets.as_slice() {
                         self.docstring_state =
                             DocstringState::Expected(ExpectedDocstringKind::Attribute);
                     }
                 }
-                Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
-                    if target.is_name_expr() {
+                Stmt::AnnAssign(node) => {
+                    if node.target.is_name_expr() {
                         self.docstring_state =
                             DocstringState::Expected(ExpectedDocstringKind::Attribute);
                     }
@@ -2690,13 +2679,13 @@ impl<'a> Checker<'a> {
 
         match parent {
             Stmt::TypeAlias(_) => flags.insert(BindingFlags::DEFERRED_TYPE_ALIAS),
-            Stmt::AnnAssign(ast::StmtAnnAssign { annotation, .. }) => {
+            Stmt::AnnAssign(node) => {
                 // TODO: It is a bit unfortunate that we do this check twice
                 //       maybe we should change how we visit this statement
                 //       so the semantic flag for the type alias sticks around
                 //       until after we've handled this store, so we can check
                 //       the flag instead of duplicating this check
-                if self.semantic.match_typing_expr(annotation, "TypeAlias") {
+                if self.semantic.match_typing_expr(&node.annotation, "TypeAlias") {
                     flags.insert(BindingFlags::ANNOTATED_TYPE_ALIAS);
                 }
             }
@@ -2707,22 +2696,22 @@ impl<'a> Checker<'a> {
 
         if scope.kind.is_module()
             && match parent {
-                Stmt::Assign(ast::StmtAssign { targets, .. }) => {
-                    if let Some(Expr::Name(ast::ExprName { id, .. })) = targets.first() {
+                Stmt::Assign(node) => {
+                    if let Some(Expr::Name(ast::ExprName { id, .. })) = node.targets.first() {
                         id == "__all__"
                     } else {
                         false
                     }
                 }
-                Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
-                    if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                Stmt::AugAssign(node) => {
+                    if let Expr::Name(ast::ExprName { id, .. }) = node.target.as_ref() {
                         id == "__all__"
                     } else {
                         false
                     }
                 }
-                Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
-                    if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
+                Stmt::AnnAssign(node) => {
+                    if let Expr::Name(ast::ExprName { id, .. }) = node.target.as_ref() {
                         id == "__all__"
                     } else {
                         false
@@ -2765,10 +2754,8 @@ impl<'a> Checker<'a> {
         // Match the left-hand side of an annotated assignment without a value,
         // like `x` in `x: int`. N.B. In stub files, these should be viewed
         // as assignments on par with statements such as `x: int = 5`.
-        if matches!(
-            parent,
-            Stmt::AnnAssign(ast::StmtAnnAssign { value: None, .. })
-        ) && !self.semantic.in_annotation()
+        if matches!(parent, Stmt::AnnAssign(node) if node.value.is_none())
+            && !self.semantic.in_annotation()
         {
             self.add_binding(id, expr.range(), BindingKind::Annotation, flags);
             return;
@@ -3040,19 +3027,16 @@ impl<'a> Checker<'a> {
 
                 let stmt = self.semantic.current_statement();
 
-                let Stmt::FunctionDef(ast::StmtFunctionDef {
-                    body, parameters, ..
-                }) = stmt
-                else {
+                let Stmt::FunctionDef(node) = stmt else {
                     unreachable!("Expected Stmt::FunctionDef")
                 };
 
                 self.with_semantic_checker(|semantic, context| semantic.visit_stmt(stmt, context));
 
-                self.visit_parameters(parameters);
+                self.visit_parameters(&node.parameters);
                 // Set the docstring state before visiting the function body.
                 self.docstring_state = DocstringState::Expected(ExpectedDocstringKind::Function);
-                self.visit_body(body);
+                self.visit_body(&node.body);
             }
         }
         self.semantic.restore(snapshot);

crates/ruff_linter/src/codes.rs

@@ -454,7 +454,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8ImplicitStrConcat, "001") => rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "002") => rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "003") => rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "004") => rules::flake8_implicit_str_concat::rules::ImplicitStringConcatenationInCollectionLiteral,
 
         // flake8-print
         (Flake8Print, "1") => rules::flake8_print::rules::Print,
@@ -1064,8 +1063,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "100") => rules::ruff::rules::UnusedNOQA,
         (Ruff, "101") => rules::ruff::rules::RedirectedNOQA,
         (Ruff, "102") => rules::ruff::rules::InvalidRuleCode,
-        (Ruff, "103") => rules::ruff::rules::InvalidSuppressionComment,
-        (Ruff, "104") => rules::ruff::rules::UnmatchedSuppressionComment,
 
         (Ruff, "200") => rules::ruff::rules::InvalidPyprojectToml,
         #[cfg(any(feature = "test-rules", test))]

crates/ruff_linter/src/fix/edits.rs

@@ -127,8 +127,8 @@ pub(crate) fn make_redundant_alias<'a>(
     stmt: &Stmt,
 ) -> Vec<Edit> {
     let aliases = match stmt {
-        Stmt::Import(ast::StmtImport { names, .. }) => names,
-        Stmt::ImportFrom(ast::StmtImportFrom { names, .. }) => names,
+        Stmt::Import(node) => &node.names,
+        Stmt::ImportFrom(node) => &node.names,
         _ => {
             return Vec::new();
         }
@@ -286,7 +286,12 @@ pub(crate) fn add_argument(argument: &str, arguments: &Arguments, tokens: &Token
 
 /// Generic function to add a (regular) parameter to a function definition.
 pub(crate) fn add_parameter(parameter: &str, parameters: &Parameters, source: &str) -> Edit {
-    if let Some(last) = parameters.args.iter().rfind(|arg| arg.default.is_none()) {
+    if let Some(last) = parameters
+        .args
+        .iter()
+        .filter(|arg| arg.default.is_none())
+        .next_back()
+    {
         // Case 1: at least one regular parameter, so append after the last one.
         Edit::insertion(format!(", {parameter}"), last.end())
     } else if !parameters.args.is_empty() {
@@ -399,43 +404,46 @@ fn is_only<T: PartialEq>(vec: &[T], value: &T) -> bool {
 /// Determine if a child is the only statement in its body.
 fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
     match parent {
-        Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
-        | Stmt::ClassDef(ast::StmtClassDef { body, .. })
-        | Stmt::With(ast::StmtWith { body, .. }) => {
-            if is_only(body, child) {
+        Stmt::FunctionDef(node) => {
+            if is_only(&node.body, child) {
                 return true;
             }
         }
-        Stmt::For(ast::StmtFor { body, orelse, .. })
-        | Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
-            if is_only(body, child) || is_only(orelse, child) {
+        Stmt::ClassDef(node) => {
+            if is_only(&node.body, child) {
                 return true;
             }
         }
-        Stmt::If(ast::StmtIf {
-            body,
-            elif_else_clauses,
-            ..
-        }) => {
-            if is_only(body, child)
-                || elif_else_clauses
+        Stmt::With(node) => {
+            if is_only(&node.body, child) {
+                return true;
+            }
+        }
+        Stmt::For(node) => {
+            if is_only(&node.body, child) || is_only(&node.orelse, child) {
+                return true;
+            }
+        }
+        Stmt::While(node) => {
+            if is_only(&node.body, child) || is_only(&node.orelse, child) {
+                return true;
+            }
+        }
+        Stmt::If(node) => {
+            if is_only(&node.body, child)
+                || node
+                    .elif_else_clauses
                     .iter()
                     .any(|ast::ElifElseClause { body, .. }| is_only(body, child))
             {
                 return true;
             }
         }
-        Stmt::Try(ast::StmtTry {
-            body,
-            handlers,
-            orelse,
-            finalbody,
-            ..
-        }) => {
-            if is_only(body, child)
-                || is_only(orelse, child)
-                || is_only(finalbody, child)
-                || handlers.iter().any(|handler| match handler {
+        Stmt::Try(node) => {
+            if is_only(&node.body, child)
+                || is_only(&node.orelse, child)
+                || is_only(&node.finalbody, child)
+                || node.handlers.iter().any(|handler| match handler {
                     ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler {
                         body, ..
                     }) => is_only(body, child),
@@ -444,8 +452,8 @@ fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
                 return true;
             }
         }
-        Stmt::Match(ast::StmtMatch { cases, .. }) => {
-            if cases.iter().any(|case| is_only(&case.body, child)) {
+        Stmt::Match(node) => {
+            if node.cases.iter().any(|case| is_only(&case.body, child)) {
                 return true;
             }
         }

crates/ruff_linter/src/importer/mod.rs

@@ -236,9 +236,10 @@ impl<'a> Importer<'a> {
         semantic: &SemanticModel<'a>,
         type_checking_block: &Stmt,
     ) -> Option<&'a Stmt> {
-        let Stmt::If(ast::StmtIf { test, .. }) = type_checking_block else {
+        let Stmt::If(node) = type_checking_block else {
             return None;
         };
+        let test = &node.test;
 
         let mut source = test;
         while let Expr::Attribute(ast::ExprAttribute { value, .. }) = source.as_ref() {
@@ -453,17 +454,10 @@ impl<'a> Importer<'a> {
             if stmt.start() >= at {
                 break;
             }
-            if let Stmt::ImportFrom(ast::StmtImportFrom {
-                module: name,
-                names,
-                level,
-                range: _,
-                node_index: _,
-            }) = stmt
-            {
-                if *level == 0
-                    && name.as_ref().is_some_and(|name| name == module)
-                    && names.iter().all(|alias| alias.name.as_str() != "*")
+            if let Stmt::ImportFrom(node) = stmt {
+                if node.level == 0
+                    && node.module.as_ref().is_some_and(|name| name == module)
+                    && node.names.iter().all(|alias| alias.name.as_str() != "*")
                 {
                     import_from = Some(*stmt);
                 }

crates/ruff_linter/src/linter.rs

@@ -1001,7 +1001,6 @@ mod tests {
     #[test_case(Path::new("write_to_debug.py"), PythonVersion::PY310)]
     #[test_case(Path::new("invalid_expression.py"), PythonVersion::PY312)]
     #[test_case(Path::new("global_parameter.py"), PythonVersion::PY310)]
-    #[test_case(Path::new("annotated_global.py"), PythonVersion::PY314)]
     fn test_semantic_errors(path: &Path, python_version: PythonVersion) -> Result<()> {
         let snapshot = format!(
             "semantic_syntax_error_{}_{}",

crates/ruff_linter/src/message/grouped.rs

@@ -197,7 +197,7 @@ impl Display for RuleCodeAndBody<'_> {
                         f,
                         "{fix}{body}",
                         fix = format_args!("[{}] ", "*".cyan()),
-                        body = self.message.concise_message(),
+                        body = self.message.body(),
                     );
                 }
             }
@@ -208,14 +208,14 @@ impl Display for RuleCodeAndBody<'_> {
                 f,
                 "{code} {body}",
                 code = code.red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
             )
         } else {
             write!(
                 f,
                 "{code}: {body}",
                 code = self.message.id().as_str().red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
             )
         }
     }

crates/ruff_linter/src/message/sarif.rs

@@ -334,7 +334,7 @@ impl<'a> SarifResult<'a> {
             rule_id: RuleCode::from(diagnostic),
             level: "error".to_string(),
             message: SarifMessage {
-                text: diagnostic.concise_message().to_string(),
+                text: diagnostic.body().to_string(),
             },
             fixes: Self::fix(diagnostic, &uri).into_iter().collect(),
             locations: vec![SarifLocation {

crates/ruff_linter/src/renamer.rs

@@ -281,12 +281,10 @@ impl Renamer {
     ) -> Option<Edit> {
         let statement = binding.statement(semantic)?;
 
-        let (ast::Stmt::Assign(ast::StmtAssign { value, .. })
-        | ast::Stmt::AnnAssign(ast::StmtAnnAssign {
-            value: Some(value), ..
-        })) = statement
-        else {
-            return None;
+        let value = match statement {
+            ast::Stmt::Assign(node) => &node.value,
+            ast::Stmt::AnnAssign(node) => node.value.as_ref()?,
+            _ => return None,
         };
 
         let ast::ExprCall {

crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs

@@ -448,11 +448,10 @@ fn is_kwarg_parameter(semantic: &SemanticModel, name: &ExprName) -> bool {
         return false;
     };
     let binding = semantic.binding(binding_id);
-    let Some(Stmt::FunctionDef(StmtFunctionDef { parameters, .. })) = binding.statement(semantic)
-    else {
+    let Some(Stmt::FunctionDef(node)) = binding.statement(semantic) else {
         return false;
     };
-    parameters
+    node.parameters
         .kwarg
         .as_deref()
         .is_some_and(|kwarg| kwarg.name.as_str() == name.id.as_str())

crates/ruff_linter/src/rules/eradicate/detection.rs

@@ -22,7 +22,6 @@ static ALLOWLIST_REGEX: LazyLock<Regex> = LazyLock::new(|| {
             # Case-sensitive
             pyright
         |   pyrefly
-        |   ruff\s*:\s*(disable|enable)
         |   mypy:
         |   type:\s*ignore
         |   SPDX-License-Identifier:
@@ -149,8 +148,6 @@ mod tests {
         assert!(!comment_contains_code("# 123", &[]));
         assert!(!comment_contains_code("# 123.1", &[]));
         assert!(!comment_contains_code("# 1, 2, 3", &[]));
-        assert!(!comment_contains_code("# ruff: disable[E501]", &[]));
-        assert!(!comment_contains_code("#ruff:enable[E501, F84]", &[]));
         assert!(!comment_contains_code(
             "# pylint: disable=redefined-outer-name",
             &[]

crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs

@@ -70,7 +70,7 @@ fn is_open_call(func: &Expr, semantic: &SemanticModel) -> bool {
 }
 
 /// Returns `true` if an expression resolves to a call to `pathlib.Path.open`.
-pub(crate) fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
+fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
     let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func else {
         return false;
     };

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

@@ -18,7 +18,7 @@ mod async_zero_sleep;
 mod blocking_http_call;
 mod blocking_http_call_httpx;
 mod blocking_input;
-pub(crate) mod blocking_open_call;
+mod blocking_open_call;
 mod blocking_path_methods;
 mod blocking_process_invocation;
 mod blocking_sleep;

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

@@ -2,7 +2,7 @@
 //!
 //! See: <https://bandit.readthedocs.io/en/latest/blacklists/blacklist_imports.html>
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::{self as ast, Stmt};
+use ruff_python_ast::Stmt;
 use ruff_text_size::Ranged;
 
 use crate::Violation;
@@ -371,7 +371,8 @@ pub(crate) fn suspicious_imports(checker: &Checker, stmt: &Stmt) {
     }
 
     match stmt {
-        Stmt::Import(ast::StmtImport { names, .. }) => {
+        Stmt::Import(node) => {
+            let names = &node.names;
             for name in names {
                 match name.name.as_str() {
                     "telnetlib" => {
@@ -421,8 +422,9 @@ pub(crate) fn suspicious_imports(checker: &Checker, stmt: &Stmt) {
                 }
             }
         }
-        Stmt::ImportFrom(ast::StmtImportFrom { module, names, .. }) => {
-            let Some(identifier) = module else { return };
+        Stmt::ImportFrom(node) => {
+            let Some(identifier) = &node.module else { return };
+            let names = &node.names;
             match identifier.as_str() {
                 "telnetlib" => {
                     checker.report_diagnostic_if_enabled(

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

@@ -12,7 +12,7 @@ use crate::{checkers::ast::Checker, settings::LinterSettings};
 /// Checks for non-literal strings being passed to [`markupsafe.Markup`][markupsafe-markup].
 ///
 /// ## Why is this bad?
-/// [`markupsafe.Markup`][markupsafe-markup] does not perform any escaping, so passing dynamic
+/// [`markupsafe.Markup`] does not perform any escaping, so passing dynamic
 /// content, like f-strings, variables or interpolated strings will potentially
 /// lead to XSS vulnerabilities.
 ///

crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs

@@ -154,10 +154,12 @@ impl<'a> StatementVisitor<'a> for ReraiseVisitor<'a> {
             return;
         }
         match stmt {
-            Stmt::Raise(ast::StmtRaise { exc, cause, .. }) => {
+            Stmt::Raise(node) => {
+                let exc = node.exc.as_deref();
+                let cause = node.cause.as_deref();
                 // except Exception [as <name>]:
                 //     raise [<exc> [from <cause>]]
-                let reraised = match (self.name, exc.as_deref(), cause.as_deref()) {
+                let reraised = match (self.name, exc, cause) {
                     // `raise`
                     (_, None, None) => true,
                     // `raise SomeExc from <name>`

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

@@ -173,24 +173,21 @@ pub(crate) fn abstract_base_class(
         // If an ABC declares an attribute by providing a type annotation
         // but does not actually assign a value for that attribute,
         // assume it is intended to be an "abstract attribute"
-        if matches!(
-            stmt,
-            Stmt::AnnAssign(ast::StmtAnnAssign { value: None, .. })
-        ) {
-            has_abstract_method = true;
-            continue;
+        if let Stmt::AnnAssign(node) = stmt {
+            if node.value.is_none() {
+                has_abstract_method = true;
+                continue;
+            }
         }
 
-        let Stmt::FunctionDef(ast::StmtFunctionDef {
-            decorator_list,
-            body,
-            name: method_name,
-            ..
-        }) = stmt
-        else {
+        let Stmt::FunctionDef(node) = stmt else {
             continue;
         };
 
+        let decorator_list = &node.decorator_list;
+        let body = &node.body;
+        let method_name = &node.name;
+
         let has_abstract_decorator = is_abstract(decorator_list, checker.semantic());
         has_abstract_method |= has_abstract_decorator;
 

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

@@ -51,7 +51,7 @@ impl AlwaysFixableViolation for AssertFalse {
 }
 
 fn assertion_error(msg: Option<&Expr>) -> Stmt {
-    Stmt::Raise(ast::StmtRaise {
+    Stmt::Raise(Box::new(ast::StmtRaise {
         range: TextRange::default(),
         node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         exc: Some(Box::new(Expr::Call(ast::ExprCall {
@@ -75,7 +75,7 @@ fn assertion_error(msg: Option<&Expr>) -> Stmt {
             node_index: ruff_python_ast::AtomicNodeIndex::NONE,
         }))),
         cause: None,
-    })
+    }))
 }
 
 /// B011

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

@@ -114,14 +114,14 @@ pub(crate) fn class_as_data_structure(checker: &Checker, class_def: &ast::StmtCl
 // assignment of a name to an attribute.
 fn is_simple_assignment_to_attribute(stmt: &ast::Stmt) -> bool {
     match stmt {
-        ast::Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
-            let [target] = targets.as_slice() else {
+        ast::Stmt::Assign(node) => {
+            let [target] = node.targets.as_slice() else {
                 return false;
             };
-            target.is_attribute_expr() && value.is_name_expr()
+            target.is_attribute_expr() && node.value.is_name_expr()
         }
-        ast::Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
-            target.is_attribute_expr() && value.as_ref().is_some_and(|val| val.is_name_expr())
+        ast::Stmt::AnnAssign(node) => {
+            node.target.is_attribute_expr() && node.value.as_ref().is_some_and(|val| val.is_name_expr())
         }
         _ => false,
     }

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

@@ -86,12 +86,10 @@ struct SuspiciousVariablesVisitor<'a> {
 impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
         match stmt {
-            Stmt::FunctionDef(ast::StmtFunctionDef {
-                parameters, body, ..
-            }) => {
+            Stmt::FunctionDef(node) => {
                 // Collect all loaded variable names.
                 let mut visitor = LoadedNamesVisitor::default();
-                visitor.visit_body(body);
+                visitor.visit_body(&node.body);
 
                 // Treat any non-arguments as "suspicious".
                 self.names
@@ -100,7 +98,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
                             return false;
                         }
 
-                        if parameters.includes(&loaded.id) {
+                        if node.parameters.includes(&loaded.id) {
                             return false;
                         }
 
@@ -242,18 +240,26 @@ impl<'a> Visitor<'a> for AssignedNamesVisitor<'a> {
         }
 
         match stmt {
-            Stmt::Assign(ast::StmtAssign { targets, .. }) => {
+            Stmt::Assign(node) => {
                 let mut visitor = NamesFromAssignmentsVisitor::default();
-                for expr in targets {
+                for expr in &node.targets {
                     visitor.visit_expr(expr);
                 }
                 self.names.extend(visitor.names);
             }
-            Stmt::AugAssign(ast::StmtAugAssign { target, .. })
-            | Stmt::AnnAssign(ast::StmtAnnAssign { target, .. })
-            | Stmt::For(ast::StmtFor { target, .. }) => {
+            Stmt::AugAssign(node) => {
                 let mut visitor = NamesFromAssignmentsVisitor::default();
-                visitor.visit_expr(target);
+                visitor.visit_expr(&node.target);
+                self.names.extend(visitor.names);
+            }
+            Stmt::AnnAssign(node) => {
+                let mut visitor = NamesFromAssignmentsVisitor::default();
+                visitor.visit_expr(&node.target);
+                self.names.extend(visitor.names);
+            }
+            Stmt::For(node) => {
+                let mut visitor = NamesFromAssignmentsVisitor::default();
+                visitor.visit_expr(&node.target);
                 self.names.extend(visitor.names);
             }
             _ => {}

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

@@ -1,4 +1,4 @@
-use ruff_python_ast::{self as ast, Stmt};
+use ruff_python_ast::Stmt;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_text_size::Ranged;
@@ -71,15 +71,23 @@ fn walk_stmt(checker: &Checker, body: &[Stmt], f: fn(&Stmt) -> bool) {
             );
         }
         match stmt {
-            Stmt::While(ast::StmtWhile { body, .. }) | Stmt::For(ast::StmtFor { body, .. }) => {
-                walk_stmt(checker, body, Stmt::is_return_stmt);
+            Stmt::While(node) => {
+                walk_stmt(checker, &node.body, Stmt::is_return_stmt);
             }
-            Stmt::If(ast::StmtIf { body, .. })
-            | Stmt::Try(ast::StmtTry { body, .. })
-            | Stmt::With(ast::StmtWith { body, .. }) => {
-                walk_stmt(checker, body, f);
+            Stmt::For(node) => {
+                walk_stmt(checker, &node.body, Stmt::is_return_stmt);
             }
-            Stmt::Match(ast::StmtMatch { cases, .. }) => {
+            Stmt::If(node) => {
+                walk_stmt(checker, &node.body, f);
+            }
+            Stmt::Try(node) => {
+                walk_stmt(checker, &node.body, f);
+            }
+            Stmt::With(node) => {
+                walk_stmt(checker, &node.body, f);
+            }
+            Stmt::Match(node) => {
+                let cases = &node.cases;
                 for case in cases {
                     walk_stmt(checker, &case.body, f);
                 }

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

@@ -5,8 +5,7 @@ use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::comparable::ComparableExpr;
 use ruff_python_ast::name::UnqualifiedName;
 use ruff_python_ast::{
-    Expr, ExprAttribute, ExprCall, ExprSubscript, ExprTuple, Stmt, StmtAssign, StmtAugAssign,
-    StmtDelete, StmtFor, StmtIf,
+    self as ast, Expr, ExprAttribute, ExprCall, ExprSubscript, ExprTuple, Stmt, StmtFor,
     visitor::{self, Visitor},
 };
 use ruff_text_size::TextRange;
@@ -242,43 +241,39 @@ impl<'a> Visitor<'a> for LoopMutationsVisitor<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
         match stmt {
             // Ex) `del items[0]`
-            Stmt::Delete(StmtDelete {
-                range,
-                targets,
-                node_index: _,
-            }) => {
+            Stmt::Delete(node) => {
+                let ast::StmtDelete {
+                    range,
+                    targets,
+                    node_index: _,
+                } = &**node;
                 self.handle_delete(*range, targets);
                 visitor::walk_stmt(self, stmt);
             }
 
             // Ex) `items[0] = 1`
-            Stmt::Assign(StmtAssign { range, targets, .. }) => {
-                self.handle_assign(*range, targets);
+            Stmt::Assign(node) => {
+                self.handle_assign(node.range, &node.targets);
                 visitor::walk_stmt(self, stmt);
             }
 
             // Ex) `items += [1]`
-            Stmt::AugAssign(StmtAugAssign { range, target, .. }) => {
-                self.handle_aug_assign(*range, target);
+            Stmt::AugAssign(node) => {
+                self.handle_aug_assign(node.range, &node.target);
                 visitor::walk_stmt(self, stmt);
             }
 
             // Ex) `if True: items.append(1)`
-            Stmt::If(StmtIf {
-                test,
-                body,
-                elif_else_clauses,
-                ..
-            }) => {
+            Stmt::If(node) => {
                 // Handle the `if` branch.
                 self.branch += 1;
                 self.branches.push(self.branch);
-                self.visit_expr(test);
-                self.visit_body(body);
+                self.visit_expr(&node.test);
+                self.visit_body(&node.body);
                 self.branches.pop();
 
                 // Handle the `elif` and `else` branches.
-                for clause in elif_else_clauses {
+                for clause in &node.elif_else_clauses {
                     self.branch += 1;
                     self.branches.push(self.branch);
                     if let Some(test) = &clause.test {

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

@@ -119,13 +119,11 @@ impl<'a> Visitor<'a> for GroupNameFinder<'a> {
             return;
         }
         match stmt {
-            Stmt::For(ast::StmtFor {
-                target, iter, body, ..
-            }) => {
-                if self.name_matches(target) {
+            Stmt::For(node) => {
+                if self.name_matches(&node.target) {
                     self.overridden = true;
                 } else {
-                    if self.name_matches(iter) {
+                    if self.name_matches(&node.iter) {
                         self.increment_usage_count(1);
                         // This could happen when the group is being looped
                         // over multiple times:
@@ -136,36 +134,30 @@ impl<'a> Visitor<'a> for GroupNameFinder<'a> {
                         //      for item in group:
                         //          ...
                         if self.usage_count > 1 {
-                            self.exprs.push(iter);
+                            self.exprs.push(&node.iter);
                         }
                     }
                     self.nested = true;
-                    visitor::walk_body(self, body);
+                    visitor::walk_body(self, &node.body);
                     self.nested = false;
                 }
             }
-            Stmt::While(ast::StmtWhile { body, .. }) => {
+            Stmt::While(node) => {
                 self.nested = true;
-                visitor::walk_body(self, body);
+                visitor::walk_body(self, &node.body);
                 self.nested = false;
             }
-            Stmt::If(ast::StmtIf {
-                test,
-                body,
-                elif_else_clauses,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::If(node) => {
                 // base if plus branches
-                let mut if_stack = Vec::with_capacity(1 + elif_else_clauses.len());
+                let mut if_stack = Vec::with_capacity(1 + node.elif_else_clauses.len());
                 // Initialize the vector with the count for the if branch.
                 if_stack.push(0);
                 self.counter_stack.push(if_stack);
 
-                self.visit_expr(test);
-                self.visit_body(body);
+                self.visit_expr(&node.test);
+                self.visit_body(&node.body);
 
-                for clause in elif_else_clauses {
+                for clause in &node.elif_else_clauses {
                     self.counter_stack.last_mut().unwrap().push(0);
                     self.visit_elif_else_clause(clause);
                 }
@@ -177,15 +169,10 @@ impl<'a> Visitor<'a> for GroupNameFinder<'a> {
                     self.increment_usage_count(max_count);
                 }
             }
-            Stmt::Match(ast::StmtMatch {
-                subject,
-                cases,
-                range: _,
-                node_index: _,
-            }) => {
-                self.counter_stack.push(Vec::with_capacity(cases.len()));
-                self.visit_expr(subject);
-                for match_case in cases {
+            Stmt::Match(node) => {
+                self.counter_stack.push(Vec::with_capacity(node.cases.len()));
+                self.visit_expr(&node.subject);
+                for match_case in &node.cases {
                     self.counter_stack.last_mut().unwrap().push(0);
                     self.visit_match_case(match_case);
                 }
@@ -196,17 +183,17 @@ impl<'a> Visitor<'a> for GroupNameFinder<'a> {
                     self.increment_usage_count(max_count);
                 }
             }
-            Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
-                if targets.iter().any(|target| self.name_matches(target)) {
+            Stmt::Assign(node) => {
+                if node.targets.iter().any(|target| self.name_matches(target)) {
                     self.overridden = true;
                 } else {
-                    self.visit_expr(value);
+                    self.visit_expr(&node.value);
                 }
             }
-            Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
-                if self.name_matches(target) {
+            Stmt::AnnAssign(node) => {
+                if self.name_matches(&node.target) {
                     self.overridden = true;
-                } else if let Some(expr) = value {
+                } else if let Some(expr) = &node.value {
                     self.visit_expr(expr);
                 }
             }

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

@@ -66,7 +66,7 @@ impl AlwaysFixableViolation for SetAttrWithConstant {
 }
 
 fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> String {
-    let stmt = Stmt::Assign(ast::StmtAssign {
+    let stmt = Stmt::Assign(Box::new(ast::StmtAssign {
         targets: vec![Expr::Attribute(ast::ExprAttribute {
             value: Box::new(obj.clone()),
             attr: Identifier::new(name.to_string(), TextRange::default()),
@@ -77,7 +77,7 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> Str
         value: Box::new(value.clone()),
         range: TextRange::default(),
         node_index: ruff_python_ast::AtomicNodeIndex::NONE,
-    });
+    }));
     generator.stmt(&stmt)
 }
 

crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs

@@ -59,16 +59,20 @@ pub(crate) fn all_with_model_form(checker: &Checker, class_def: &ast::StmtClassD
     }
 
     for element in &class_def.body {
-        let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
+        let Stmt::ClassDef(class_def_inner) = element else {
             continue;
         };
+        let name = &class_def_inner.name;
+        let body = &class_def_inner.body;
         if name != "Meta" {
             continue;
         }
         for element in body {
-            let Stmt::Assign(ast::StmtAssign { targets, value, .. }) = element else {
+            let Stmt::Assign(assign) = element else {
                 continue;
             };
+            let targets = &assign.targets;
+            let value = &assign.value;
             for target in targets {
                 let Expr::Name(ast::ExprName { id, .. }) = target else {
                     continue;

crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs

@@ -57,16 +57,19 @@ pub(crate) fn exclude_with_model_form(checker: &Checker, class_def: &ast::StmtCl
     }
 
     for element in &class_def.body {
-        let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
+        let Stmt::ClassDef(class_def_inner) = element else {
             continue;
         };
+        let name = &class_def_inner.name;
+        let body = &class_def_inner.body;
         if name != "Meta" {
             continue;
         }
         for element in body {
-            let Stmt::Assign(ast::StmtAssign { targets, .. }) = element else {
+            let Stmt::Assign(assign) = element else {
                 continue;
             };
+            let targets = &assign.targets;
             for target in targets {
                 let Expr::Name(ast::ExprName { id, .. }) = target else {
                     continue;

crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs

@@ -72,7 +72,7 @@ pub(crate) fn model_without_dunder_str(checker: &Checker, class_def: &ast::StmtC
 fn has_dunder_method(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -> bool {
     analyze::class::any_super_class(class_def, semantic, &|class_def| {
         class_def.body.iter().any(|val| match val {
-            Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => name == "__str__",
+            Stmt::FunctionDef(node) => node.name.as_str() == "__str__",
             _ => false,
         })
     })
@@ -90,24 +90,25 @@ fn is_non_abstract_model(class_def: &ast::StmtClassDef, semantic: &SemanticModel
 /// Check if class is abstract, in terms of Django model inheritance.
 fn is_model_abstract(class_def: &ast::StmtClassDef) -> bool {
     for element in &class_def.body {
-        let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
+        let Stmt::ClassDef(node) = element else {
             continue;
         };
-        if name != "Meta" {
+        if node.name.as_str() != "Meta" {
             continue;
         }
-        for element in body {
+        for element in &node.body {
             match element {
-                Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
-                    if targets
+                Stmt::Assign(assign) => {
+                    if assign
+                        .targets
                         .iter()
-                        .any(|target| is_abstract_true_assignment(target, Some(value)))
+                        .any(|target| is_abstract_true_assignment(target, Some(&assign.value)))
                     {
                         return true;
                     }
                 }
-                Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
-                    if is_abstract_true_assignment(target, value.as_deref()) {
+                Stmt::AnnAssign(ann_assign) => {
+                    if is_abstract_true_assignment(&ann_assign.target, ann_assign.value.as_deref()) {
                         return true;
                     }
                 }

crates/ruff_linter/src/rules/flake8_django/rules/nullable_model_string_field.rs

@@ -1,4 +1,4 @@
-use ruff_python_ast::{self as ast, Expr, Stmt};
+use ruff_python_ast::{Expr, Stmt};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::is_const_true;
@@ -62,10 +62,13 @@ pub(crate) fn nullable_model_string_field(checker: &Checker, body: &[Stmt]) {
 
     for statement in body {
         let value = match statement {
-            Stmt::Assign(ast::StmtAssign { value, .. }) => value,
-            Stmt::AnnAssign(ast::StmtAnnAssign {
-                value: Some(value), ..
-            }) => value,
+            Stmt::Assign(assign) => &assign.value,
+            Stmt::AnnAssign(ann_assign) => {
+                match &ann_assign.value {
+                    Some(value) => value,
+                    None => continue,
+                }
+            }
             _ => continue,
         };
 

crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs

@@ -153,13 +153,13 @@ impl fmt::Display for ContentType {
 
 fn get_element_type(element: &Stmt, semantic: &SemanticModel) -> Option<ContentType> {
     match element {
-        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
-            if let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
+        Stmt::Assign(node) => {
+            if let Expr::Call(ast::ExprCall { func, .. }) = node.value.as_ref() {
                 if helpers::is_model_field(func, semantic) {
                     return Some(ContentType::FieldDeclaration);
                 }
             }
-            let expr = targets.first()?;
+            let expr = node.targets.first()?;
             let Expr::Name(ast::ExprName { id, .. }) = expr else {
                 return None;
             };
@@ -169,14 +169,14 @@ fn get_element_type(element: &Stmt, semantic: &SemanticModel) -> Option<ContentT
                 None
             }
         }
-        Stmt::ClassDef(ast::StmtClassDef { name, .. }) => {
-            if name == "Meta" {
+        Stmt::ClassDef(node) => {
+            if node.name.as_str() == "Meta" {
                 Some(ContentType::MetaClass)
             } else {
                 None
             }
         }
-        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => match name.as_str() {
+        Stmt::FunctionDef(node) => match node.name.as_str() {
             name if is_dunder(name) => Some(ContentType::MagicMethod),
             "save" => Some(ContentType::SaveMethod),
             "get_absolute_url" => Some(ContentType::GetAbsoluteUrlMethod),

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

@@ -32,10 +32,6 @@ mod tests {
         Path::new("ISC_syntax_error_2.py")
     )]
     #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
-    #[test_case(
-        Rule::ImplicitStringConcatenationInCollectionLiteral,
-        Path::new("ISC004.py")
-    )]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs

@@ -1,103 +0,0 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
-use ruff_python_ast::{Expr, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::{Edit, Fix, FixAvailability, Violation};
-
-/// ## What it does
-/// Checks for implicitly concatenated strings inside list, tuple, and set literals.
-///
-/// ## Why is this bad?
-/// In collection literals, implicit string concatenation is often the result of
-/// a missing comma between elements, which can silently merge items together.
-///
-/// ## Example
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree."
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// Instead, you likely intended:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree.",
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// If the concatenation is intentional, wrap it in parentheses to make it
-/// explicit:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     (
-///         "Clarinets are made almost entirely out of wood from the mpingo tree."
-///         "In 1971, astronaut Alan Shepard played golf on the moon."
-///     ),
-/// )
-/// ```
-///
-/// ## Fix safety
-/// The fix is safe in that it does not change the semantics of your code.
-/// However, the issue is that you may often want to change semantics
-/// by adding a missing comma.
-#[derive(ViolationMetadata)]
-#[violation_metadata(preview_since = "0.14.10")]
-pub(crate) struct ImplicitStringConcatenationInCollectionLiteral;
-
-impl Violation for ImplicitStringConcatenationInCollectionLiteral {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "Unparenthesized implicit string concatenation in collection".to_string()
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Wrap implicitly concatenated strings in parentheses".to_string())
-    }
-}
-
-/// ISC004
-pub(crate) fn implicit_string_concatenation_in_collection_literal(
-    checker: &Checker,
-    expr: &Expr,
-    elements: &[Expr],
-) {
-    for element in elements {
-        let Ok(string_like) = StringLike::try_from(element) else {
-            continue;
-        };
-        if !string_like.is_implicit_concatenated() {
-            continue;
-        }
-        if parenthesized_range(
-            string_like.as_expression_ref(),
-            expr.into(),
-            checker.tokens(),
-        )
-        .is_some()
-        {
-            continue;
-        }
-
-        let mut diagnostic = checker.report_diagnostic(
-            ImplicitStringConcatenationInCollectionLiteral,
-            string_like.range(),
-        );
-        diagnostic.help("Did you forget a comma?");
-        diagnostic.set_fix(Fix::unsafe_edits(
-            Edit::insertion("(".to_string(), string_like.range().start()),
-            [Edit::insertion(")".to_string(), string_like.range().end())],
-        ));
-    }
-}

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

@@ -1,7 +1,5 @@
-pub(crate) use collection_literal::*;
 pub(crate) use explicit::*;
 pub(crate) use implicit::*;
 
-mod collection_literal;
 mod explicit;
 mod implicit;

crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC004_ISC004.py.snap

@@ -1,149 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
----
-ISC004 [*] Unparenthesized implicit string concatenation in collection
- --> ISC004.py:4:5
-  |
-2 |       "Lobsters have blue blood.",
-3 |       "The liver is the only human organ that can fully regenerate itself.",
-4 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-5 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-  | |______________________________________________________________^
-6 |   )
-  |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-1 | facts = (
-2 |     "Lobsters have blue blood.",
-3 |     "The liver is the only human organ that can fully regenerate itself.",
-  -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-  -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-4 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-5 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-6 | )
-7 | 
-8 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:11:5
-   |
- 9 |       "Lobsters have blue blood.",
-10 |       "The liver is the only human organ that can fully regenerate itself.",
-11 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-12 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-13 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-8  | facts = [
-9  |     "Lobsters have blue blood.",
-10 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-11 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-12 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-13 | ]
-14 | 
-15 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:18:5
-   |
-16 |       "Lobsters have blue blood.",
-17 |       "The liver is the only human organ that can fully regenerate itself.",
-18 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-19 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-20 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-15 | facts = {
-16 |     "Lobsters have blue blood.",
-17 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-18 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-19 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-20 | }
-21 | 
-22 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:30:5
-   |
-29 |   facts = (
-30 | /     "Octopuses have three hearts."
-31 | |     # Missing comma here.
-32 | |     "Honey never spoils.",
-   | |_________________________^
-33 |   )
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-27 | }
-28 | 
-29 | facts = (
-   -     "Octopuses have three hearts."
-30 +     ("Octopuses have three hearts."
-31 |     # Missing comma here.
-   -     "Honey never spoils.",
-32 +     "Honey never spoils."),
-33 | )
-34 | 
-35 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:36:5
-   |
-35 |   facts = [
-36 | /     "Octopuses have three hearts."
-37 | |     # Missing comma here.
-38 | |     "Honey never spoils.",
-   | |_________________________^
-39 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-33 | )
-34 | 
-35 | facts = [
-   -     "Octopuses have three hearts."
-36 +     ("Octopuses have three hearts."
-37 |     # Missing comma here.
-   -     "Honey never spoils.",
-38 +     "Honey never spoils."),
-39 | ]
-40 | 
-41 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:42:5
-   |
-41 |   facts = {
-42 | /     "Octopuses have three hearts."
-43 | |     # Missing comma here.
-44 | |     "Honey never spoils.",
-   | |_________________________^
-45 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-39 | ]
-40 | 
-41 | facts = {
-   -     "Octopuses have three hearts."
-42 +     ("Octopuses have three hearts."
-43 |     # Missing comma here.
-   -     "Honey never spoils.",
-44 +     "Honey never spoils."),
-45 | }
-46 | 
-47 | facts = (
-note: This is an unsafe fix and may change runtime behavior

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

@@ -1,4 +1,4 @@
-use ruff_python_ast::{Stmt, StmtTry};
+use ruff_python_ast::Stmt;
 use ruff_python_semantic::SemanticModel;
 use ruff_text_size::{Ranged, TextSize};
 
@@ -8,9 +8,10 @@ pub(super) fn outside_handlers(offset: TextSize, semantic: &SemanticModel) -> bo
             break;
         }
 
-        let Stmt::Try(StmtTry { handlers, .. }) = stmt else {
+        let Stmt::Try(try_stmt) = stmt else {
             continue;
         };
+        let handlers = &try_stmt.handlers;
 
         if handlers
             .iter()

crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs

@@ -2,7 +2,7 @@ use rustc_hash::FxHashSet;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::helpers::any_over_expr;
-use ruff_python_ast::{self as ast, Expr, Stmt};
+use ruff_python_ast::{Expr, Stmt};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -59,15 +59,15 @@ pub(crate) fn duplicate_class_field_definition(checker: &Checker, body: &[Stmt])
     for stmt in body {
         // Extract the property name from the assignment statement.
         let target = match stmt {
-            Stmt::Assign(ast::StmtAssign { targets, .. }) => {
-                if let [Expr::Name(id)] = targets.as_slice() {
+            Stmt::Assign(assign_stmt) => {
+                if let [Expr::Name(id)] = assign_stmt.targets.as_slice() {
                     id
                 } else {
                     continue;
                 }
             }
-            Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
-                if let Expr::Name(id) = target.as_ref() {
+            Stmt::AnnAssign(ann_assign_stmt) => {
+                if let Expr::Name(id) = ann_assign_stmt.target.as_ref() {
                     id
                 } else {
                     continue;
@@ -78,20 +78,20 @@ pub(crate) fn duplicate_class_field_definition(checker: &Checker, body: &[Stmt])
 
         // If this is an unrolled augmented assignment (e.g., `x = x + 1`), skip it.
         match stmt {
-            Stmt::Assign(ast::StmtAssign { value, .. }) => {
-                if any_over_expr(value.as_ref(), &|expr| {
+            Stmt::Assign(assign_stmt) => {
+                if any_over_expr(assign_stmt.value.as_ref(), &|expr| {
                     expr.as_name_expr().is_some_and(|name| name.id == target.id)
                 }) {
                     continue;
                 }
             }
-            Stmt::AnnAssign(ast::StmtAnnAssign {
-                value: Some(value), ..
-            }) => {
-                if any_over_expr(value.as_ref(), &|expr| {
-                    expr.as_name_expr().is_some_and(|name| name.id == target.id)
-                }) {
-                    continue;
+            Stmt::AnnAssign(ann_assign_stmt) => {
+                if let Some(value) = &ann_assign_stmt.value {
+                    if any_over_expr(value.as_ref(), &|expr| {
+                        expr.as_name_expr().is_some_and(|name| name.id == target.id)
+                    }) {
+                        continue;
+                    }
                 }
             }
             _ => continue,

crates/ruff_linter/src/rules/flake8_pie/rules/non_unique_enums.rs

@@ -58,11 +58,11 @@ impl Violation for NonUniqueEnums {
 pub(crate) fn non_unique_enums(checker: &Checker, parent: &Stmt, body: &[Stmt]) {
     let semantic = checker.semantic();
 
-    let Stmt::ClassDef(parent) = parent else {
+    let Stmt::ClassDef(class_def) = parent else {
         return;
     };
 
-    if !parent.bases().iter().any(|expr| {
+    if !class_def.bases().iter().any(|expr| {
         semantic
             .resolve_qualified_name(expr)
             .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["enum", "Enum"]))
@@ -72,9 +72,10 @@ pub(crate) fn non_unique_enums(checker: &Checker, parent: &Stmt, body: &[Stmt])
 
     let mut seen_targets: FxHashSet<ComparableExpr> = FxHashSet::default();
     for stmt in body {
-        let Stmt::Assign(ast::StmtAssign { value, .. }) = stmt else {
+        let Stmt::Assign(assign_stmt) = stmt else {
             continue;
         };
+        let value = &assign_stmt.value;
 
         if is_call_to_enum_auto(semantic, value) {
             continue;

crates/ruff_linter/src/rules/flake8_print/rules/print_call.rs

@@ -37,11 +37,10 @@ use crate::{Fix, FixAvailability, Violation};
 /// import logging
 ///
 /// logging.basicConfig(level=logging.INFO)
-/// logger = logging.getLogger(__name__)
 ///
 ///
 /// def sum_less_than_four(a, b):
-///     logger.debug("Calling sum_less_than_four")
+///     logging.debug("Calling sum_less_than_four")
 ///     return a + b < 4
 /// ```
 ///

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

@@ -1,4 +1,3 @@
-use ruff_python_ast as ast;
 use ruff_python_ast::Stmt;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
@@ -44,17 +43,15 @@ impl AlwaysFixableViolation for StrOrReprDefinedInStub {
 
 /// PYI029
 pub(crate) fn str_or_repr_defined_in_stub(checker: &Checker, stmt: &Stmt) {
-    let Stmt::FunctionDef(ast::StmtFunctionDef {
-        name,
-        decorator_list,
-        returns,
-        parameters,
-        ..
-    }) = stmt
-    else {
+    let Stmt::FunctionDef(func_def) = stmt else {
         return;
     };
 
+    let name = &func_def.name;
+    let decorator_list = &func_def.decorator_list;
+    let returns = &func_def.returns;
+    let parameters = &func_def.parameters;
+
     let Some(returns) = returns else {
         return;
     };

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

@@ -196,15 +196,14 @@ pub(crate) fn unused_private_type_var(checker: &Checker, scope: &Scope) {
         let Some(source) = binding.source else {
             continue;
         };
-        let stmt @ Stmt::Assign(ast::StmtAssign { targets, value, .. }) =
-            checker.semantic().statement(source)
-        else {
+        let stmt = checker.semantic().statement(source);
+        let Stmt::Assign(assign) = stmt else {
             continue;
         };
-        let [Expr::Name(ast::ExprName { id, .. })] = &targets[..] else {
+        let [Expr::Name(ast::ExprName { id, .. })] = &assign.targets[..] else {
             continue;
         };
-        let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() else {
+        let Expr::Call(ast::ExprCall { func, .. }) = assign.value.as_ref() else {
             continue;
         };
 
@@ -317,18 +316,16 @@ pub(crate) fn unused_private_type_alias(checker: &Checker, scope: &Scope) {
 
 fn extract_type_alias_name<'a>(stmt: &'a ast::Stmt, semantic: &SemanticModel) -> Option<&'a str> {
     match stmt {
-        ast::Stmt::AnnAssign(ast::StmtAnnAssign {
-            target, annotation, ..
-        }) => {
-            let ast::ExprName { id, .. } = target.as_name_expr()?;
-            if semantic.match_typing_expr(annotation, "TypeAlias") {
+        ast::Stmt::AnnAssign(ann_assign) => {
+            let ast::ExprName { id, .. } = ann_assign.target.as_name_expr()?;
+            if semantic.match_typing_expr(&ann_assign.annotation, "TypeAlias") {
                 Some(id)
             } else {
                 None
             }
         }
-        ast::Stmt::TypeAlias(ast::StmtTypeAlias { name, .. }) => {
-            let ast::ExprName { id, .. } = name.as_name_expr()?;
+        ast::Stmt::TypeAlias(type_alias) => {
+            let ast::ExprName { id, .. } = type_alias.name.as_name_expr()?;
             Some(id)
         }
         _ => None,
@@ -388,9 +385,9 @@ fn extract_typeddict_name<'a>(stmt: &'a Stmt, semantic: &SemanticModel) -> Optio
         // class Bar(typing.TypedDict, typing.Generic[T]):
         //     y: T
         // ```
-        Stmt::ClassDef(class_def @ ast::StmtClassDef { name, .. }) => {
+        Stmt::ClassDef(class_def) => {
             if class_def.bases().iter().any(is_typeddict) {
-                Some(name)
+                Some(&class_def.name)
             } else {
                 None
             }
@@ -402,12 +399,12 @@ fn extract_typeddict_name<'a>(stmt: &'a Stmt, semantic: &SemanticModel) -> Optio
         // import typing
         // Baz = typing.TypedDict("Baz", {"z": bytes})
         // ```
-        Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
-            let [target] = targets.as_slice() else {
+        Stmt::Assign(assign) => {
+            let [target] = assign.targets.as_slice() else {
                 return None;
             };
             let ast::ExprName { id, .. } = target.as_name_expr()?;
-            let ast::ExprCall { func, .. } = value.as_call_expr()?;
+            let ast::ExprCall { func, .. } = assign.value.as_call_expr()?;
             if is_typeddict(func) { Some(id) } else { None }
         }
         _ => None,