Add regression test and comment for GenericContext::from_type_params

fix panic
fix memory usage reports
2025-08-15 11:15:42 +01:00 · 2025-08-14 22:01:21 +01:00 · 2025-08-14 22:01:21 +01:00 · 2025-08-14 22:01:21 +01:00 · 2025-08-14 22:01:21 +01:00
1237 changed files with 31574 additions and 50503 deletions
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -49,7 +49,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build sdist"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          command: sdist
          args: --out dist
@@ -79,7 +79,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: x86_64
          args: --release --locked --out dist
@@ -121,7 +121,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: aarch64
          args: --release --locked --out dist
@@ -177,7 +177,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          args: --release --locked --out dist
@@ -230,7 +230,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -306,7 +306,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@@ -372,7 +372,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
@@ -437,7 +437,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -441,7 +441,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
+        uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
        with:
          tool: cargo-fuzz@0.11.2
      - name: "Install cargo-fuzz"
@@ -463,7 +463,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -664,7 +664,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -694,7 +694,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
+      - uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -715,7 +715,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          args: --out dist
      - name: "Test wheel"
@@ -734,7 +734,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
@@ -777,7 +777,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -909,7 +909,7 @@ jobs:
          persist-credentials: false

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - name: "Install Rust toolchain"
        run: rustup show
@@ -942,7 +942,7 @@ jobs:
          persist-credentials: false

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - name: "Install Rust toolchain"
        run: rustup show
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,7 +34,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -11,7 +11,6 @@ on:
      - "crates/ruff_python_parser"
      - ".github/workflows/mypy_primer.yaml"
      - ".github/workflows/mypy_primer_comment.yaml"
-      - "scripts/mypy_primer.sh"
      - "Cargo.lock"
      - "!**.md"

@@ -39,7 +38,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
@@ -82,7 +81,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels-*
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
@@ -124,7 +124,7 @@ jobs:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
@@ -175,7 +175,7 @@ jobs:
    outputs:
      val: ${{ steps.host.outputs.manifest }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
@@ -251,7 +251,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -65,7 +65,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -117,7 +117,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -155,7 +155,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -33,7 +33,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -29,7 +29,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -54,9 +54,6 @@ jobs:

      - name: Compute diagnostic diff
        shell: bash
-        env:
-          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
-          TY_MAX_PARALLELISM: 1
        run: |
          RUFF_DIR="$GITHUB_WORKSPACE/ruff"

@@ -66,15 +63,15 @@ jobs:

            echo "new commit"
            git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
-            cargo build --bin ty
-            mv target/debug/ty ty-new
+            cargo build --release --bin ty
+            mv target/release/ty ty-new

            MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
            git checkout -b old_commit "$MERGE_BASE"
            echo "old commit (merge base)"
            git rev-list --format=%s --max-count=1 old_commit
-            cargo build --bin ty
-            mv target/debug/ty ty-old
+            cargo build --release --bin ty
+            mv target/release/ty ty-old
          )

          (
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,56 +1,5 @@
 # Changelog

-## 0.12.11
-
-### Preview features
-
- \[`airflow`\] Extend `AIR311` and `AIR312` rules ([#20082](https://github.com/astral-sh/ruff/pull/20082))
- \[`airflow`\] Replace wrong path `airflow.io.storage` with `airflow.io.store` (`AIR311`) ([#20081](https://github.com/astral-sh/ruff/pull/20081))
- \[`flake8-async`\] Implement `blocking-http-call-httpx-in-async-function` (`ASYNC212`) ([#20091](https://github.com/astral-sh/ruff/pull/20091))
- \[`flake8-logging-format`\] Add auto-fix for f-string logging calls (`G004`) ([#19303](https://github.com/astral-sh/ruff/pull/19303))
- \[`flake8-use-pathlib`\] Add autofix for `PTH211` ([#20009](https://github.com/astral-sh/ruff/pull/20009))
- \[`flake8-use-pathlib`\] Make `PTH100` fix unsafe because it can change behavior ([#20100](https://github.com/astral-sh/ruff/pull/20100))
-
-### Bug fixes
-
- \[`pyflakes`, `pylint`\] Fix false positives caused by `__class__` cell handling (`F841`, `PLE0117`) ([#20048](https://github.com/astral-sh/ruff/pull/20048))
- \[`pyflakes`\] Fix `allowed-unused-imports` matching for top-level modules (`F401`) ([#20115](https://github.com/astral-sh/ruff/pull/20115))
- \[`ruff`\] Fix false positive for t-strings in `default-factory-kwarg` (`RUF026`) ([#20032](https://github.com/astral-sh/ruff/pull/20032))
- \[`ruff`\] Preserve relative whitespace in multi-line expressions (`RUF033`) ([#19647](https://github.com/astral-sh/ruff/pull/19647))
-
-### Rule changes
-
- \[`ruff`\] Handle empty t-strings in `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#20045](https://github.com/astral-sh/ruff/pull/20045))
-
-### Documentation
-
- Fix incorrect `D413` links in docstrings convention FAQ ([#20089](https://github.com/astral-sh/ruff/pull/20089))
- \[`flake8-use-pathlib`\] Update links to the table showing the correspondence between `os` and `pathlib` ([#20103](https://github.com/astral-sh/ruff/pull/20103))
-
-## 0.12.10
-
-### Preview features
-
- \[`flake8-simplify`\] Implement fix for `maxsplit` without separator (`SIM905`) ([#19851](https://github.com/astral-sh/ruff/pull/19851))
- \[`flake8-use-pathlib`\] Add fixes for `PTH102` and `PTH103` ([#19514](https://github.com/astral-sh/ruff/pull/19514))
-
-### Bug fixes
-
- \[`isort`\] Handle multiple continuation lines after module docstring (`I002`) ([#19818](https://github.com/astral-sh/ruff/pull/19818))
- \[`pyupgrade`\] Avoid reporting `__future__` features as unnecessary when they are used (`UP010`) ([#19769](https://github.com/astral-sh/ruff/pull/19769))
- \[`pyupgrade`\] Handle nested `Optional`s (`UP045`) ([#19770](https://github.com/astral-sh/ruff/pull/19770))
-
-### Rule changes
-
- \[`pycodestyle`\] Make `E731` fix unsafe instead of display-only for class assignments ([#19700](https://github.com/astral-sh/ruff/pull/19700))
- \[`pyflakes`\] Add secondary annotation showing previous definition (`F811`) ([#19900](https://github.com/astral-sh/ruff/pull/19900))
-
-### Documentation
-
- Fix description of global config file discovery strategy ([#19188](https://github.com/astral-sh/ruff/pull/19188))
- Update outdated links to <https://typing.python.org/en/latest/source/stubs.html> ([#19992](https://github.com/astral-sh/ruff/pull/19992))
- \[`flake8-annotations`\] Remove unused import in example (`ANN401`) ([#20000](https://github.com/astral-sh/ruff/pull/20000))
-
 ## 0.12.9

 ### Preview features
@@ -75,31 +24,8 @@
 ### Other changes

 - Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))
-
 - Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))

- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))
-
-    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):
-
-    ```diff
-    -unused.py:8:19: F401 [*] `pathlib` imported but unused
-    +F401 [*] `pathlib` imported but unused
-    +  --> unused.py:8:19
-        |
-      7 | # Unused, _not_ marked as required (due to the alias).
-      8 | import pathlib as non_alias
-    -   |                   ^^^^^^^^^ F401
-    +   |                   ^^^^^^^^^
-      9 |
-     10 | # Unused, marked as required.
-        |
-    -   = help: Remove unused import: `pathlib`
-    +help: Remove unused import: `pathlib`
-    ```
-
-    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
-
 ## 0.12.8

 ### Preview features
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -128,9 +128,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

 [[package]]
 name = "approx"
@@ -257,9 +257,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"

 [[package]]
 name = "bitvec"
@@ -295,7 +295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
 "memchr",
- "regex-automata 0.4.10",
+ "regex-automata 0.4.9",
 "serde",
 ]

@@ -408,9 +408,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.45"
+version = "4.5.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
+checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -418,9 +418,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.44"
+version = "4.5.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
+checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
 dependencies = [
 "anstream",
 "anstyle",
@@ -461,9 +461,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.45"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -485,7 +485,7 @@ checksum = "85a8ab73a1c02b0c15597b22e09c7dc36e63b2f601f9d1e83ac0c3decd38b1ae"
 dependencies = [
 "nix 0.29.0",
 "terminfo",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "which",
 "windows-sys 0.59.0",
 ]
@@ -955,7 +955,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1035,7 +1035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1084,14 +1084,14 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.26"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
 "cfg-if",
 "libc",
 "libredox",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1118,9 +1118,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"

 [[package]]
 name = "form_urlencoded"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
 "percent-encoding",
 ]
@@ -1218,9 +1218,9 @@ dependencies = [

 [[package]]
 name = "glob"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"

 [[package]]
 name = "globset"
@@ -1231,7 +1231,7 @@ dependencies = [
 "aho-corasick",
 "bstr",
 "log",
- "regex-automata 0.4.10",
+ "regex-automata 0.4.9",
 "regex-syntax 0.8.5",
 ]

@@ -1241,7 +1241,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "ignore",
 "walkdir",
 ]
@@ -1430,9 +1430,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "idna"
-version = "1.1.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
 "idna_adapter",
 "smallvec",
@@ -1459,7 +1459,7 @@ dependencies = [
 "globset",
 "log",
 "memchr",
- "regex-automata 0.4.10",
+ "regex-automata 0.4.9",
 "same-file",
 "walkdir",
 "winapi-util",
@@ -1486,9 +1486,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.5",
@@ -1521,7 +1521,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "inotify-sys",
 "libc",
 ]
@@ -1764,9 +1764,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"

 [[package]]
 name = "libcst"
@@ -1780,7 +1780,7 @@ dependencies = [
 "paste",
 "peg",
 "regex",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 ]

 [[package]]
@@ -1809,7 +1809,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "libc",
 "redox_syscall",
 ]
@@ -2014,7 +2014,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -2026,7 +2026,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -2054,7 +2054,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "fsevent-sys",
 "inotify",
 "kqueue",
@@ -2127,9 +2127,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "ordermap"
-version = "0.5.9"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd6fedcd996c8c97932075cc3811d83f53280f48d5620e4e3cab7f6a12678c4"
+checksum = "6d6bff06e4a5dc6416bead102d3e63c480dd852ffbb278bf8cfeb4966b329609"
 dependencies = [
 "indexmap",
 "serde",
@@ -2283,9 +2283,9 @@ dependencies = [

 [[package]]
 name = "percent-encoding"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

 [[package]]
 name = "pest"
@@ -2294,7 +2294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
 dependencies = [
 "memchr",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "ucd-trie",
 ]

@@ -2473,9 +2473,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "beef09f85ae72cea1ef96ba6870c51e6382ebfa4f0e85b643459331f3daa5be0"
 dependencies = [
 "unicode-ident",
 ]
@@ -2490,7 +2490,7 @@ dependencies = [
 "pep440_rs",
 "pep508_rs",
 "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "toml 0.8.23",
 ]

@@ -2505,7 +2505,7 @@ dependencies = [
 "newtype-uuid",
 "quick-xml",
 "strip-ansi-escapes",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "uuid",
 ]

@@ -2666,7 +2666,7 @@ version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 ]

 [[package]]
@@ -2677,18 +2677,18 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
 "getrandom 0.2.16",
 "libredox",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 ]

 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.10",
+ "regex-automata 0.4.9",
 "regex-syntax 0.8.5",
 ]

@@ -2703,9 +2703,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2743,13 +2743,13 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.12.11"
+version = "0.12.9"
 dependencies = [
 "anyhow",
 "argfile",
 "assert_fs",
 "bincode 2.0.1",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "cachedir",
 "clap",
 "clap_complete_command",
@@ -2793,7 +2793,7 @@ dependencies = [
 "strum",
 "tempfile",
 "test-case",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tikv-jemallocator",
 "toml 0.9.5",
 "tracing",
@@ -2870,7 +2870,6 @@ dependencies = [
 "insta",
 "matchit",
 "path-slash",
- "pathdiff",
 "quick-junit",
 "ruff_annotate_snippets",
 "ruff_cache",
@@ -2887,9 +2886,8 @@ dependencies = [
 "schemars",
 "serde",
 "serde_json",
- "similar",
 "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tracing",
 "tracing-subscriber",
 "ty_static",
@@ -2936,7 +2934,6 @@ dependencies = [
 "tracing-subscriber",
 "ty",
 "ty_project",
- "ty_python_semantic",
 "ty_static",
 "url",
 ]
@@ -2999,11 +2996,11 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.12.11"
+version = "0.12.9"
 dependencies = [
 "aho-corasick",
 "anyhow",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "clap",
 "colored 3.0.0",
 "fern",
@@ -3021,6 +3018,7 @@ dependencies = [
 "memchr",
 "natord",
 "path-absolutize",
+ "pathdiff",
 "pep440_rs",
 "pyproject-toml",
 "regex",
@@ -3049,7 +3047,7 @@ dependencies = [
 "strum_macros",
 "tempfile",
 "test-case",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "toml 0.9.5",
 "typed-arena",
 "unicode-normalization",
@@ -3092,7 +3090,7 @@ dependencies = [
 "serde_json",
 "serde_with",
 "test-case",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "uuid",
 ]

@@ -3108,7 +3106,7 @@ name = "ruff_python_ast"
 version = "0.0.0"
 dependencies = [
 "aho-corasick",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "compact_str",
 "get-size2",
 "is-macro",
@@ -3123,7 +3121,7 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 ]

 [[package]]
@@ -3177,7 +3175,7 @@ dependencies = [
 "similar",
 "smallvec",
 "static_assertions",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tracing",
 ]

@@ -3196,7 +3194,7 @@ dependencies = [
 name = "ruff_python_literal"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "itertools 0.14.0",
 "ruff_python_ast",
 "unic-ucd-category",
@@ -3207,7 +3205,7 @@ name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "bstr",
 "compact_str",
 "get-size2",
@@ -3232,7 +3230,7 @@ dependencies = [
 name = "ruff_python_semantic"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "insta",
 "is-macro",
 "ruff_cache",
@@ -3253,7 +3251,7 @@ dependencies = [
 name = "ruff_python_stdlib"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "unicode-ident",
 ]

@@ -3307,7 +3305,7 @@ dependencies = [
 "serde",
 "serde_json",
 "shellexpand",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "toml 0.9.5",
 "tracing",
 "tracing-log",
@@ -3337,7 +3335,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.12.11"
+version = "0.12.9"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3430,11 +3428,11 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -3452,7 +3450,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3476,12 +3474,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"

 [[package]]
 name = "salsa-macros"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=a3ffa22cb26756473d56f867aedec3fd907c4dd9#a3ffa22cb26756473d56f867aedec3fd907c4dd9"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3578,9 +3576,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.142"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
 dependencies = [
 "itoa",
 "memchr",
@@ -3791,9 +3789,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3917,11 +3915,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.12",
 ]

 [[package]]
@@ -3937,9 +3935,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4138,9 +4136,9 @@ dependencies = [

 [[package]]
 name = "tracing-indicatif"
-version = "0.3.13"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04d4e11e0e27acef25a47f27e9435355fecdc488867fa2bc90e75b0700d2823d"
+checksum = "e1983afead46ff13a3c93581e0cec31d20b29efdd22cbdaa8b9f850eccf2c352"
 dependencies = [
 "indicatif",
 "tracing",
@@ -4240,22 +4238,17 @@ dependencies = [
 name = "ty_ide"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.3",
- "get-size2",
+ "bitflags 2.9.1",
 "insta",
 "itertools 0.14.0",
- "rayon",
 "regex",
 "ruff_db",
- "ruff_index",
- "ruff_memory_usage",
 "ruff_python_ast",
 "ruff_python_parser",
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
 "rustc-hash",
- "salsa",
 "smallvec",
 "tracing",
 "ty_project",
@@ -4278,7 +4271,7 @@ dependencies = [
 "pep440_rs",
 "rayon",
 "regex",
- "regex-automata 0.4.10",
+ "regex-automata 0.4.9",
 "ruff_cache",
 "ruff_db",
 "ruff_macros",
@@ -4291,7 +4284,7 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "toml 0.9.5",
 "tracing",
 "ty_combine",
@@ -4304,7 +4297,7 @@ name = "ty_python_semantic"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "bitvec",
 "camino",
 "colored 3.0.0",
@@ -4344,7 +4337,7 @@ dependencies = [
 "strum_macros",
 "tempfile",
 "test-case",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tracing",
 "ty_python_semantic",
 "ty_static",
@@ -4357,7 +4350,7 @@ name = "ty_server"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "crossbeam",
 "dunce",
 "insta",
@@ -4378,7 +4371,7 @@ dependencies = [
 "serde_json",
 "shellexpand",
 "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "tracing",
 "tracing-subscriber",
 "ty_combine",
@@ -4400,7 +4393,7 @@ name = "ty_test"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 "camino",
 "colored 3.0.0",
 "insta",
@@ -4419,7 +4412,7 @@ dependencies = [
 "serde",
 "smallvec",
 "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.12",
 "toml 0.9.5",
 "tracing",
 "ty_python_semantic",
@@ -4596,9 +4589,9 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"

 [[package]]
 name = "url"
-version = "2.5.7"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
 "form_urlencoded",
 "idna",
@@ -5150,7 +5143,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.1",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.86"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -143,7 +143,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 = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "918d35d873b2b73a0237536144ef4d22e8d57f27", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
@@ -215,8 +215,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [

 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -2 }
-# Enabled at the crate level
-disallowed_methods = "allow"
 # Allowed pedantic lints
 char_lit_as_u8 = "allow"
 collapsible_else_if = "allow"
@@ -255,7 +253,6 @@ unused_peekable = "warn"
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"

-
 [profile.release]
 # Note that we set these explicitly, and these values
 # were chosen based on a trade-off between compile times
--- a/README.md
+++ b/README.md
@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.11/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.11/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.9/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.9/install.ps1 | iex"
 ```

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.12.11
+  rev: v0.12.9
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/clippy.toml
+++ b/clippy.toml
@@ -24,20 +24,3 @@ ignore-interior-mutability = [
    # The expression is read-only.
    "ruff_python_ast::hashable::HashableExpr",
 ]
-
-disallowed-methods = [
-    { path = "std::env::var", reason = "Use System::env_var instead in ty crates" },
-    { path = "std::env::current_dir", reason = "Use System::current_directory instead in ty crates" },
-    { path = "std::fs::read_to_string", reason = "Use System::read_to_string instead in ty crates" },
-    { path = "std::fs::metadata", reason = "Use System::path_metadata instead in ty crates" },
-    { path = "std::fs::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "dunce::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "std::fs::read_dir", reason = "Use System::read_directory instead in ty crates" },
-    { path = "std::fs::write", reason = "Use WritableSystem::write_file instead in ty crates" },
-    { path = "std::fs::create_dir_all", reason = "Use WritableSystem::create_directory_all instead in ty crates" },
-    { path = "std::fs::File::create_new", reason = "Use WritableSystem::create_new_file instead in ty crates" },
-    # Path methods that have System trait equivalents
-    { path = "std::path::Path::exists", reason = "Use System::path_exists instead in ty crates" },
-    { path = "std::path::Path::is_dir", reason = "Use System::is_directory instead in ty crates" },
-    { path = "std::path::Path::is_file", reason = "Use System::is_file instead in ty crates" },
-]
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.11"
+version = "0.12.9"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -15,7 +15,8 @@ use ruff_db::diagnostic::{
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
-    Emitter, EmitterContext, GithubEmitter, GroupedEmitter, SarifEmitter, TextEmitter,
+    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, SarifEmitter,
+    TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -295,11 +296,7 @@ impl Printer {
                GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
            OutputFormat::Gitlab => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Gitlab)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
            }
            OutputFormat::Pylint => {
                let config = DisplayDiagnosticConfig::default()
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -5801,32 +5801,3 @@ fn future_annotations_preview_warning() {
    ",
    );
 }
-
-#[test]
-fn up045_nested_optional_flatten_all() {
-    let contents = "\
-from typing import Optional
-nested_optional: Optional[Optional[Optional[str]]] = None
-";
-
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
-            .arg("-")
-            .pass_stdin(contents),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    @@ -1,2 +1,2 @@
-     from typing import Optional
-    -nested_optional: Optional[Optional[Optional[str]]] = None
-    +nested_optional: str | None = None
-
-
-    ----- stderr -----
-    Would fix 1 error.
-    ",
-    );
-}
--- a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
@@ -20,59 +20,59 @@ exit_code: 1
  {
    "check_name": "F401",
    "description": "F401: `os` imported but unused",
-    "severity": "major",
    "fingerprint": "4dbad37161e65c72",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 1,
-          "column": 8
+          "column": 8,
+          "line": 1
        },
        "end": {
-          "line": 1,
-          "column": 10
+          "column": 10,
+          "line": 1
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "F821",
    "description": "F821: Undefined name `y`",
-    "severity": "major",
    "fingerprint": "7af59862a085230",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 2,
-          "column": 5
+          "column": 5,
+          "line": 2
        },
        "end": {
-          "line": 2,
-          "column": 6
+          "column": 6,
+          "line": 2
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "invalid-syntax",
    "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "severity": "major",
    "fingerprint": "e558cec859bb66e8",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 3,
-          "column": 1
+          "column": 1,
+          "line": 3
        },
        "end": {
-          "line": 3,
-          "column": 6
+          "column": 6,
+          "line": 3
        }
      }
-    }
+    },
+    "severity": "major"
  }
 ]
 ----- stderr -----
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -450,6 +450,9 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                    r#"
                    class C:
                        def f(self: "C"):
+                            self.a = ""
+                            self.b = ""
+
                            if isinstance(self.a, str):
                                return

@@ -463,56 +466,6 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                                return
                            if isinstance(self.b, str):
                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-
-                            self.a = ""
-                            self.b = ""
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_3(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_3]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression test for https://github.com/astral-sh/ty/issues/758
-                setup_micro_case(
-                    r#"
-                    class GridOut:
-                        def __init__(self: "GridOut") -> None:
-                            self._buffer = b""
-
-                        def _read_size_or_line(self: "GridOut", size: int = -1):
-                            if size > self._position:
-                                size = self._position
-                                pass
-                            if size == 0:
-                                return bytes()
-
-                            while size > 0:
-                                if self._buffer:
-                                    buf = self._buffer
-                                    self._buffer = b""
-                                else:
-                                    buf = b""
-
-                                if len(buf) > size:
-                                    self._buffer = buf
-                                    self._position -= len(self._buffer)
                    "#,
                )
            },
@@ -715,7 +668,6 @@ criterion_group!(
    benchmark_tuple_implicit_instance_attributes,
    benchmark_complex_constrained_attributes_1,
    benchmark_complex_constrained_attributes_2,
-    benchmark_complex_constrained_attributes_3,
    benchmark_many_enum_members,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -34,14 +34,12 @@ glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
 path-slash = { workspace = true }
-pathdiff = { workspace = true }
 quick-junit = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-similar = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
@@ -54,7 +52,7 @@ web-time = { version = "1.1.0" }
 etcetera = { workspace = true, optional = true }

 [dev-dependencies]
-insta = { workspace = true, features = ["filters"] }
+insta = { workspace = true }
 tempfile = { workspace = true }

 [features]
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -325,11 +325,6 @@ impl Diagnostic {
        self.inner.fix.as_ref()
    }

-    #[cfg(test)]
-    pub(crate) fn fix_mut(&mut self) -> Option<&mut Fix> {
-        Arc::make_mut(&mut self.inner).fix.as_mut()
-    }
-
    /// Set the fix for this diagnostic.
    pub fn set_fix(&mut self, fix: Fix) {
        debug_assert!(
@@ -1299,10 +1294,6 @@ pub struct DisplayDiagnosticConfig {
    hide_severity: bool,
    /// Whether to show the availability of a fix in a diagnostic.
    show_fix_status: bool,
-    /// Whether to show the diff for an available fix after the main diagnostic.
-    ///
-    /// This currently only applies to `DiagnosticFormat::Full`.
-    show_fix_diff: bool,
    /// The lowest applicability that should be shown when reporting diagnostics.
    fix_applicability: Applicability,
 }
@@ -1350,14 +1341,6 @@ impl DisplayDiagnosticConfig {
        }
    }

-    /// Whether to show a diff for an available fix after the main diagnostic.
-    pub fn show_fix_diff(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            show_fix_diff: yes,
-            ..self
-        }
-    }
-
    /// Set the lowest fix applicability that should be shown.
    ///
    /// In other words, an applicability of `Safe` (the default) would suppress showing fixes or fix
@@ -1381,7 +1364,6 @@ impl Default for DisplayDiagnosticConfig {
            preview: false,
            hide_severity: false,
            show_fix_status: false,
-            show_fix_diff: false,
            fix_applicability: Applicability::Safe,
        }
    }
@@ -1435,11 +1417,6 @@ pub enum DiagnosticFormat {
    /// Print diagnostics in the format expected by JUnit.
    #[cfg(feature = "junit")]
    Junit,
-    /// Print diagnostics in the JSON format used by GitLab [Code Quality] reports.
-    ///
-    /// [Code Quality]: https://docs.gitlab.com/ee/ci/testing/code_quality.html#implement-a-custom-tool
-    #[cfg(feature = "serde")]
-    Gitlab,
 }

 /// A representation of the kinds of messages inside a diagnostic.
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -31,8 +31,6 @@ mod azure;
 mod concise;
 mod full;
 #[cfg(feature = "serde")]
-mod gitlab;
-#[cfg(feature = "serde")]
 mod json;
 #[cfg(feature = "serde")]
 mod json_lines;
@@ -138,10 +136,6 @@ impl std::fmt::Display for DisplayDiagnostics<'_> {
            DiagnosticFormat::Junit => {
                junit::JunitRenderer::new(self.resolver).render(f, self.diagnostics)?;
            }
-            #[cfg(feature = "serde")]
-            DiagnosticFormat::Gitlab => {
-                gitlab::GitlabRenderer::new(self.resolver).render(f, self.diagnostics)?;
-            }
        }

        Ok(())
@@ -2628,13 +2622,6 @@ watermelon
            self.config = config;
        }

-        /// Show a diff for the fix when rendering.
-        pub(super) fn show_fix_diff(&mut self, yes: bool) {
-            let mut config = std::mem::take(&mut self.config);
-            config = config.show_fix_diff(yes);
-            self.config = config;
-        }
-
        /// The lowest fix applicability to show when rendering.
        pub(super) fn fix_applicability(&mut self, applicability: Applicability) {
            let mut config = std::mem::take(&mut self.config);
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -1,18 +1,7 @@
-use std::borrow::Cow;
-use std::num::NonZeroUsize;
-
-use anstyle::Style;
-use ruff_notebook::NotebookIndex;
-use similar::{ChangeTag, TextDiff};
-
 use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-use ruff_diagnostics::{Applicability, Fix};
-use ruff_source_file::OneIndexed;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};

 use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DisplayDiagnosticConfig, stylesheet::DiagnosticStylesheet};

 pub(super) struct FullRenderer<'a> {
    resolver: &'a dyn FileResolver,
@@ -59,245 +48,15 @@ impl<'a> FullRenderer<'a> {
                writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
            }
            writeln!(f)?;
-
-            if self.config.show_fix_diff {
-                if let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver) {
-                    writeln!(f, "{diff}")?;
-                }
-            }
        }

        Ok(())
    }
 }

-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the `Edit` because diff calculation is expensive.
-struct Diff<'a> {
-    fix: &'a Fix,
-    diagnostic_source: DiagnosticSource,
-    notebook_index: Option<NotebookIndex>,
-    stylesheet: &'a DiagnosticStylesheet,
-}
-
-impl<'a> Diff<'a> {
-    fn from_diagnostic(
-        diagnostic: &'a Diagnostic,
-        stylesheet: &'a DiagnosticStylesheet,
-        resolver: &'a dyn FileResolver,
-    ) -> Option<Diff<'a>> {
-        let file = &diagnostic.primary_span_ref()?.file;
-        Some(Diff {
-            fix: diagnostic.fix()?,
-            diagnostic_source: file.diagnostic_source(resolver),
-            notebook_index: resolver.notebook_index(file),
-            stylesheet,
-        })
-    }
-}
-
-impl std::fmt::Display for Diff<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let source_code = self.diagnostic_source.as_source_code();
-        let source_text = source_code.text();
-
-        // Partition the source code into end offsets for each cell. If `self.notebook_index` is
-        // `None`, indicating a regular script file, all the lines will be in one "cell" under the
-        // `None` key.
-        let cells = if let Some(notebook_index) = &self.notebook_index {
-            let mut last_cell = OneIndexed::MIN;
-            let mut cells: Vec<(Option<OneIndexed>, TextSize)> = Vec::new();
-            for (row, cell) in notebook_index.iter() {
-                if cell != last_cell {
-                    let offset = source_code.line_start(row);
-                    cells.push((Some(last_cell), offset));
-                    last_cell = cell;
-                }
-            }
-            cells.push((Some(last_cell), source_text.text_len()));
-            cells
-        } else {
-            vec![(None, source_text.text_len())]
-        };
-
-        let message = match self.fix.applicability() {
-            // TODO(zanieb): Adjust this messaging once it's user-facing
-            Applicability::Safe => "Safe fix",
-            Applicability::Unsafe => "Unsafe fix",
-            Applicability::DisplayOnly => "Display-only fix",
-        };
-
-        // TODO(brent) `stylesheet.separator` is cyan rather than blue, as we had before. I think
-        // we're getting rid of this soon anyway, so I didn't think it was worth adding another
-        // style to the stylesheet temporarily. The color doesn't appear at all in the snapshot
-        // tests, which is the only place these are currently used.
-        writeln!(f, "ℹ {}", fmt_styled(message, self.stylesheet.separator))?;
-
-        let mut last_end = TextSize::ZERO;
-        for (cell, offset) in cells {
-            let range = TextRange::new(last_end, offset);
-            last_end = offset;
-            let input = source_code.slice(range);
-
-            let mut output = String::with_capacity(input.len());
-            let mut last_end = range.start();
-
-            let mut applied = 0;
-            for edit in self.fix.edits() {
-                if range.contains_range(edit.range()) {
-                    output.push_str(source_code.slice(TextRange::new(last_end, edit.start())));
-                    output.push_str(edit.content().unwrap_or_default());
-                    last_end = edit.end();
-                    applied += 1;
-                }
-            }
-
-            // No edits were applied, so there's no need to diff.
-            if applied == 0 {
-                continue;
-            }
-
-            output.push_str(&source_text[usize::from(last_end)..usize::from(range.end())]);
-
-            let diff = TextDiff::from_lines(input, &output);
-
-            let (largest_old, largest_new) = diff
-                .ops()
-                .last()
-                .map(|op| (op.old_range().start, op.new_range().start))
-                .unwrap_or_default();
-
-            let digit_with = OneIndexed::from_zero_indexed(largest_new.max(largest_old)).digits();
-
-            if let Some(cell) = cell {
-                // Room for 2 digits, 2 x 1 space before each digit, 1 space, and 1 `|`. This
-                // centers the three colons on the pipe.
-                writeln!(f, "{:>1$} cell {cell}", ":::", 2 * digit_with.get() + 4)?;
-            }
-
-            for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
-                if idx > 0 {
-                    writeln!(f, "{:-^1$}", "-", 80)?;
-                }
-                for op in group {
-                    for change in diff.iter_inline_changes(op) {
-                        let sign = match change.tag() {
-                            ChangeTag::Delete => "-",
-                            ChangeTag::Insert => "+",
-                            ChangeTag::Equal => " ",
-                        };
-
-                        let line_style = LineStyle::from(change.tag(), self.stylesheet);
-
-                        let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
-                        let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
-
-                        write!(
-                            f,
-                            "{} {} |{}",
-                            Line {
-                                index: old_index,
-                                width: digit_with,
-                            },
-                            Line {
-                                index: new_index,
-                                width: digit_with,
-                            },
-                            fmt_styled(line_style.apply_to(sign), self.stylesheet.emphasis),
-                        )?;
-
-                        for (emphasized, value) in change.iter_strings_lossy() {
-                            let value = show_nonprinting(&value);
-                            if emphasized {
-                                write!(
-                                    f,
-                                    "{}",
-                                    fmt_styled(
-                                        line_style.apply_to(&value),
-                                        self.stylesheet.underline
-                                    )
-                                )?;
-                            } else {
-                                write!(f, "{}", line_style.apply_to(&value))?;
-                            }
-                        }
-                        if change.missing_newline() {
-                            writeln!(f)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct LineStyle {
-    style: Style,
-}
-
-impl LineStyle {
-    fn apply_to(&self, input: &str) -> impl std::fmt::Display {
-        fmt_styled(input, self.style)
-    }
-
-    fn from(value: ChangeTag, stylesheet: &DiagnosticStylesheet) -> LineStyle {
-        match value {
-            ChangeTag::Equal => LineStyle {
-                style: stylesheet.none,
-            },
-            ChangeTag::Delete => LineStyle {
-                style: stylesheet.deletion,
-            },
-            ChangeTag::Insert => LineStyle {
-                style: stylesheet.insertion,
-            },
-        }
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl std::fmt::Display for Line {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-fn show_nonprinting(s: &str) -> Cow<'_, str> {
-    if s.find(['\x07', '\x08', '\x1b', '\x7f']).is_some() {
-        Cow::Owned(
-            s.replace('\x07', "␇")
-                .replace('\x08', "␈")
-                .replace('\x1b', "␛")
-                .replace('\x7f', "␡"),
-        )
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::{Applicability, Fix};
+    use ruff_diagnostics::Applicability;
    use ruff_text_size::{TextLen, TextRange, TextSize};

    use crate::diagnostic::{
@@ -698,107 +457,6 @@ print()
        ");
    }

-    /// Test that we remap notebook cell line numbers in the diff as well as the main diagnostic.
-    #[test]
-    fn notebook_output_with_diff() {
-        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        ℹ Safe fix
-           ::: cell 1
-        1 1 | # cell 1
-        2   |-import os
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-
-        ℹ Safe fix
-           ::: cell 2
-        1 1 | # cell 2
-        2   |-import math
-        3 2 | 
-        4 3 | print('hello world')
-
-        error[unused-variable]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-
-        ℹ Unsafe fix
-           ::: cell 3
-        1 1 | # cell 3
-        2 2 | def foo():
-        3 3 |     print()
-        4   |-    x = 1
-        5 4 |
-        ");
-    }
-
-    #[test]
-    fn notebook_output_with_diff_spanning_cells() {
-        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-
-        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
-        // single diagnostic with edits in different cells.
-        let mut diagnostic = diagnostics.swap_remove(0);
-        let fix = diagnostic.fix_mut().unwrap();
-        let mut edits = fix.edits().to_vec();
-        for diag in diagnostics {
-            edits.extend_from_slice(diag.fix().unwrap().edits());
-        }
-        *fix = Fix::unsafe_edits(edits.remove(0), edits);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        ℹ Unsafe fix
-           ::: cell 1
-        1 1 | # cell 1
-        2   |-import os
-           ::: cell 2
-        1 1 | # cell 2
-        2   |-import math
-        3 2 | 
-        4 3 | print('hello world')
-           ::: cell 3
-        1 1 | # cell 3
-        2 2 | def foo():
-        3 3 |     print()
-        4   |-    x = 1
-        5 4 |
-        ");
-    }
-
    /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
    /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
    #[test]
--- a/crates/ruff_db/src/diagnostic/render/gitlab.rs
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -1,205 +0,0 @@
-use std::{
-    collections::HashSet,
-    hash::{DefaultHasher, Hash, Hasher},
-    path::Path,
-};
-
-use ruff_source_file::LineColumn;
-use serde::{Serialize, Serializer, ser::SerializeSeq};
-
-use crate::diagnostic::{Diagnostic, Severity};
-
-use super::FileResolver;
-
-pub(super) struct GitlabRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-}
-
-impl<'a> GitlabRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
-        Self { resolver }
-    }
-}
-
-impl GitlabRenderer<'_> {
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            serde_json::to_string_pretty(&SerializedMessages {
-                diagnostics,
-                resolver: self.resolver,
-                #[expect(
-                    clippy::disallowed_methods,
-                    reason = "We don't have access to a `System` here, \
-                              and this is only intended for use by GitLab CI, \
-                              which runs on a real `System`."
-                )]
-                project_dir: std::env::var("CI_PROJECT_DIR").ok().as_deref(),
-            })
-            .unwrap()
-        )
-    }
-}
-
-struct SerializedMessages<'a> {
-    diagnostics: &'a [Diagnostic],
-    resolver: &'a dyn FileResolver,
-    project_dir: Option<&'a str>,
-}
-
-impl Serialize for SerializedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
-        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
-
-        for diagnostic in self.diagnostics {
-            let location = diagnostic
-                .primary_span()
-                .map(|span| {
-                    let file = span.file();
-                    let positions = if self.resolver.is_notebook(file) {
-                        // We can't give a reasonable location for the structured formats,
-                        // so we show one that's clearly a fallback
-                        Default::default()
-                    } else {
-                        let diagnostic_source = file.diagnostic_source(self.resolver);
-                        let source_code = diagnostic_source.as_source_code();
-                        span.range()
-                            .map(|range| Positions {
-                                begin: source_code.line_column(range.start()),
-                                end: source_code.line_column(range.end()),
-                            })
-                            .unwrap_or_default()
-                    };
-
-                    let path = self.project_dir.as_ref().map_or_else(
-                        || file.relative_path(self.resolver).display().to_string(),
-                        |project_dir| relativize_path_to(file.path(self.resolver), project_dir),
-                    );
-
-                    Location { path, positions }
-                })
-                .unwrap_or_default();
-
-            let mut message_fingerprint = fingerprint(diagnostic, &location.path, 0);
-
-            // Make sure that we do not get a fingerprint that is already in use
-            // by adding in the previously generated one.
-            while fingerprints.contains(&message_fingerprint) {
-                message_fingerprint = fingerprint(diagnostic, &location.path, message_fingerprint);
-            }
-            fingerprints.insert(message_fingerprint);
-
-            let description = diagnostic.body();
-            let check_name = diagnostic.secondary_code_or_id();
-            let severity = match diagnostic.severity() {
-                Severity::Info => "info",
-                Severity::Warning => "minor",
-                Severity::Error => "major",
-                // Another option here is `blocker`
-                Severity::Fatal => "critical",
-            };
-
-            let value = Message {
-                check_name,
-                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
-                // so prepend it to the description too.
-                description: format!("{check_name}: {description}"),
-                severity,
-                fingerprint: format!("{:x}", message_fingerprint),
-                location,
-            };
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-#[derive(Serialize)]
-struct Message<'a> {
-    check_name: &'a str,
-    description: String,
-    severity: &'static str,
-    fingerprint: String,
-    location: Location,
-}
-
-/// The place in the source code where the issue was discovered.
-///
-/// According to the CodeClimate report format [specification] linked from the GitLab [docs], this
-/// field is required, so we fall back on a default `path` and position if the diagnostic doesn't
-/// have a primary span.
-///
-/// [specification]: https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types
-/// [docs]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
-#[derive(Default, Serialize)]
-struct Location {
-    path: String,
-    positions: Positions,
-}
-
-#[derive(Default, Serialize)]
-struct Positions {
-    begin: LineColumn,
-    end: LineColumn,
-}
-
-/// Generate a unique fingerprint to identify a violation.
-fn fingerprint(diagnostic: &Diagnostic, project_path: &str, salt: u64) -> u64 {
-    let mut hasher = DefaultHasher::new();
-
-    salt.hash(&mut hasher);
-    diagnostic.name().hash(&mut hasher);
-    project_path.hash(&mut hasher);
-
-    hasher.finish()
-}
-
-/// Convert an absolute path to be relative to the specified project root.
-fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
-    format!(
-        "{}",
-        pathdiff::diff_paths(&path, project_root)
-            .expect("Could not diff paths")
-            .display()
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
-    };
-
-    const FINGERPRINT_FILTERS: [(&str, &str); 1] = [(
-        r#""fingerprint": "[a-z0-9]+","#,
-        r#""fingerprint": "<redacted>","#,
-    )];
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-}
--- a/crates/ruff_db/src/diagnostic/stylesheet.rs
+++ b/crates/ruff_db/src/diagnostic/stylesheet.rs
@@ -40,12 +40,9 @@ pub struct DiagnosticStylesheet {
    pub(crate) help: Style,
    pub(crate) line_no: Style,
    pub(crate) emphasis: Style,
-    pub(crate) underline: Style,
    pub(crate) none: Style,
    pub(crate) separator: Style,
    pub(crate) secondary_code: Style,
-    pub(crate) insertion: Style,
-    pub(crate) deletion: Style,
 }

 impl Default for DiagnosticStylesheet {
@@ -66,12 +63,9 @@ impl DiagnosticStylesheet {
            help: AnsiColor::BrightCyan.on_default().effects(Effects::BOLD),
            line_no: bright_blue.effects(Effects::BOLD),
            emphasis: Style::new().effects(Effects::BOLD),
-            underline: Style::new().effects(Effects::UNDERLINE),
            none: Style::new(),
            separator: AnsiColor::Cyan.on_default(),
            secondary_code: AnsiColor::Red.on_default().effects(Effects::BOLD),
-            insertion: AnsiColor::Green.on_default(),
-            deletion: AnsiColor::Red.on_default(),
        }
    }

@@ -84,12 +78,9 @@ impl DiagnosticStylesheet {
            help: Style::new(),
            line_no: Style::new(),
            emphasis: Style::new(),
-            underline: Style::new(),
            none: Style::new(),
            separator: Style::new(),
            secondary_code: Style::new(),
-            insertion: Style::new(),
-            deletion: Style::new(),
        }
    }
 }
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -1,8 +1,3 @@
-#![warn(
-    clippy::disallowed_methods,
-    reason = "Prefer System trait methods over std methods"
-)]
-
 use crate::files::Files;
 use crate::system::System;
 use crate::vendored::VendoredFileSystem;
@@ -70,10 +65,6 @@ pub trait Db: salsa::Database {
 /// to process work in parallel. For example, to index a directory or checking the files of a project.
 /// ty can still spawn more threads for other tasks, e.g. to wait for a Ctrl+C signal or
 /// watching the files for changes.
-#[expect(
-    clippy::disallowed_methods,
-    reason = "We don't have access to System here, but this is also only used by the CLI and the server which always run on a real system."
-)]
 pub fn max_parallelism() -> NonZeroUsize {
    std::env::var(EnvVars::TY_MAX_PARALLELISM)
        .or_else(|_| std::env::var(EnvVars::RAYON_NUM_THREADS))
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -92,14 +92,14 @@ impl ParsedModule {
        self.inner.store(None);
    }

-    /// Returns the pointer address of this [`ParsedModule`].
+    /// Returns a pointer for this [`ParsedModule`].
    ///
    /// The pointer uniquely identifies the module within the current Salsa revision,
    /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected.
-    pub fn addr(&self) -> usize {
+    pub fn as_ptr(&self) -> *const () {
        // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner
        // `Arc` within the `ArcSwap` may change.
-        Arc::as_ptr(&self.inner).addr()
+        Arc::as_ptr(&self.inner).cast()
    }
 }

@@ -202,13 +202,9 @@ mod indexed {

        /// Returns the node at the given index.
        pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> {
-            let index = index
-                .as_u32()
-                .expect("attempted to access uninitialized `NodeIndex`");
-
            // Note that this method restores the correct lifetime: the nodes are valid for as
            // long as the reference to `IndexedModule` is alive.
-            self.index[index as usize]
+            self.index[index.as_usize()]
        }
    }

@@ -224,7 +220,7 @@ mod indexed {
            T: HasNodeIndex + std::fmt::Debug,
            AnyRootNodeRef<'a>: From<&'a T>,
        {
-            node.node_index().set(NodeIndex::from(self.index));
+            node.node_index().set(self.index);
            self.nodes.push(AnyRootNodeRef::from(node));
            self.index += 1;
        }
--- a/crates/ruff_db/src/system.rs
+++ b/crates/ruff_db/src/system.rs
@@ -46,7 +46,7 @@ pub type Result<T> = std::io::Result<T>;
 ///    * File watching isn't supported.
 ///
 /// Abstracting the system also enables tests to use a more efficient in-memory file system.
-pub trait System: Debug + Sync + Send {
+pub trait System: Debug {
    /// Reads the metadata of the file or directory at `path`.
    ///
    /// This function will traverse symbolic links to query information about the destination file.
@@ -197,8 +197,6 @@ pub trait System: Debug + Sync + Send {
    fn as_any(&self) -> &dyn std::any::Any;

    fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
-
-    fn dyn_clone(&self) -> Box<dyn System>;
 }

 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]
--- a/crates/ruff_db/src/system/os.rs
+++ b/crates/ruff_db/src/system/os.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::disallowed_methods)]
-
 use super::walk_directory::{
    self, DirectoryWalker, WalkDirectoryBuilder, WalkDirectoryConfiguration,
    WalkDirectoryVisitorBuilder, WalkState,
@@ -257,10 +255,6 @@ impl System for OsSystem {
    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
        std::env::var(name)
    }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(self.clone())
-    }
 }

 impl OsSystem {
--- a/crates/ruff_db/src/system/test.rs
+++ b/crates/ruff_db/src/system/test.rs
@@ -146,10 +146,6 @@ impl System for TestSystem {
    fn case_sensitivity(&self) -> CaseSensitivity {
        self.system().case_sensitivity()
    }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(self.clone())
-    }
 }

 impl Default for TestSystem {
@@ -398,13 +394,6 @@ impl System for InMemorySystem {
    fn case_sensitivity(&self) -> CaseSensitivity {
        CaseSensitivity::CaseSensitive
    }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(Self {
-            user_config_directory: Mutex::new(self.user_config_directory.lock().unwrap().clone()),
-            memory_fs: self.memory_fs.clone(),
-        })
-    }
 }

 impl WritableSystem for InMemorySystem {
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -13,7 +13,6 @@ license = { workspace = true }
 [dependencies]
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
-ty_python_semantic = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/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_semantic::default_lint_registry();
+    let registry = &*ty_project::DEFAULT_LINT_REGISTRY;

    let mut output = String::new();

--- a/crates/ruff_diagnostics/Cargo.toml
+++ b/crates/ruff_diagnostics/Cargo.toml
@@ -14,11 +14,8 @@ license = { workspace = true }
 doctest = false

 [dependencies]
-ruff_text_size = { workspace = true, features = ["get-size"] }
+ruff_text_size = { workspace = true }

 get-size2 = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
-
-[features]
-serde = ["dep:serde", "ruff_text_size/serde"]
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.11"
+version = "0.12.9"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -51,6 +51,7 @@ path-absolutize = { workspace = true, features = [
    "once_cell_cache",
    "use_unix_paths_on_wasm",
 ] }
+pathdiff = { workspace = true }
 pep440_rs = { workspace = true }
 pyproject-toml = { workspace = true }
 regex = { workspace = true }
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py
@@ -34,7 +34,7 @@ task_group()
 setup()
 from airflow.decorators import teardown
 from airflow.io.path import ObjectStoragePath
-from airflow.io.store import attach
+from airflow.io.storage import attach
 from airflow.models import DAG as DAGFromModel
 from airflow.models import (
    Connection,
@@ -74,36 +74,3 @@ DatasetOrTimeSchedule()

 # airflow.utils.dag_parsing_context
 get_parsing_context()
-
-from airflow.decorators.base import (
-    DecoratedMappedOperator,
-    DecoratedOperator,
-    TaskDecorator,
-    get_unique_task_id,
-    task_decorator_factory,
-)
-
-# airflow.decorators.base
-DecoratedMappedOperator()
-DecoratedOperator()
-TaskDecorator()
-get_unique_task_id()
-task_decorator_factory()
-
-
-from airflow.models import Param
-
-# airflow.models
-Param()
-
-
-from airflow.sensors.base import (
-    BaseSensorOperator,
-    PokeReturnValue,
-    poke_mode_only,
-)
-
-# airflow.sensors.base
-BaseSensorOperator()
-PokeReturnValue()
-poke_mode_only()
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py
@@ -9,6 +9,7 @@ from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
 from airflow.operators.trigger_dagrun import TriggerDagRunOperator
 from airflow.operators.weekday import BranchDayOfWeekOperator
+from airflow.sensors.date_time import DateTimeSensor

 FSHook()
 PackageIndexHook()
@@ -21,6 +22,7 @@ EmptyOperator()

 LatestOnlyOperator()
 BranchDayOfWeekOperator()
+DateTimeSensor()

 from airflow.operators.python import (
    BranchPythonOperator,
@@ -28,23 +30,16 @@ from airflow.operators.python import (
    PythonVirtualenvOperator,
    ShortCircuitOperator,
 )
-from airflow.sensors.bash import BashSensor
-from airflow.sensors.date_time import DateTimeSensor
-
-BranchPythonOperator()
-PythonOperator()
-PythonVirtualenvOperator()
-ShortCircuitOperator()
-
-BashSensor()
-DateTimeSensor()
 from airflow.sensors.date_time import DateTimeSensorAsync
 from airflow.sensors.external_task import (
    ExternalTaskMarker,
    ExternalTaskSensor,
 )
+from airflow.sensors.time_sensor import (
+    TimeSensor,
+    TimeSensorAsync,
+)
 from airflow.sensors.filesystem import FileSensor
-from airflow.sensors.python import PythonSensor

 BranchPythonOperator()
 PythonOperator()
@@ -54,13 +49,6 @@ DateTimeSensorAsync()
 ExternalTaskMarker()
 ExternalTaskSensor()
 FileSensor()
-PythonSensor()
-
-from airflow.sensors.time_sensor import (
-    TimeSensor,
-    TimeSensorAsync,
-)
-
 TimeSensor()
 TimeSensorAsync()

--- a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py
@@ -1,75 +0,0 @@
-from typing import Optional
-
-import httpx
-
-
-def foo():
-    client = httpx.Client()
-    client.close()  # Ok
-    client.delete()  # Ok
-    client.get()  # Ok
-    client.head()  # Ok
-    client.options()  # Ok
-    client.patch()  # Ok
-    client.post()  # Ok
-    client.put()  # Ok
-    client.request()  # Ok
-    client.send()  # Ok
-    client.stream()  # Ok
-
-    client.anything()  # Ok
-    client.build_request()  # Ok
-    client.is_closed  # Ok
-
-
-async def foo():
-    client = httpx.Client()
-    client.close()  # ASYNC212
-    client.delete()  # ASYNC212
-    client.get()  # ASYNC212
-    client.head()  # ASYNC212
-    client.options()  # ASYNC212
-    client.patch()  # ASYNC212
-    client.post()  # ASYNC212
-    client.put()  # ASYNC212
-    client.request()  # ASYNC212
-    client.send()  # ASYNC212
-    client.stream()  # ASYNC212
-
-    client.anything()  # Ok
-    client.build_request()  # Ok
-    client.is_closed  # Ok
-
-
-async def foo(client: httpx.Client):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo(client: httpx.Client | None):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo(client: Optional[httpx.Client]):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo():
-    client: httpx.Client = ...
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-global_client = httpx.Client()
-
-
-async def foo():
-    global_client.request()  # ASYNC212
-    global_client.anything()  # Ok
-
-
-async def foo():
-    async with httpx.AsyncClient() as client:
-        await client.get()  # Ok
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
@@ -17,50 +17,3 @@ info(f"{__name__}")
 # Don't trigger for t-strings
 info(t"{name}")
 info(t"{__name__}")
-
-count = 5
-total = 9
-directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
-logging.info(f"{count} out of {total} files in {directory_path} checked")
-
-
-
-x = 99
-fmt = "08d"
-logger.info(f"{x:{'08d'}}")
-logger.info(f"{x:>10} {x:{fmt}}")
-
-logging.info(f"")
-logging.info(f"This message doesn't have any variables.")
-
-obj = {"key": "value"}
-logging.info(f"Object: {obj!r}")
-
-items_count = 3
-logging.warning(f"Items: {items_count:d}")
-
-data = {"status": "active"}
-logging.info(f"Processing {len(data)} items")
-logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-
-
-result = 123
-logging.info(f"Calculated result: {result + 100}")
-
-temperature = 123
-logging.info(f"Temperature: {temperature:.1f}°C")
-
-class FilePath:
-    def __init__(self, name: str):
-        self.name = name
-
-logging.info(f"No changes made to {file_path.name}.")
-
-user = "tron"
-balance = 123.45
-logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
-
-import logging
-
-x = 1
-logging.error(f"{x} -> %s", x)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py
@@ -1,10 +0,0 @@
-"""Test f-string argument order."""
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-X = 1
-Y = 2
-logger.error(f"{X} -> %s", Y)
-logger.error(f"{Y} -> %s", X)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
@@ -166,7 +166,3 @@ r"""first
 print("S\x1cP\x1dL\x1eI\x1fT".split())
 print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
 print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-
-# leading/trailing whitespace should not count towards maxsplit
-" a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
-" a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py
@@ -13,11 +13,3 @@ Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
 fd = os.open(".", os.O_RDONLY)
 os.symlink("source.txt", "link.txt", dir_fd=fd)  # Ok: dir_fd is not supported by pathlib
 os.close(fd)
-
-os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True)
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
-
-os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
-
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory="nonboolean")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py
@@ -106,22 +106,4 @@ os.replace("src", "dst", src_dir_fd=1)
 os.replace("src", "dst", dst_dir_fd=2)

 os.getcwd()
-os.getcwdb()
-
-os.mkdir(path="directory")
-
-os.mkdir(
-    # comment 1
-    "directory",
-    mode=0o777
-)
-
-os.mkdir("directory", mode=0o777, dir_fd=1)
-
-os.makedirs("name", 0o777, exist_ok=False)
-
-os.makedirs("name", 0o777, False)
-
-os.makedirs(name="name", mode=0o777, exist_ok=False)
-
-os.makedirs("name", unknown_kwarg=True)
+os.getcwdb()
--- a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_with_multiple_continuations.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_with_multiple_continuations.py
@@ -1,4 +0,0 @@
-"""Hello, world!"""\
-\
-
-x = 1; y = 2
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py
@@ -1,16 +0,0 @@
-"""
-Test: allowed-unused-imports-top-level-module
-"""
-
-# No errors
-
-def f():
-    import hvplot
-def f():
-    import hvplot.pandas
-def f():
-    import hvplot.pandas.plots
-def f():
-    from hvplot.pandas import scatter_matrix
-def f():
-    from hvplot.pandas.plots import scatter_matrix
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py
@@ -151,39 +151,3 @@ def f():
        pass
    except Exception as _:
        pass
-
-
-# OK, `__class__` in this case is not the special `__class__` cell, so we don't
-# emit a diagnostic. (It has its own special semantics -- see
-# https://github.com/astral-sh/ruff/pull/20048#discussion_r2298338048 -- but
-# those aren't relevant here.)
-class A:
-    __class__ = 1
-
-
-# The following three cases are flagged because they declare local `__class__`
-# variables that don't refer to the special `__class__` cell.
-class A:
-    def set_class(self, cls):
-        __class__ = cls  # F841
-
-
-class A:
-    class B:
-        def set_class(self, cls):
-            __class__ = cls  # F841
-
-
-class A:
-    def foo():
-        class B:
-            print(__class__)
-            def set_class(self, cls):
-                __class__ = cls  # F841
-
-
-# OK, the `__class__` cell is nonlocal and declared as such.
-class NonlocalDunderClass:
-    def foo():
-        nonlocal __class__
-        __class__ = 1
--- a/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py
@@ -44,8 +44,3 @@ def f():
    def g():
        nonlocal x
        x = 2
-
-# OK
-class A:
-    def method(self):
-        nonlocal __class__
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010_0.py
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010_1.py
@@ -1,18 +0,0 @@
-from __future__ import nested_scopes, generators
-from __future__ import with_statement, unicode_literals
-
-from __future__ import absolute_import, division
-from __future__ import generator_stop
-from __future__ import print_function, nested_scopes, generator_stop
-
-print(with_statement)
-generators = 1
-
-
-class Foo():
-
-    def boo(self):
-        print(division)
-
-
-__all__ = ["print_function", "generator_stop"]
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py
@@ -69,10 +69,3 @@ a7: OptionalTE[typing.NamedTuple] = None
 a8: typing_extensions.Optional[typing.NamedTuple] = None
 a9: "Optional[NamedTuple]" = None
 a10: Optional[NamedTupleTE] = None
-
-
-# Test for: https://github.com/astral-sh/ruff/issues/19746
-# Nested Optional types should be flattened
-nested_optional: Optional[Optional[str]] = None
-nested_optional_typing: typing.Optional[Optional[int]] = None
-triple_nested_optional: Optional[Optional[Optional[str]]] = None
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py
@@ -118,10 +118,3 @@ def func():
        return lambda: value

    defaultdict(constant_factory("<missing>"))
-
-def func():
-    defaultdict(default_factory=t"")  # OK
-
-
-def func():
-    defaultdict(default_factory=t"hello")  # OK
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py
@@ -124,19 +124,3 @@ def fun_with_python_syntax():
            ...

    return Foo
-
-
-@dataclass
-class C:
-    def __post_init__(self, x: tuple[int, ...] = (
-        1,
-        2,
-    )) -> None:
-        self.x = x
-
-
-@dataclass
-class D:
-    def __post_init__(self, x: int = """
-    """) -> None:
-        self.x = x
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
@@ -102,8 +102,3 @@ deque("abc") # OK
 deque(b"abc") # OK
 deque(f"" "a")  # OK
 deque(f"{x}" "")  # OK
-
-# https://github.com/astral-sh/ruff/issues/19951
-deque(t"")
-deque(t""  t"")
-deque(t"{""}") # OK
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -1,11 +1,10 @@
-use ruff_python_ast::PythonVersion;
 use ruff_python_semantic::{Binding, ScopeKind};

 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::rules::{
    flake8_builtins, flake8_pyi, flake8_type_checking, flake8_unused_arguments, pep8_naming,
-    pyflakes, pylint, pyupgrade, ruff,
+    pyflakes, pylint, ruff,
 };

 /// Run lint rules over all deferred scopes in the [`SemanticModel`].
@@ -46,7 +45,6 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
        Rule::UnusedStaticMethodArgument,
        Rule::UnusedUnpackedVariable,
        Rule::UnusedVariable,
-        Rule::UnnecessaryFutureImport,
    ]) {
        return;
    }
@@ -226,11 +224,6 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
            if checker.is_rule_enabled(Rule::UnusedImport) {
                pyflakes::rules::unused_import(checker, scope);
            }
-            if checker.is_rule_enabled(Rule::UnnecessaryFutureImport) {
-                if checker.target_version() >= PythonVersion::PY37 {
-                    pyupgrade::rules::unnecessary_future_import(checker, scope);
-                }
-            }

            if checker.is_rule_enabled(Rule::ImportPrivateName) {
                pylint::rules::import_private_name(checker, scope);
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -660,9 +660,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
            if checker.is_rule_enabled(Rule::BlockingHttpCallInAsyncFunction) {
                flake8_async::rules::blocking_http_call(checker, call);
            }
-            if checker.is_rule_enabled(Rule::BlockingHttpCallHttpxInAsyncFunction) {
-                flake8_async::rules::blocking_http_call_httpx(checker, call);
-            }
            if checker.is_rule_enabled(Rule::BlockingOpenCallInAsyncFunction) {
                flake8_async::rules::blocking_open_call(checker, call);
            }
@@ -1042,6 +1039,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                flake8_simplify::rules::zip_dict_keys_and_values(checker, call);
            }
            if checker.any_rule_enabled(&[
+                Rule::OsMkdir,
+                Rule::OsMakedirs,
                Rule::OsStat,
                Rule::OsPathJoin,
                Rule::OsPathSplitext,
@@ -1049,6 +1048,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                Rule::PyPath,
                Rule::Glob,
                Rule::OsListdir,
+                Rule::OsSymlink,
            ]) {
                flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
            }
@@ -1120,15 +1120,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                if checker.is_rule_enabled(Rule::OsPathSamefile) {
                    flake8_use_pathlib::rules::os_path_samefile(checker, call, segments);
                }
-                if checker.is_rule_enabled(Rule::OsMkdir) {
-                    flake8_use_pathlib::rules::os_mkdir(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsMakedirs) {
-                    flake8_use_pathlib::rules::os_makedirs(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsSymlink) {
-                    flake8_use_pathlib::rules::os_symlink(checker, call, segments);
-                }
                if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
                    flake8_use_pathlib::rules::path_constructor_current_directory(
                        checker, call, segments,
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -728,6 +728,13 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                    pylint::rules::non_ascii_module_import(checker, alias);
                }
            }
+            if checker.is_rule_enabled(Rule::UnnecessaryFutureImport) {
+                if checker.target_version() >= PythonVersion::PY37 {
+                    if let Some("__future__") = module {
+                        pyupgrade::rules::unnecessary_future_import(checker, stmt, names);
+                    }
+                }
+            }
            if checker.is_rule_enabled(Rule::DeprecatedMockImport) {
                pyupgrade::rules::deprecated_mock_import(checker, stmt);
            }
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -703,10 +703,7 @@ impl SemanticSyntaxContext for Checker<'_> {
            match scope.kind {
                ScopeKind::Class(_) | ScopeKind::Lambda(_) => return false,
                ScopeKind::Function(ast::StmtFunctionDef { is_async, .. }) => return *is_async,
-                ScopeKind::Generator { .. }
-                | ScopeKind::Module
-                | ScopeKind::Type
-                | ScopeKind::DunderClassCell => {}
+                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
            }
        }
        false
@@ -717,10 +714,7 @@ impl SemanticSyntaxContext for Checker<'_> {
            match scope.kind {
                ScopeKind::Class(_) => return false,
                ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Generator { .. }
-                | ScopeKind::Module
-                | ScopeKind::Type
-                | ScopeKind::DunderClassCell => {}
+                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
            }
        }
        false
@@ -731,7 +725,7 @@ impl SemanticSyntaxContext for Checker<'_> {
            match scope.kind {
                ScopeKind::Class(_) | ScopeKind::Generator { .. } => return false,
                ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Module | ScopeKind::Type | ScopeKind::DunderClassCell => {}
+                ScopeKind::Module | ScopeKind::Type => {}
            }
        }
        false
@@ -1098,24 +1092,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                    }
                }

-                // Here we add the implicit scope surrounding a method which allows code in the
-                // method to access `__class__` at runtime. See the `ScopeKind::DunderClassCell`
-                // docs for more information.
-                let added_dunder_class_scope = if self.semantic.current_scope().kind.is_class() {
-                    self.semantic.push_scope(ScopeKind::DunderClassCell);
-                    let binding_id = self.semantic.push_binding(
-                        TextRange::default(),
-                        BindingKind::DunderClassCell,
-                        BindingFlags::empty(),
-                    );
-                    self.semantic
-                        .current_scope_mut()
-                        .add("__class__", binding_id);
-                    true
-                } else {
-                    false
-                };
-
                self.semantic.push_scope(ScopeKind::Type);

                if let Some(type_params) = type_params {
@@ -1179,9 +1155,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                self.semantic.pop_scope(); // Function scope
                self.semantic.pop_definition();
                self.semantic.pop_scope(); // Type parameter scope
-                if added_dunder_class_scope {
-                    self.semantic.pop_scope(); // `__class__` cell closure scope
-                }
                self.add_binding(
                    name,
                    stmt.identifier(),
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -336,7 +336,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        (Flake8Async, "115") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncZeroSleep),
        (Flake8Async, "116") => (RuleGroup::Preview, rules::flake8_async::rules::LongSleepNotForever),
        (Flake8Async, "210") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingHttpCallInAsyncFunction),
-        (Flake8Async, "212") => (RuleGroup::Preview, rules::flake8_async::rules::BlockingHttpCallHttpxInAsyncFunction),
        (Flake8Async, "220") => (RuleGroup::Stable, rules::flake8_async::rules::CreateSubprocessInAsyncFunction),
        (Flake8Async, "221") => (RuleGroup::Stable, rules::flake8_async::rules::RunProcessInAsyncFunction),
        (Flake8Async, "222") => (RuleGroup::Stable, rules::flake8_async::rules::WaitForProcessInAsyncFunction),
@@ -922,8 +921,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        // flake8-use-pathlib
        (Flake8UsePathlib, "100") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathAbspath),
        (Flake8UsePathlib, "101") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsChmod),
-        (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMkdir),
-        (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMakedirs),
+        (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMkdir),
+        (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMakedirs),
        (Flake8UsePathlib, "104") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRename),
        (Flake8UsePathlib, "105") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsReplace),
        (Flake8UsePathlib, "106") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRmdir),
@@ -955,7 +954,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        (Flake8UsePathlib, "207") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::Glob),
        (Flake8UsePathlib, "208") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsListdir),
        (Flake8UsePathlib, "210") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::InvalidPathlibWithSuffix),
-        (Flake8UsePathlib, "211") => (RuleGroup::Preview, rules::flake8_use_pathlib::rules::OsSymlink),
+        (Flake8UsePathlib, "211") => (RuleGroup::Preview, rules::flake8_use_pathlib::violations::OsSymlink),

        // flake8-logging-format
        (Flake8LoggingFormat, "001") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingStringFormat),
--- a/crates/ruff_linter/src/fs.rs
+++ b/crates/ruff_linter/src/fs.rs
@@ -58,3 +58,13 @@ pub fn relativize_path<P: AsRef<Path>>(path: P) -> String {
    }
    format!("{}", path.display())
 }
+
+/// Convert an absolute path to be relative to the specified project root.
+pub fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
+    format!(
+        "{}",
+        pathdiff::diff_paths(&path, project_root)
+            .expect("Could not diff paths")
+            .display()
+    )
+}
--- a/crates/ruff_linter/src/importer/insertion.rs
+++ b/crates/ruff_linter/src/importer/insertion.rs
@@ -63,9 +63,9 @@ impl<'a> Insertion<'a> {
                return Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";");
            }

-            // While the first token after the docstring is a continuation character (i.e. "\"), advance
-            // additional rows to prevent inserting in the same logical line.
-            while match_continuation(locator.after(location)).is_some() {
+            // If the first token after the docstring is a continuation character (i.e. "\"), advance
+            // an additional row to prevent inserting in the same logical line.
+            if match_continuation(locator.after(location)).is_some() {
                location = locator.full_line_end(location);
            }

@@ -379,17 +379,6 @@ mod tests {
            Insertion::own_line("", TextSize::from(22), "\n")
        );

-        let contents = r#"
-"""Hello, world!"""\
-\
-
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::own_line("", TextSize::from(24), "\n")
-        );
-
        let contents = r"
 x = 1
 "
--- a/crates/ruff_linter/src/message/diff.rs
+++ b/crates/ruff_linter/src/message/diff.rs
@@ -0,0 +1,202 @@
+use std::fmt::{Display, Formatter};
+use std::num::NonZeroUsize;
+
+use colored::{Color, ColoredString, Colorize, Styles};
+use similar::{ChangeTag, TextDiff};
+
+use ruff_db::diagnostic::Diagnostic;
+use ruff_source_file::{OneIndexed, SourceFile};
+use ruff_text_size::{Ranged, TextRange, TextSize};
+
+use crate::text_helpers::ShowNonprinting;
+use crate::{Applicability, Fix};
+
+/// Renders a diff that shows the code fixes.
+///
+/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
+/// * Improve layout
+/// * Replace tabs with spaces for a consistent experience across terminals
+/// * Replace zero-width whitespaces
+/// * Print a simpler diff if only a single line has changed
+/// * Compute the diff from the [`Edit`] because diff calculation is expensive.
+pub(super) struct Diff<'a> {
+    fix: &'a Fix,
+    source_code: &'a SourceFile,
+}
+
+impl<'a> Diff<'a> {
+    pub(crate) fn from_message(message: &'a Diagnostic) -> Option<Diff<'a>> {
+        message.fix().map(|fix| Diff {
+            source_code: message.expect_ruff_source_file(),
+            fix,
+        })
+    }
+}
+
+impl Display for Diff<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        // TODO(dhruvmanila): Add support for Notebook cells once it's user-facing
+        let mut output = String::with_capacity(self.source_code.source_text().len());
+        let mut last_end = TextSize::default();
+
+        for edit in self.fix.edits() {
+            output.push_str(
+                self.source_code
+                    .slice(TextRange::new(last_end, edit.start())),
+            );
+            output.push_str(edit.content().unwrap_or_default());
+            last_end = edit.end();
+        }
+
+        output.push_str(&self.source_code.source_text()[usize::from(last_end)..]);
+
+        let diff = TextDiff::from_lines(self.source_code.source_text(), &output);
+
+        let message = match self.fix.applicability() {
+            // TODO(zanieb): Adjust this messaging once it's user-facing
+            Applicability::Safe => "Safe fix",
+            Applicability::Unsafe => "Unsafe fix",
+            Applicability::DisplayOnly => "Display-only fix",
+        };
+        writeln!(f, "ℹ {}", message.blue())?;
+
+        let (largest_old, largest_new) = diff
+            .ops()
+            .last()
+            .map(|op| (op.old_range().start, op.new_range().start))
+            .unwrap_or_default();
+
+        let digit_with =
+            calculate_print_width(OneIndexed::from_zero_indexed(largest_new.max(largest_old)));
+
+        for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
+            if idx > 0 {
+                writeln!(f, "{:-^1$}", "-", 80)?;
+            }
+            for op in group {
+                for change in diff.iter_inline_changes(op) {
+                    let sign = match change.tag() {
+                        ChangeTag::Delete => "-",
+                        ChangeTag::Insert => "+",
+                        ChangeTag::Equal => " ",
+                    };
+
+                    let line_style = LineStyle::from(change.tag());
+
+                    let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
+                    let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
+
+                    write!(
+                        f,
+                        "{} {} |{}",
+                        Line {
+                            index: old_index,
+                            width: digit_with
+                        },
+                        Line {
+                            index: new_index,
+                            width: digit_with
+                        },
+                        line_style.apply_to(sign).bold()
+                    )?;
+
+                    for (emphasized, value) in change.iter_strings_lossy() {
+                        let value = value.show_nonprinting();
+                        if emphasized {
+                            write!(f, "{}", line_style.apply_to(&value).underline().on_black())?;
+                        } else {
+                            write!(f, "{}", line_style.apply_to(&value))?;
+                        }
+                    }
+                    if change.missing_newline() {
+                        writeln!(f)?;
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+struct LineStyle {
+    fgcolor: Option<Color>,
+    style: Option<Styles>,
+}
+
+impl LineStyle {
+    fn apply_to(&self, input: &str) -> ColoredString {
+        let mut colored = ColoredString::from(input);
+        if let Some(color) = self.fgcolor {
+            colored = colored.color(color);
+        }
+
+        if let Some(style) = self.style {
+            match style {
+                Styles::Clear => colored.clear(),
+                Styles::Bold => colored.bold(),
+                Styles::Dimmed => colored.dimmed(),
+                Styles::Underline => colored.underline(),
+                Styles::Reversed => colored.reversed(),
+                Styles::Italic => colored.italic(),
+                Styles::Blink => colored.blink(),
+                Styles::Hidden => colored.hidden(),
+                Styles::Strikethrough => colored.strikethrough(),
+            }
+        } else {
+            colored
+        }
+    }
+}
+
+impl From<ChangeTag> for LineStyle {
+    fn from(value: ChangeTag) -> Self {
+        match value {
+            ChangeTag::Equal => LineStyle {
+                fgcolor: None,
+                style: Some(Styles::Dimmed),
+            },
+            ChangeTag::Delete => LineStyle {
+                fgcolor: Some(Color::Red),
+                style: None,
+            },
+            ChangeTag::Insert => LineStyle {
+                fgcolor: Some(Color::Green),
+                style: None,
+            },
+        }
+    }
+}
+
+struct Line {
+    index: Option<OneIndexed>,
+    width: NonZeroUsize,
+}
+
+impl Display for Line {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self.index {
+            None => {
+                for _ in 0..self.width.get() {
+                    f.write_str(" ")?;
+                }
+                Ok(())
+            }
+            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
+        }
+    }
+}
+
+/// Calculate the length of the string representation of `value`
+pub(super) fn calculate_print_width(mut value: OneIndexed) -> NonZeroUsize {
+    const TEN: OneIndexed = OneIndexed::from_zero_indexed(9);
+
+    let mut width = OneIndexed::ONE;
+
+    while value >= TEN {
+        value = OneIndexed::new(value.get() / 10).unwrap_or(OneIndexed::MIN);
+        width = width.checked_add(1).unwrap();
+    }
+
+    width
+}
--- a/crates/ruff_linter/src/message/gitlab.rs
+++ b/crates/ruff_linter/src/message/gitlab.rs
@@ -0,0 +1,174 @@
+use std::collections::HashSet;
+use std::collections::hash_map::DefaultHasher;
+use std::hash::{Hash, Hasher};
+use std::io::Write;
+
+use serde::ser::SerializeSeq;
+use serde::{Serialize, Serializer};
+use serde_json::json;
+
+use ruff_db::diagnostic::Diagnostic;
+
+use crate::fs::{relativize_path, relativize_path_to};
+use crate::message::{Emitter, EmitterContext};
+
+/// Generate JSON with violations in GitLab CI format
+//  https://docs.gitlab.com/ee/ci/testing/code_quality.html#implement-a-custom-tool
+pub struct GitlabEmitter {
+    project_dir: Option<String>,
+}
+
+impl Default for GitlabEmitter {
+    fn default() -> Self {
+        Self {
+            project_dir: std::env::var("CI_PROJECT_DIR").ok(),
+        }
+    }
+}
+
+impl Emitter for GitlabEmitter {
+    fn emit(
+        &mut self,
+        writer: &mut dyn Write,
+        diagnostics: &[Diagnostic],
+        context: &EmitterContext,
+    ) -> anyhow::Result<()> {
+        serde_json::to_writer_pretty(
+            writer,
+            &SerializedMessages {
+                diagnostics,
+                context,
+                project_dir: self.project_dir.as_deref(),
+            },
+        )?;
+
+        Ok(())
+    }
+}
+
+struct SerializedMessages<'a> {
+    diagnostics: &'a [Diagnostic],
+    context: &'a EmitterContext<'a>,
+    project_dir: Option<&'a str>,
+}
+
+impl Serialize for SerializedMessages<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
+        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
+
+        for diagnostic in self.diagnostics {
+            let filename = diagnostic.expect_ruff_filename();
+
+            let (start_location, end_location) = if self.context.is_notebook(&filename) {
+                // We can't give a reasonable location for the structured formats,
+                // so we show one that's clearly a fallback
+                Default::default()
+            } else {
+                (
+                    diagnostic.expect_ruff_start_location(),
+                    diagnostic.expect_ruff_end_location(),
+                )
+            };
+
+            let path = self.project_dir.as_ref().map_or_else(
+                || relativize_path(&filename),
+                |project_dir| relativize_path_to(&filename, project_dir),
+            );
+
+            let mut message_fingerprint = fingerprint(diagnostic, &path, 0);
+
+            // Make sure that we do not get a fingerprint that is already in use
+            // by adding in the previously generated one.
+            while fingerprints.contains(&message_fingerprint) {
+                message_fingerprint = fingerprint(diagnostic, &path, message_fingerprint);
+            }
+            fingerprints.insert(message_fingerprint);
+
+            let description = diagnostic.body();
+            let check_name = diagnostic.secondary_code_or_id();
+
+            let value = json!({
+                "check_name": check_name,
+                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
+                // so prepend it to the description too.
+                "description": format!("{check_name}: {description}"),
+                "severity": "major",
+                "fingerprint": format!("{:x}", message_fingerprint),
+                "location": {
+                    "path": path,
+                    "positions": {
+                        "begin": start_location,
+                        "end": end_location,
+                    },
+                },
+            });
+
+            s.serialize_element(&value)?;
+        }
+
+        s.end()
+    }
+}
+
+/// Generate a unique fingerprint to identify a violation.
+fn fingerprint(message: &Diagnostic, project_path: &str, salt: u64) -> u64 {
+    let mut hasher = DefaultHasher::new();
+
+    salt.hash(&mut hasher);
+    message.name().hash(&mut hasher);
+    project_path.hash(&mut hasher);
+
+    hasher.finish()
+}
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_snapshot;
+
+    use crate::message::GitlabEmitter;
+    use crate::message::tests::{
+        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
+    };
+
+    #[test]
+    fn output() {
+        let mut emitter = GitlabEmitter::default();
+        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
+
+        assert_snapshot!(redact_fingerprint(&content));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let mut emitter = GitlabEmitter::default();
+        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
+
+        assert_snapshot!(redact_fingerprint(&content));
+    }
+
+    // Redact the fingerprint because the default hasher isn't stable across platforms.
+    fn redact_fingerprint(content: &str) -> String {
+        static FINGERPRINT_HAY_KEY: &str = r#""fingerprint": ""#;
+
+        let mut output = String::with_capacity(content.len());
+        let mut last = 0;
+
+        for (start, _) in content.match_indices(FINGERPRINT_HAY_KEY) {
+            let fingerprint_hash_start = start + FINGERPRINT_HAY_KEY.len();
+            output.push_str(&content[last..fingerprint_hash_start]);
+            output.push_str("<redacted>");
+            last = fingerprint_hash_start
+                + content[fingerprint_hash_start..]
+                    .find('"')
+                    .expect("Expected terminating quote");
+        }
+
+        output.push_str(&content[last..]);
+
+        output
+    }
+}
--- a/crates/ruff_linter/src/message/grouped.rs
+++ b/crates/ruff_linter/src/message/grouped.rs
@@ -10,6 +10,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};

 use crate::fs::relativize_path;
+use crate::message::diff::calculate_print_width;
 use crate::message::{Emitter, EmitterContext};
 use crate::settings::types::UnsafeFixes;

@@ -52,8 +53,8 @@ impl Emitter for GroupedEmitter {
                max_column_length = max_column_length.max(message.start_location.column);
            }

-            let row_length = max_row_length.digits();
-            let column_length = max_column_length.digits();
+            let row_length = calculate_print_width(max_row_length);
+            let column_length = calculate_print_width(max_column_length);

            // Print the filename.
            writeln!(writer, "{}:", relativize_path(&*filename).underline())?;
@@ -130,7 +131,8 @@ impl Display for DisplayGroupedMessage<'_> {
        write!(
            f,
            "  {row_padding}",
-            row_padding = " ".repeat(self.row_length.get() - start_location.line.digits().get())
+            row_padding = " "
+                .repeat(self.row_length.get() - calculate_print_width(start_location.line).get())
        )?;

        // Check if we're working on a jupyter notebook and translate positions with cell accordingly
@@ -157,8 +159,9 @@ impl Display for DisplayGroupedMessage<'_> {
            f,
            "{row}{sep}{col}{col_padding} {code_and_body}",
            sep = ":".cyan(),
-            col_padding =
-                " ".repeat(self.column_length.get() - start_location.column.digits().get()),
+            col_padding = " ".repeat(
+                self.column_length.get() - calculate_print_width(start_location.column).get()
+            ),
            code_and_body = RuleCodeAndBody {
                message,
                show_fix_status: self.show_fix_status,
--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -10,6 +10,7 @@ use ruff_db::diagnostic::{
 use ruff_db::files::File;

 pub use github::GithubEmitter;
+pub use gitlab::GitlabEmitter;
 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::SourceFile;
@@ -20,7 +21,9 @@ pub use text::TextEmitter;
 use crate::Fix;
 use crate::registry::Rule;

+mod diff;
 mod github;
+mod gitlab;
 mod grouped;
 mod sarif;
 mod text;
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergitlabtests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergitlabtests__output.snap
@@ -1,63 +1,63 @@
 ---
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
+source: crates/ruff_linter/src/message/gitlab.rs
+expression: redact_fingerprint(&content)
 ---
 [
  {
    "check_name": "F401",
    "description": "F401: `os` imported but unused",
-    "severity": "major",
    "fingerprint": "<redacted>",
    "location": {
      "path": "fib.py",
      "positions": {
        "begin": {
-          "line": 1,
-          "column": 8
+          "column": 8,
+          "line": 1
        },
        "end": {
-          "line": 1,
-          "column": 10
+          "column": 10,
+          "line": 1
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "F841",
    "description": "F841: Local variable `x` is assigned to but never used",
-    "severity": "major",
    "fingerprint": "<redacted>",
    "location": {
      "path": "fib.py",
      "positions": {
        "begin": {
-          "line": 6,
-          "column": 5
+          "column": 5,
+          "line": 6
        },
        "end": {
-          "line": 6,
-          "column": 6
+          "column": 6,
+          "line": 6
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "F821",
    "description": "F821: Undefined name `a`",
-    "severity": "major",
    "fingerprint": "<redacted>",
    "location": {
      "path": "undef.py",
      "positions": {
        "begin": {
-          "line": 1,
-          "column": 4
+          "column": 4,
+          "line": 1
        },
        "end": {
-          "line": 1,
-          "column": 5
+          "column": 5,
+          "line": 1
        }
      }
-    }
+    },
+    "severity": "major"
  }
 ]
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergitlabtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergitlabtests__syntax_errors.snap
@@ -1,44 +1,44 @@
 ---
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
+source: crates/ruff_linter/src/message/gitlab.rs
+expression: redact_fingerprint(&content)
 ---
 [
  {
    "check_name": "invalid-syntax",
    "description": "invalid-syntax: Expected one or more symbol names after import",
-    "severity": "major",
    "fingerprint": "<redacted>",
    "location": {
      "path": "syntax_errors.py",
      "positions": {
        "begin": {
-          "line": 1,
-          "column": 15
+          "column": 15,
+          "line": 1
        },
        "end": {
-          "line": 2,
-          "column": 1
+          "column": 1,
+          "line": 2
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "invalid-syntax",
    "description": "invalid-syntax: Expected ')', found newline",
-    "severity": "major",
    "fingerprint": "<redacted>",
    "location": {
      "path": "syntax_errors.py",
      "positions": {
        "begin": {
-          "line": 3,
-          "column": 12
+          "column": 12,
+          "line": 3
        },
        "end": {
-          "line": 4,
-          "column": 1
+          "column": 1,
+          "line": 4
        }
      }
-    }
+    },
+    "severity": "major"
  }
 ]
--- a/crates/ruff_linter/src/message/text.rs
+++ b/crates/ruff_linter/src/message/text.rs
@@ -1,19 +1,23 @@
 use std::io::Write;

-use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-};
+use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};

+use crate::message::diff::Diff;
 use crate::message::{Emitter, EmitterContext};
 use crate::settings::types::UnsafeFixes;

 pub struct TextEmitter {
+    /// Whether to show the diff of a fix, for diagnostics that have a fix.
+    ///
+    /// Note that this is not currently exposed in the CLI (#7352) and is only used in tests.
+    show_fix_diff: bool,
    config: DisplayDiagnosticConfig,
 }

 impl Default for TextEmitter {
    fn default() -> Self {
        Self {
+            show_fix_diff: false,
            config: DisplayDiagnosticConfig::default()
                .format(DiagnosticFormat::Concise)
                .hide_severity(true)
@@ -31,7 +35,7 @@ impl TextEmitter {

    #[must_use]
    pub fn with_show_fix_diff(mut self, show_fix_diff: bool) -> Self {
-        self.config = self.config.show_fix_diff(show_fix_diff);
+        self.show_fix_diff = show_fix_diff;
        self
    }

@@ -73,11 +77,15 @@ impl Emitter for TextEmitter {
        diagnostics: &[Diagnostic],
        context: &EmitterContext,
    ) -> anyhow::Result<()> {
-        write!(
-            writer,
-            "{}",
-            DisplayDiagnostics::new(context, &self.config, diagnostics)
-        )?;
+        for message in diagnostics {
+            write!(writer, "{}", message.display(context, &self.config))?;
+
+            if self.show_fix_diff {
+                if let Some(diff) = Diff::from_message(message) {
+                    writeln!(writer, "{diff}")?;
+                }
+            }
+        }

        Ok(())
    }
--- a/crates/ruff_linter/src/preview.rs
+++ b/crates/ruff_linter/src/preview.rs
@@ -40,11 +40,6 @@ pub(crate) const fn is_bad_version_info_in_non_stub_enabled(settings: &LinterSet
    settings.preview.is_enabled()
 }

-/// <https://github.com/astral-sh/ruff/pull/19303>
-pub(crate) const fn is_fix_f_string_logging_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/16719
 pub(crate) const fn is_fix_manual_dict_comprehension_enabled(settings: &LinterSettings) -> bool {
    settings.preview.is_enabled()
@@ -164,21 +159,6 @@ pub(crate) const fn is_fix_os_getcwd_enabled(settings: &LinterSettings) -> bool
    settings.preview.is_enabled()
 }

-// https://github.com/astral-sh/ruff/pull/19514
-pub(crate) const fn is_fix_os_mkdir_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19514
-pub(crate) const fn is_fix_os_makedirs_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/20009
-pub(crate) const fn is_fix_os_symlink_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/11436
 // https://github.com/astral-sh/ruff/pull/11168
 pub(crate) const fn is_dunder_init_fix_unused_import_enabled(settings: &LinterSettings) -> bool {
@@ -250,8 +230,3 @@ pub(crate) const fn is_add_future_annotations_imports_enabled(settings: &LinterS
 pub(crate) const fn is_trailing_comma_type_params_enabled(settings: &LinterSettings) -> bool {
    settings.preview.is_enabled()
 }
-
-// https://github.com/astral-sh/ruff/pull/19851
-pub(crate) const fn is_maxsplit_without_separator_fix_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
--- a/crates/ruff_linter/src/renamer.rs
+++ b/crates/ruff_linter/src/renamer.rs
@@ -354,10 +354,7 @@ impl Renamer {
                ))
            }
            // Avoid renaming builtins and other "special" bindings.
-            BindingKind::FutureImport
-            | BindingKind::Builtin
-            | BindingKind::Export(_)
-            | BindingKind::DunderClassCell => None,
+            BindingKind::FutureImport | BindingKind::Builtin | BindingKind::Export(_) => None,
            // By default, replace the binding's name with the target name.
            BindingKind::Annotation
            | BindingKind::Argument
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
@@ -215,12 +215,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
                version: "0.0.1",
            }
        }
-        ["airflow", "sensors", "bash", "BashSensor"] => ProviderReplacement::AutoImport {
-            module: "airflow.providers.standard.sensor.bash",
-            name: "BashSensor",
-            provider: "standard",
-            version: "0.0.1",
-        },
        [
            "airflow",
            "sensors",
@@ -249,12 +243,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.2",
        },
-        ["airflow", "sensors", "python", "PythonSensor"] => ProviderReplacement::AutoImport {
-            module: "airflow.providers.standard.sensors.python",
-            name: "PythonSensor",
-            provider: "standard",
-            version: "0.0.1",
-        },
        [
            "airflow",
            "sensors",
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
@@ -227,26 +227,13 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            module: "airflow.sdk",
            name: (*rest).to_string(),
        },
-        [
-            "airflow",
-            "decorators",
-            "base",
-            rest @ ("DecoratedMappedOperator"
-            | "DecoratedOperator"
-            | "TaskDecorator"
-            | "get_unique_task_id"
-            | "task_decorator_factory"),
-        ] => Replacement::SourceModuleMoved {
-            module: "airflow.sdk.bases.decorator",
-            name: (*rest).to_string(),
-        },

        // airflow.io
        ["airflow", "io", "path", "ObjectStoragePath"] => Replacement::SourceModuleMoved {
            module: "airflow.sdk",
            name: "ObjectStoragePath".to_string(),
        },
-        ["airflow", "io", "store", "attach"] => Replacement::SourceModuleMoved {
+        ["airflow", "io", "storage", "attach"] => Replacement::SourceModuleMoved {
            module: "airflow.sdk.io",
            name: "attach".to_string(),
        },
@@ -258,10 +245,6 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
                name: (*rest).to_string(),
            }
        }
-        ["airflow", "models", "Param"] => Replacement::AutoImport {
-            module: "airflow.sdk.definitions.param",
-            name: "Param",
-        },

        // airflow.models.baseoperator
        [
@@ -277,30 +260,16 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            module: "airflow.sdk",
            name: "BaseOperatorLink",
        },
-
        // airflow.model..DAG
        ["airflow", "models", .., "DAG"] => Replacement::SourceModuleMoved {
            module: "airflow.sdk",
            name: "DAG".to_string(),
        },
-
-        // airflow.sensors.base
-        [
-            "airflow",
-            "sensors",
-            "base",
-            rest @ ("BaseSensorOperator" | "PokeReturnValue" | "poke_mode_only"),
-        ] => Replacement::SourceModuleMoved {
-            module: "airflow.sdk",
-            name: (*rest).to_string(),
-        },
-
        // airflow.timetables
        ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => Replacement::AutoImport {
            module: "airflow.timetables.assets",
            name: "AssetOrTimeSchedule",
        },
-
        // airflow.utils
        [
            "airflow",
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR311_AIR311_names.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR311_AIR311_names.py.snap
@@ -312,7 +312,7 @@ help: Use `teardown` from `airflow.sdk` instead.
 34 34 | setup()
 35    |-from airflow.decorators import teardown
 36 35 | from airflow.io.path import ObjectStoragePath
-37 36 | from airflow.io.store import attach
+37 36 | from airflow.io.storage import attach
 38 37 | from airflow.models import DAG as DAGFromModel
 --------------------------------------------------------------------------------
 43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream
@@ -338,7 +338,7 @@ help: Use `ObjectStoragePath` from `airflow.sdk` instead.
 34 34 | setup()
 35 35 | from airflow.decorators import teardown
 36    |-from airflow.io.path import ObjectStoragePath
-37 36 | from airflow.io.store import attach
+37 36 | from airflow.io.storage import attach
 38 37 | from airflow.models import DAG as DAGFromModel
 39 38 | from airflow.models import (
 --------------------------------------------------------------------------------
@@ -350,7 +350,7 @@ help: Use `ObjectStoragePath` from `airflow.sdk` instead.
 47 47 | # airflow.decorators
 48 48 | teardown()

-AIR311 [*] `airflow.io.store.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
+AIR311 [*] `airflow.io.storage.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
  --> AIR311_names.py:52:1
   |
 50 | # # airflow.io
@@ -366,7 +366,7 @@ help: Use `attach` from `airflow.sdk.io` instead.
 34 34 | setup()
 35 35 | from airflow.decorators import teardown
 36 36 | from airflow.io.path import ObjectStoragePath
-37    |-from airflow.io.store import attach
+37    |-from airflow.io.storage import attach
 38 37 | from airflow.models import DAG as DAGFromModel
 39 38 | from airflow.models import (
 40 39 |     Connection,
@@ -391,7 +391,7 @@ AIR311 [*] `airflow.models.Connection` is removed in Airflow 3.0; It still works
 help: Use `Connection` from `airflow.sdk` instead.

 ℹ Unsafe fix
-37 37 | from airflow.io.store import attach
+37 37 | from airflow.io.storage import attach
 38 38 | from airflow.models import DAG as DAGFromModel
 39 39 | from airflow.models import (
 40    |-    Connection,
@@ -614,8 +614,6 @@ AIR311 [*] `airflow.utils.dag_parsing_context.get_parsing_context` is removed in
 75 | # airflow.utils.dag_parsing_context
 76 | get_parsing_context()
   | ^^^^^^^^^^^^^^^^^^^
-77 |
-78 | from airflow.decorators.base import (
   |
 help: Use `get_parsing_context` from `airflow.sdk` instead.

@@ -628,211 +626,3 @@ help: Use `get_parsing_context` from `airflow.sdk` instead.
 71 71 | 
 72 72 | # airflow.timetables.datasets
 73 73 | DatasetOrTimeSchedule()
-
-AIR311 [*] `airflow.decorators.base.DecoratedMappedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:87:1
-   |
-86 | # airflow.decorators.base
-87 | DecoratedMappedOperator()
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-88 | DecoratedOperator()
-89 | TaskDecorator()
-   |
-help: Use `DecoratedMappedOperator` from `airflow.sdk.bases.decorator` instead.
-
-ℹ Unsafe fix
-76 76 | get_parsing_context()
-77 77 | 
-78 78 | from airflow.decorators.base import (
-79    |-    DecoratedMappedOperator,
-80 79 |     DecoratedOperator,
-81 80 |     TaskDecorator,
-82 81 |     get_unique_task_id,
-83 82 |     task_decorator_factory,
-84 83 | )
-   84 |+from airflow.sdk.bases.decorator import DecoratedMappedOperator
-85 85 | 
-86 86 | # airflow.decorators.base
-87 87 | DecoratedMappedOperator()
-
-AIR311 [*] `airflow.decorators.base.DecoratedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:88:1
-   |
-86 | # airflow.decorators.base
-87 | DecoratedMappedOperator()
-88 | DecoratedOperator()
-   | ^^^^^^^^^^^^^^^^^
-89 | TaskDecorator()
-90 | get_unique_task_id()
-   |
-help: Use `DecoratedOperator` from `airflow.sdk.bases.decorator` instead.
-
-ℹ Unsafe fix
-77 77 | 
-78 78 | from airflow.decorators.base import (
-79 79 |     DecoratedMappedOperator,
-80    |-    DecoratedOperator,
-81 80 |     TaskDecorator,
-82 81 |     get_unique_task_id,
-83 82 |     task_decorator_factory,
-84 83 | )
-   84 |+from airflow.sdk.bases.decorator import DecoratedOperator
-85 85 | 
-86 86 | # airflow.decorators.base
-87 87 | DecoratedMappedOperator()
-
-AIR311 [*] `airflow.decorators.base.TaskDecorator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:89:1
-   |
-87 | DecoratedMappedOperator()
-88 | DecoratedOperator()
-89 | TaskDecorator()
-   | ^^^^^^^^^^^^^
-90 | get_unique_task_id()
-91 | task_decorator_factory()
-   |
-help: Use `TaskDecorator` from `airflow.sdk.bases.decorator` instead.
-
-ℹ Unsafe fix
-78 78 | from airflow.decorators.base import (
-79 79 |     DecoratedMappedOperator,
-80 80 |     DecoratedOperator,
-81    |-    TaskDecorator,
-82 81 |     get_unique_task_id,
-83 82 |     task_decorator_factory,
-84 83 | )
-   84 |+from airflow.sdk.bases.decorator import TaskDecorator
-85 85 | 
-86 86 | # airflow.decorators.base
-87 87 | DecoratedMappedOperator()
-
-AIR311 [*] `airflow.decorators.base.get_unique_task_id` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:90:1
-   |
-88 | DecoratedOperator()
-89 | TaskDecorator()
-90 | get_unique_task_id()
-   | ^^^^^^^^^^^^^^^^^^
-91 | task_decorator_factory()
-   |
-help: Use `get_unique_task_id` from `airflow.sdk.bases.decorator` instead.
-
-ℹ Unsafe fix
-79 79 |     DecoratedMappedOperator,
-80 80 |     DecoratedOperator,
-81 81 |     TaskDecorator,
-82    |-    get_unique_task_id,
-83 82 |     task_decorator_factory,
-84 83 | )
-   84 |+from airflow.sdk.bases.decorator import get_unique_task_id
-85 85 | 
-86 86 | # airflow.decorators.base
-87 87 | DecoratedMappedOperator()
-
-AIR311 [*] `airflow.decorators.base.task_decorator_factory` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:91:1
-   |
-89 | TaskDecorator()
-90 | get_unique_task_id()
-91 | task_decorator_factory()
-   | ^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Use `task_decorator_factory` from `airflow.sdk.bases.decorator` instead.
-
-ℹ Unsafe fix
-80 80 |     DecoratedOperator,
-81 81 |     TaskDecorator,
-82 82 |     get_unique_task_id,
-83    |-    task_decorator_factory,
-84 83 | )
-   84 |+from airflow.sdk.bases.decorator import task_decorator_factory
-85 85 | 
-86 86 | # airflow.decorators.base
-87 87 | DecoratedMappedOperator()
-
-AIR311 [*] `airflow.models.Param` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-  --> AIR311_names.py:97:1
-   |
-96 | # airflow.models
-97 | Param()
-   | ^^^^^
-   |
-help: Use `Param` from `airflow.sdk.definitions.param` instead.
-
-ℹ Unsafe fix
-91 91 | task_decorator_factory()
-92 92 | 
-93 93 | 
-94    |-from airflow.models import Param
-   94 |+from airflow.sdk.definitions.param import Param
-95 95 | 
-96 96 | # airflow.models
-97 97 | Param()
-
-AIR311 [*] `airflow.sensors.base.BaseSensorOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-   --> AIR311_names.py:107:1
-    |
-106 | # airflow.sensors.base
-107 | BaseSensorOperator()
-    | ^^^^^^^^^^^^^^^^^^
-108 | PokeReturnValue()
-109 | poke_mode_only()
-    |
-help: Use `BaseSensorOperator` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-98  98  | 
-99  99  | 
-100 100 | from airflow.sensors.base import (
-101     |-    BaseSensorOperator,
-102 101 |     PokeReturnValue,
-103 102 |     poke_mode_only,
-104 103 | )
-    104 |+from airflow.sdk import BaseSensorOperator
-105 105 | 
-106 106 | # airflow.sensors.base
-107 107 | BaseSensorOperator()
-
-AIR311 [*] `airflow.sensors.base.PokeReturnValue` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-   --> AIR311_names.py:108:1
-    |
-106 | # airflow.sensors.base
-107 | BaseSensorOperator()
-108 | PokeReturnValue()
-    | ^^^^^^^^^^^^^^^
-109 | poke_mode_only()
-    |
-help: Use `PokeReturnValue` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-99  99  | 
-100 100 | from airflow.sensors.base import (
-101 101 |     BaseSensorOperator,
-102     |-    PokeReturnValue,
-103 102 |     poke_mode_only,
-104 103 | )
-    104 |+from airflow.sdk import PokeReturnValue
-105 105 | 
-106 106 | # airflow.sensors.base
-107 107 | BaseSensorOperator()
-
-AIR311 [*] `airflow.sensors.base.poke_mode_only` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
-   --> AIR311_names.py:109:1
-    |
-107 | BaseSensorOperator()
-108 | PokeReturnValue()
-109 | poke_mode_only()
-    | ^^^^^^^^^^^^^^
-    |
-help: Use `poke_mode_only` from `airflow.sdk` instead.
-
-ℹ Unsafe fix
-100 100 | from airflow.sensors.base import (
-101 101 |     BaseSensorOperator,
-102 102 |     PokeReturnValue,
-103     |-    poke_mode_only,
-104 103 | )
-    104 |+from airflow.sdk import poke_mode_only
-105 105 | 
-106 106 | # airflow.sensors.base
-107 107 | BaseSensorOperator()
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR312_AIR312.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR312_AIR312.py.snap
--- a/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
@@ -137,7 +137,7 @@ impl AutoPythonType {
                let expr = Expr::Name(ast::ExprName {
                    id: Name::from(binding),
                    range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
                    ctx: ExprContext::Load,
                });
                Some((expr, vec![no_return_edit]))
@@ -204,7 +204,7 @@ fn type_expr(python_type: PythonType) -> Option<Expr> {
        Expr::Name(ast::ExprName {
            id: name.into(),
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            ctx: ExprContext::Load,
        })
    }
--- a/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs
+++ b/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs
@@ -485,6 +485,9 @@ impl Violation for MissingReturnTypeClassMethod {
 /// Use instead:
 ///
 /// ```python
+/// from typing import Any
+///
+///
 /// def foo(x: int): ...
 /// ```
 ///
--- a/crates/ruff_linter/src/rules/flake8_async/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/mod.rs
@@ -23,7 +23,6 @@ mod tests {
    #[test_case(Rule::AsyncZeroSleep, Path::new("ASYNC115.py"))]
    #[test_case(Rule::LongSleepNotForever, Path::new("ASYNC116.py"))]
    #[test_case(Rule::BlockingHttpCallInAsyncFunction, Path::new("ASYNC210.py"))]
-    #[test_case(Rule::BlockingHttpCallHttpxInAsyncFunction, Path::new("ASYNC212.py"))]
    #[test_case(Rule::CreateSubprocessInAsyncFunction, Path::new("ASYNC22x.py"))]
    #[test_case(Rule::RunProcessInAsyncFunction, Path::new("ASYNC22x.py"))]
    #[test_case(Rule::WaitForProcessInAsyncFunction, Path::new("ASYNC22x.py"))]
--- a/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call_httpx.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/blocking_http_call_httpx.rs
@@ -1,145 +0,0 @@
-use ruff_python_ast::{self as ast, Expr, ExprCall};
-
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_semantic::analyze::typing::{TypeChecker, check_type, traverse_union_and_optional};
-use ruff_text_size::Ranged;
-
-use crate::Violation;
-use crate::checkers::ast::Checker;
-
-/// ## What it does
-/// Checks that async functions do not use blocking httpx clients.
-///
-/// ## Why is this bad?
-/// Blocking an async function via a blocking HTTP call will block the entire
-/// event loop, preventing it from executing other tasks while waiting for the
-/// HTTP response, negating the benefits of asynchronous programming.
-///
-/// Instead of using the blocking `httpx` client, use the asynchronous client.
-///
-/// ## Example
-/// ```python
-/// import httpx
-///
-///
-/// async def fetch():
-///     client = httpx.Client()
-///     response = client.get(...)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import httpx
-///
-///
-/// async def fetch():
-///     async with httpx.AsyncClient() as client:
-///         response = await client.get(...)
-/// ```
-#[derive(ViolationMetadata)]
-pub(crate) struct BlockingHttpCallHttpxInAsyncFunction {
-    name: String,
-    call: String,
-}
-
-impl Violation for BlockingHttpCallHttpxInAsyncFunction {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "Blocking httpx method {name}.{call}() in async context, use httpx.AsyncClient",
-            name = self.name,
-            call = self.call,
-        )
-    }
-}
-
-struct HttpxClientChecker;
-
-impl TypeChecker for HttpxClientChecker {
-    fn match_annotation(
-        annotation: &ruff_python_ast::Expr,
-        semantic: &ruff_python_semantic::SemanticModel,
-    ) -> bool {
-        // match base annotation directly
-        if semantic
-            .resolve_qualified_name(annotation)
-            .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["httpx", "Client"]))
-        {
-            return true;
-        }
-
-        // otherwise traverse any union or optional annotation
-        let mut found = false;
-        traverse_union_and_optional(
-            &mut |inner_expr, _| {
-                if semantic
-                    .resolve_qualified_name(inner_expr)
-                    .is_some_and(|qualified_name| {
-                        matches!(qualified_name.segments(), ["httpx", "Client"])
-                    })
-                {
-                    found = true;
-                }
-            },
-            semantic,
-            annotation,
-        );
-        found
-    }
-
-    fn match_initializer(
-        initializer: &ruff_python_ast::Expr,
-        semantic: &ruff_python_semantic::SemanticModel,
-    ) -> bool {
-        let Expr::Call(ExprCall { func, .. }) = initializer else {
-            return false;
-        };
-
-        semantic
-            .resolve_qualified_name(func)
-            .is_some_and(|qualified_name| matches!(qualified_name.segments(), ["httpx", "Client"]))
-    }
-}
-
-/// ASYNC212
-pub(crate) fn blocking_http_call_httpx(checker: &Checker, call: &ExprCall) {
-    let semantic = checker.semantic();
-    if !semantic.in_async_context() {
-        return;
-    }
-
-    let Some(ast::ExprAttribute { value, attr, .. }) = call.func.as_attribute_expr() else {
-        return;
-    };
-    let Some(name) = value.as_name_expr() else {
-        return;
-    };
-    let Some(binding) = semantic.only_binding(name).map(|id| semantic.binding(id)) else {
-        return;
-    };
-
-    if check_type::<HttpxClientChecker>(binding, semantic) {
-        if matches!(
-            attr.id.as_str(),
-            "close"
-                | "delete"
-                | "get"
-                | "head"
-                | "options"
-                | "patch"
-                | "post"
-                | "put"
-                | "request"
-                | "send"
-                | "stream"
-        ) {
-            checker.report_diagnostic(
-                BlockingHttpCallHttpxInAsyncFunction {
-                    name: name.id.to_string(),
-                    call: attr.id.to_string(),
-                },
-                call.func.range(),
-            );
-        }
-    }
-}
--- a/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/mod.rs
@@ -2,7 +2,6 @@ pub(crate) use async_busy_wait::*;
 pub(crate) use async_function_with_timeout::*;
 pub(crate) use async_zero_sleep::*;
 pub(crate) use blocking_http_call::*;
-pub(crate) use blocking_http_call_httpx::*;
 pub(crate) use blocking_open_call::*;
 pub(crate) use blocking_process_invocation::*;
 pub(crate) use blocking_sleep::*;
@@ -14,7 +13,6 @@ mod async_busy_wait;
 mod async_function_with_timeout;
 mod async_zero_sleep;
 mod blocking_http_call;
-mod blocking_http_call_httpx;
 mod blocking_open_call;
 mod blocking_process_invocation;
 mod blocking_sleep;
--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC212_ASYNC212.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC212_ASYNC212.py.snap
@@ -1,168 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_async/mod.rs
---
-ASYNC212 Blocking httpx method client.close() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:27:5
-   |
-25 | async def foo():
-26 |     client = httpx.Client()
-27 |     client.close()  # ASYNC212
-   |     ^^^^^^^^^^^^
-28 |     client.delete()  # ASYNC212
-29 |     client.get()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.delete() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:28:5
-   |
-26 |     client = httpx.Client()
-27 |     client.close()  # ASYNC212
-28 |     client.delete()  # ASYNC212
-   |     ^^^^^^^^^^^^^
-29 |     client.get()  # ASYNC212
-30 |     client.head()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.get() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:29:5
-   |
-27 |     client.close()  # ASYNC212
-28 |     client.delete()  # ASYNC212
-29 |     client.get()  # ASYNC212
-   |     ^^^^^^^^^^
-30 |     client.head()  # ASYNC212
-31 |     client.options()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.head() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:30:5
-   |
-28 |     client.delete()  # ASYNC212
-29 |     client.get()  # ASYNC212
-30 |     client.head()  # ASYNC212
-   |     ^^^^^^^^^^^
-31 |     client.options()  # ASYNC212
-32 |     client.patch()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.options() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:31:5
-   |
-29 |     client.get()  # ASYNC212
-30 |     client.head()  # ASYNC212
-31 |     client.options()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-32 |     client.patch()  # ASYNC212
-33 |     client.post()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.patch() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:32:5
-   |
-30 |     client.head()  # ASYNC212
-31 |     client.options()  # ASYNC212
-32 |     client.patch()  # ASYNC212
-   |     ^^^^^^^^^^^^
-33 |     client.post()  # ASYNC212
-34 |     client.put()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.post() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:33:5
-   |
-31 |     client.options()  # ASYNC212
-32 |     client.patch()  # ASYNC212
-33 |     client.post()  # ASYNC212
-   |     ^^^^^^^^^^^
-34 |     client.put()  # ASYNC212
-35 |     client.request()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.put() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:34:5
-   |
-32 |     client.patch()  # ASYNC212
-33 |     client.post()  # ASYNC212
-34 |     client.put()  # ASYNC212
-   |     ^^^^^^^^^^
-35 |     client.request()  # ASYNC212
-36 |     client.send()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:35:5
-   |
-33 |     client.post()  # ASYNC212
-34 |     client.put()  # ASYNC212
-35 |     client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-36 |     client.send()  # ASYNC212
-37 |     client.stream()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.send() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:36:5
-   |
-34 |     client.put()  # ASYNC212
-35 |     client.request()  # ASYNC212
-36 |     client.send()  # ASYNC212
-   |     ^^^^^^^^^^^
-37 |     client.stream()  # ASYNC212
-   |
-
-ASYNC212 Blocking httpx method client.stream() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:37:5
-   |
-35 |     client.request()  # ASYNC212
-36 |     client.send()  # ASYNC212
-37 |     client.stream()  # ASYNC212
-   |     ^^^^^^^^^^^^^
-38 |
-39 |     client.anything()  # Ok
-   |
-
-ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:45:5
-   |
-44 | async def foo(client: httpx.Client):
-45 |     client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-46 |     client.anything()  # Ok
-   |
-
-ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:50:5
-   |
-49 | async def foo(client: httpx.Client | None):
-50 |     client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-51 |     client.anything()  # Ok
-   |
-
-ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:55:5
-   |
-54 | async def foo(client: Optional[httpx.Client]):
-55 |     client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-56 |     client.anything()  # Ok
-   |
-
-ASYNC212 Blocking httpx method client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:61:5
-   |
-59 | async def foo():
-60 |     client: httpx.Client = ...
-61 |     client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^
-62 |     client.anything()  # Ok
-   |
-
-ASYNC212 Blocking httpx method global_client.request() in async context, use httpx.AsyncClient
-  --> ASYNC212.py:69:5
-   |
-68 | async def foo():
-69 |     global_client.request()  # ASYNC212
-   |     ^^^^^^^^^^^^^^^^^^^^^
-70 |     global_client.anything()  # Ok
-   |
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs
@@ -52,13 +52,13 @@ impl AlwaysFixableViolation for AssertFalse {
 fn assertion_error(msg: Option<&Expr>) -> Stmt {
    Stmt::Raise(ast::StmtRaise {
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        exc: Some(Box::new(Expr::Call(ast::ExprCall {
            func: Box::new(Expr::Name(ast::ExprName {
                id: "AssertionError".into(),
                ctx: ExprContext::Load,
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            })),
            arguments: Arguments {
                args: if let Some(msg) = msg {
@@ -68,10 +68,10 @@ fn assertion_error(msg: Option<&Expr>) -> Stmt {
                },
                keywords: Box::from([]),
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            },
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        }))),
        cause: None,
    })
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs
@@ -113,7 +113,7 @@ fn type_pattern(elts: Vec<&Expr>) -> Expr {
        elts: elts.into_iter().cloned().collect(),
        ctx: ExprContext::Load,
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        parenthesized: true,
    }
    .into()
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
@@ -53,11 +53,11 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> Str
            attr: Identifier::new(name.to_string(), TextRange::default()),
            ctx: ExprContext::Store,
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        })],
        value: Box::new(value.clone()),
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
    });
    generator.stmt(&stmt)
 }
--- a/crates/ruff_linter/src/rules/flake8_commas/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_commas/mod.rs
@@ -10,7 +10,7 @@ mod tests {

    use crate::registry::Rule;
    use crate::test::test_path;
-    use crate::{assert_diagnostics, assert_diagnostics_diff, settings};
+    use crate::{assert_diagnostics, settings};

    #[test_case(Path::new("COM81.py"))]
    #[test_case(Path::new("COM81_syntax_error.py"))]
@@ -31,24 +31,19 @@ mod tests {
    #[test_case(Path::new("COM81.py"))]
    #[test_case(Path::new("COM81_syntax_error.py"))]
    fn preview_rules(path: &Path) -> Result<()> {
-        let snapshot = format!("preview_diff__{}", path.to_string_lossy());
-        let rules = vec![
-            Rule::MissingTrailingComma,
-            Rule::TrailingCommaOnBareTuple,
-            Rule::ProhibitedTrailingComma,
-        ];
-        let settings_before = settings::LinterSettings::for_rules(rules.clone());
-        let settings_after = settings::LinterSettings {
-            preview: crate::settings::types::PreviewMode::Enabled,
-            ..settings::LinterSettings::for_rules(rules)
-        };
-
-        assert_diagnostics_diff!(
-            snapshot,
+        let snapshot = format!("preview__{}", path.to_string_lossy());
+        let diagnostics = test_path(
            Path::new("flake8_commas").join(path).as_path(),
-            &settings_before,
-            &settings_after
-        );
+            &settings::LinterSettings {
+                preview: crate::settings::types::PreviewMode::Enabled,
+                ..settings::LinterSettings::for_rules(vec![
+                    Rule::MissingTrailingComma,
+                    Rule::TrailingCommaOnBareTuple,
+                    Rule::ProhibitedTrailingComma,
+                ])
+            },
+        )?;
+        assert_diagnostics!(snapshot, diagnostics);
        Ok(())
    }
 }
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview__COM81.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview__COM81.py.snap
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview__COM81_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview__COM81_syntax_error.py.snap
@@ -0,0 +1,33 @@
+---
+source: crates/ruff_linter/src/rules/flake8_commas/mod.rs
+---
+invalid-syntax: Starred expression cannot be used here
+ --> COM81_syntax_error.py:3:5
+  |
+1 | # Check for `flake8-commas` violation for a file containing syntax errors.
+2 | (
+3 |     *args
+  |     ^^^^^
+4 | )
+  |
+
+invalid-syntax: Type parameter list cannot be empty
+ --> COM81_syntax_error.py:6:9
+  |
+4 | )
+5 |
+6 | def foo[(param1='test', param2='test',):
+  |         ^
+7 |     pass
+  |
+
+COM819 Trailing comma prohibited
+ --> COM81_syntax_error.py:6:38
+  |
+4 | )
+5 |
+6 | def foo[(param1='test', param2='test',):
+  |                                      ^
+7 |     pass
+  |
+help: Remove trailing comma
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview_diff__COM81.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview_diff__COM81.py.snap
@@ -1,136 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_commas/mod.rs
---
--- Linter settings ---
-linter.preview = disabled
-+linter.preview = enabled
-
--- Summary ---
-Removed: 0
-Added: 6
-
--- Added ---
-COM812 [*] Trailing comma missing
-   --> COM81.py:655:6
-    |
-654 | type X[
-655 |     T
-    |      ^
-656 | ] = T
-657 | def f[
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-652 652 | }"""
-653 653 | 
-654 654 | type X[
-655     |-    T
-    655 |+    T,
-656 656 | ] = T
-657 657 | def f[
-658 658 |     T
-
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:658:6
-    |
-656 | ] = T
-657 | def f[
-658 |     T
-    |      ^
-659 | ](): pass
-660 | class C[
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-655 655 |     T
-656 656 | ] = T
-657 657 | def f[
-658     |-    T
-    658 |+    T,
-659 659 | ](): pass
-660 660 | class C[
-661 661 |     T
-
-
-COM812 [*] Trailing comma missing
-   --> COM81.py:661:6
-    |
-659 | ](): pass
-660 | class C[
-661 |     T
-    |      ^
-662 | ]: pass
-    |
-help: Add trailing comma
-
-ℹ Safe fix
-658 658 |     T
-659 659 | ](): pass
-660 660 | class C[
-661     |-    T
-    661 |+    T,
-662 662 | ]: pass
-663 663 | 
-664 664 | type X[T,] = T
-
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:664:9
-    |
-662 | ]: pass
-663 |
-664 | type X[T,] = T
-    |         ^
-665 | def f[T,](): pass
-666 | class C[T,]: pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-661 661 |     T
-662 662 | ]: pass
-663 663 | 
-664     |-type X[T,] = T
-    664 |+type X[T] = T
-665 665 | def f[T,](): pass
-666 666 | class C[T,]: pass
-
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:665:8
-    |
-664 | type X[T,] = T
-665 | def f[T,](): pass
-    |        ^
-666 | class C[T,]: pass
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-662 662 | ]: pass
-663 663 | 
-664 664 | type X[T,] = T
-665     |-def f[T,](): pass
-    665 |+def f[T](): pass
-666 666 | class C[T,]: pass
-
-
-COM819 [*] Trailing comma prohibited
-   --> COM81.py:666:10
-    |
-664 | type X[T,] = T
-665 | def f[T,](): pass
-666 | class C[T,]: pass
-    |          ^
-    |
-help: Remove trailing comma
-
-ℹ Safe fix
-663 663 | 
-664 664 | type X[T,] = T
-665 665 | def f[T,](): pass
-666     |-class C[T,]: pass
-    666 |+class C[T]: pass
--- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview_diff__COM81_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linterrulesflake8_commastestspreview_diff__COM81_syntax_error.py.snap
@@ -1,10 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_commas/mod.rs
---
--- Linter settings ---
-linter.preview = disabled
-+linter.preview = enabled
-
--- Summary ---
-Removed: 0
-Added: 0
--- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs
@@ -209,18 +209,18 @@ fn fix_unnecessary_dict_comprehension(value: &Expr, generator: &Comprehension) -
        },
        keywords: Box::from([]),
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
    };
    Expr::Call(ExprCall {
        func: Box::new(Expr::Name(ExprName {
            id: "dict.fromkeys".into(),
            ctx: ExprContext::Load,
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        })),
        arguments: args,
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
    })
 }

--- a/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
@@ -22,7 +22,6 @@ mod tests {
    #[test_case(Path::new("G002.py"))]
    #[test_case(Path::new("G003.py"))]
    #[test_case(Path::new("G004.py"))]
-    #[test_case(Path::new("G004_arg_order.py"))]
    #[test_case(Path::new("G010.py"))]
    #[test_case(Path::new("G101_1.py"))]
    #[test_case(Path::new("G101_2.py"))]
@@ -49,24 +48,4 @@ mod tests {
        assert_diagnostics!(snapshot, diagnostics);
        Ok(())
    }
-
-    #[test_case(Rule::LoggingFString, Path::new("G004.py"))]
-    #[test_case(Rule::LoggingFString, Path::new("G004_arg_order.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_logging_format").join(path).as_path(),
-            &settings::LinterSettings {
-                logger_objects: vec!["logging_setup.logger".to_string()],
-                preview: settings::types::PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_diagnostics!(snapshot, diagnostics);
-        Ok(())
-    }
 }
--- a/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/rules/logging_call.rs
@@ -1,11 +1,9 @@
-use ruff_python_ast::InterpolatedStringElement;
-use ruff_python_ast::{self as ast, Arguments, Expr, Keyword, Operator, StringFlags};
+use ruff_python_ast::{self as ast, Arguments, Expr, Keyword, Operator};
 use ruff_python_semantic::analyze::logging;
 use ruff_python_stdlib::logging::LoggingLevel;
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
-use crate::preview::is_fix_f_string_logging_enabled;
 use crate::registry::Rule;
 use crate::rules::flake8_logging_format::violations::{
    LoggingExcInfo, LoggingExtraAttrClash, LoggingFString, LoggingPercentFormat,
@@ -13,87 +11,6 @@ use crate::rules::flake8_logging_format::violations::{
 };
 use crate::{Edit, Fix};

-fn logging_f_string(
-    checker: &Checker,
-    msg: &Expr,
-    f_string: &ast::ExprFString,
-    arguments: &Arguments,
-    msg_pos: usize,
-) {
-    // Report the diagnostic up-front so we can attach a fix later only when preview is enabled.
-    let mut diagnostic = checker.report_diagnostic(LoggingFString, msg.range());
-
-    // Preview gate for the automatic fix.
-    if !is_fix_f_string_logging_enabled(checker.settings()) {
-        return;
-    }
-
-    // If there are existing positional arguments after the message, bail out.
-    // This could indicate a mistake or complex usage we shouldn't try to fix.
-    if arguments.args.len() > msg_pos + 1 {
-        return;
-    }
-
-    let mut format_string = String::new();
-    let mut args: Vec<&str> = Vec::new();
-
-    // Try to reuse the first part's quote style when building the replacement.
-    // Default to double quotes if we can't determine it.
-    let quote_str = f_string
-        .value
-        .f_strings()
-        .next()
-        .map(|f| f.flags.quote_str())
-        .unwrap_or("\"");
-
-    for f in f_string.value.f_strings() {
-        for element in &f.elements {
-            match element {
-                InterpolatedStringElement::Literal(lit) => {
-                    // If the literal text contains a '%' placeholder, bail out: mixing
-                    // f-string interpolation with '%' placeholders is ambiguous for our
-                    // automatic conversion, so don't offer a fix for this case.
-                    if lit.value.as_ref().contains('%') {
-                        return;
-                    }
-                    format_string.push_str(lit.value.as_ref());
-                }
-                InterpolatedStringElement::Interpolation(interpolated) => {
-                    if interpolated.format_spec.is_some()
-                        || !matches!(
-                            interpolated.conversion,
-                            ruff_python_ast::ConversionFlag::None
-                        )
-                    {
-                        return;
-                    }
-                    match interpolated.expression.as_ref() {
-                        Expr::Name(name) => {
-                            format_string.push_str("%s");
-                            args.push(name.id.as_str());
-                        }
-                        _ => return,
-                    }
-                }
-            }
-        }
-    }
-
-    if args.is_empty() {
-        return;
-    }
-
-    let replacement = format!(
-        "{q}{format_string}{q}, {args}",
-        q = quote_str,
-        format_string = format_string,
-        args = args.join(", ")
-    );
-
-    let fix = Fix::safe_edit(Edit::range_replacement(replacement, msg.range()));
-    diagnostic.set_fix(fix);
-}
-
 /// Returns `true` if the attribute is a reserved attribute on the `logging` module's `LogRecord`
 /// class.
 fn is_reserved_attr(attr: &str) -> bool {
@@ -125,7 +42,7 @@ fn is_reserved_attr(attr: &str) -> bool {
 }

 /// Check logging messages for violations.
-fn check_msg(checker: &Checker, msg: &Expr, arguments: &Arguments, msg_pos: usize) {
+fn check_msg(checker: &Checker, msg: &Expr) {
    match msg {
        // Check for string concatenation and percent format.
        Expr::BinOp(ast::ExprBinOp { op, .. }) => match op {
@@ -138,10 +55,8 @@ fn check_msg(checker: &Checker, msg: &Expr, arguments: &Arguments, msg_pos: usiz
            _ => {}
        },
        // Check for f-strings.
-        Expr::FString(f_string) => {
-            if checker.is_rule_enabled(Rule::LoggingFString) {
-                logging_f_string(checker, msg, f_string, arguments, msg_pos);
-            }
+        Expr::FString(_) => {
+            checker.report_diagnostic_if_enabled(LoggingFString, msg.range());
        }
        // Check for .format() calls.
        Expr::Call(ast::ExprCall { func, .. }) => {
@@ -253,7 +168,7 @@ pub(crate) fn logging_call(checker: &Checker, call: &ast::ExprCall) {
    // G001, G002, G003, G004
    let msg_pos = usize::from(matches!(logging_call_type, LoggingCallType::LogCall));
    if let Some(format_arg) = call.arguments.find_argument_value("msg", msg_pos) {
-        check_msg(checker, format_arg, &call.arguments, msg_pos);
+        check_msg(checker, format_arg);
    }

    // G010
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004.py.snap
@@ -9,7 +9,6 @@ G004 Logging statement uses f-string
  |              ^^^^^^^^^^^^^^^
 5 | logging.log(logging.INFO, f"Hello {name}")
  |
-help: Convert to lazy `%` formatting

 G004 Logging statement uses f-string
 --> G004.py:5:27
@@ -21,7 +20,6 @@ G004 Logging statement uses f-string
 6 |
 7 | _LOGGER = logging.getLogger()
  |
-help: Convert to lazy `%` formatting

 G004 Logging statement uses f-string
  --> G004.py:8:14
@@ -32,7 +30,6 @@ G004 Logging statement uses f-string
 9 |
 10 | logging.getLogger().info(f"{name}")
   |
-help: Convert to lazy `%` formatting

 G004 Logging statement uses f-string
  --> G004.py:10:26
@@ -44,7 +41,6 @@ G004 Logging statement uses f-string
 11 |
 12 | from logging import info
   |
-help: Convert to lazy `%` formatting

 G004 Logging statement uses f-string
  --> G004.py:14:6
@@ -55,7 +51,6 @@ G004 Logging statement uses f-string
   |      ^^^^^^^^^
 15 | info(f"{__name__}")
   |
-help: Convert to lazy `%` formatting

 G004 Logging statement uses f-string
  --> G004.py:15:6
@@ -66,156 +61,3 @@ G004 Logging statement uses f-string
 16 |
 17 | # Don't trigger for t-strings
   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:24:14
-   |
-22 | total = 9
-23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
-24 | logging.info(f"{count} out of {total} files in {directory_path} checked")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:30:13
-   |
-28 | x = 99
-29 | fmt = "08d"
-30 | logger.info(f"{x:{'08d'}}")
-   |             ^^^^^^^^^^^^^^
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:31:13
-   |
-29 | fmt = "08d"
-30 | logger.info(f"{x:{'08d'}}")
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-   |             ^^^^^^^^^^^^^^^^^^^^
-32 |
-33 | logging.info(f"")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:33:14
-   |
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-32 |
-33 | logging.info(f"")
-   |              ^^^
-34 | logging.info(f"This message doesn't have any variables.")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:34:14
-   |
-33 | logging.info(f"")
-34 | logging.info(f"This message doesn't have any variables.")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-35 |
-36 | obj = {"key": "value"}
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:37:14
-   |
-36 | obj = {"key": "value"}
-37 | logging.info(f"Object: {obj!r}")
-   |              ^^^^^^^^^^^^^^^^^^
-38 |
-39 | items_count = 3
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:40:17
-   |
-39 | items_count = 3
-40 | logging.warning(f"Items: {items_count:d}")
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-41 |
-42 | data = {"status": "active"}
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:43:14
-   |
-42 | data = {"status": "active"}
-43 | logging.info(f"Processing {len(data)} items")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:44:14
-   |
-42 | data = {"status": "active"}
-43 | logging.info(f"Processing {len(data)} items")
-44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:48:14
-   |
-47 | result = 123
-48 | logging.info(f"Calculated result: {result + 100}")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-49 |
-50 | temperature = 123
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:51:14
-   |
-50 | temperature = 123
-51 | logging.info(f"Temperature: {temperature:.1f}°C")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-52 |
-53 | class FilePath:
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:57:14
-   |
-55 |         self.name = name
-56 |
-57 | logging.info(f"No changes made to {file_path.name}.")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-58 |
-59 | user = "tron"
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:61:15
-   |
-59 | user = "tron"
-60 | balance = 123.45
-61 | logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-62 |
-63 | import logging
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:66:15
-   |
-65 | x = 1
-66 | logging.error(f"{x} -> %s", x)
-   |               ^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004_arg_order.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004_arg_order.py.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
---
-G004 Logging statement uses f-string
-  --> G004_arg_order.py:9:14
-   |
- 7 | X = 1
- 8 | Y = 2
- 9 | logger.error(f"{X} -> %s", Y)
-   |              ^^^^^^^^^^^^
-10 | logger.error(f"{Y} -> %s", X)
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004_arg_order.py:10:14
-   |
- 8 | Y = 2
- 9 | logger.error(f"{X} -> %s", Y)
-10 | logger.error(f"{Y} -> %s", X)
-   |              ^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestspreview__G004_G004.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestspreview__G004_G004.py.snap
@@ -1,291 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
---
-G004 [*] Logging statement uses f-string
- --> G004.py:4:14
-  |
-3 | name = "world"
-4 | logging.info(f"Hello {name}")
-  |              ^^^^^^^^^^^^^^^
-5 | logging.log(logging.INFO, f"Hello {name}")
-  |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-1 1 | import logging
-2 2 | 
-3 3 | name = "world"
-4   |-logging.info(f"Hello {name}")
-  4 |+logging.info("Hello %s", name)
-5 5 | logging.log(logging.INFO, f"Hello {name}")
-6 6 | 
-7 7 | _LOGGER = logging.getLogger()
-
-G004 [*] Logging statement uses f-string
- --> G004.py:5:27
-  |
-3 | name = "world"
-4 | logging.info(f"Hello {name}")
-5 | logging.log(logging.INFO, f"Hello {name}")
-  |                           ^^^^^^^^^^^^^^^
-6 |
-7 | _LOGGER = logging.getLogger()
-  |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-2 2 | 
-3 3 | name = "world"
-4 4 | logging.info(f"Hello {name}")
-5   |-logging.log(logging.INFO, f"Hello {name}")
-  5 |+logging.log(logging.INFO, "Hello %s", name)
-6 6 | 
-7 7 | _LOGGER = logging.getLogger()
-8 8 | _LOGGER.info(f"{__name__}")
-
-G004 [*] Logging statement uses f-string
-  --> G004.py:8:14
-   |
- 7 | _LOGGER = logging.getLogger()
- 8 | _LOGGER.info(f"{__name__}")
-   |              ^^^^^^^^^^^^^
- 9 |
-10 | logging.getLogger().info(f"{name}")
-   |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-5 5 | logging.log(logging.INFO, f"Hello {name}")
-6 6 | 
-7 7 | _LOGGER = logging.getLogger()
-8   |-_LOGGER.info(f"{__name__}")
-  8 |+_LOGGER.info("%s", __name__)
-9 9 | 
-10 10 | logging.getLogger().info(f"{name}")
-11 11 | 
-
-G004 [*] Logging statement uses f-string
-  --> G004.py:10:26
-   |
- 8 | _LOGGER.info(f"{__name__}")
- 9 |
-10 | logging.getLogger().info(f"{name}")
-   |                          ^^^^^^^^^
-11 |
-12 | from logging import info
-   |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-7  7  | _LOGGER = logging.getLogger()
-8  8  | _LOGGER.info(f"{__name__}")
-9  9  | 
-10    |-logging.getLogger().info(f"{name}")
-   10 |+logging.getLogger().info("%s", name)
-11 11 | 
-12 12 | from logging import info
-13 13 | 
-
-G004 [*] Logging statement uses f-string
-  --> G004.py:14:6
-   |
-12 | from logging import info
-13 |
-14 | info(f"{name}")
-   |      ^^^^^^^^^
-15 | info(f"{__name__}")
-   |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-11 11 | 
-12 12 | from logging import info
-13 13 | 
-14    |-info(f"{name}")
-   14 |+info("%s", name)
-15 15 | info(f"{__name__}")
-16 16 | 
-17 17 | # Don't trigger for t-strings
-
-G004 [*] Logging statement uses f-string
-  --> G004.py:15:6
-   |
-14 | info(f"{name}")
-15 | info(f"{__name__}")
-   |      ^^^^^^^^^^^^^
-16 |
-17 | # Don't trigger for t-strings
-   |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-12 12 | from logging import info
-13 13 | 
-14 14 | info(f"{name}")
-15    |-info(f"{__name__}")
-   15 |+info("%s", __name__)
-16 16 | 
-17 17 | # Don't trigger for t-strings
-18 18 | info(t"{name}")
-
-G004 [*] Logging statement uses f-string
-  --> G004.py:24:14
-   |
-22 | total = 9
-23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
-24 | logging.info(f"{count} out of {total} files in {directory_path} checked")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
-
-ℹ Safe fix
-21 21 | count = 5
-22 22 | total = 9
-23 23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
-24    |-logging.info(f"{count} out of {total} files in {directory_path} checked")
-   24 |+logging.info("%s out of %s files in %s checked", count, total, directory_path)
-25 25 | 
-26 26 | 
-27 27 | 
-
-G004 Logging statement uses f-string
-  --> G004.py:30:13
-   |
-28 | x = 99
-29 | fmt = "08d"
-30 | logger.info(f"{x:{'08d'}}")
-   |             ^^^^^^^^^^^^^^
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:31:13
-   |
-29 | fmt = "08d"
-30 | logger.info(f"{x:{'08d'}}")
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-   |             ^^^^^^^^^^^^^^^^^^^^
-32 |
-33 | logging.info(f"")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:33:14
-   |
-31 | logger.info(f"{x:>10} {x:{fmt}}")
-32 |
-33 | logging.info(f"")
-   |              ^^^
-34 | logging.info(f"This message doesn't have any variables.")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:34:14
-   |
-33 | logging.info(f"")
-34 | logging.info(f"This message doesn't have any variables.")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-35 |
-36 | obj = {"key": "value"}
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:37:14
-   |
-36 | obj = {"key": "value"}
-37 | logging.info(f"Object: {obj!r}")
-   |              ^^^^^^^^^^^^^^^^^^
-38 |
-39 | items_count = 3
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:40:17
-   |
-39 | items_count = 3
-40 | logging.warning(f"Items: {items_count:d}")
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-41 |
-42 | data = {"status": "active"}
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:43:14
-   |
-42 | data = {"status": "active"}
-43 | logging.info(f"Processing {len(data)} items")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:44:14
-   |
-42 | data = {"status": "active"}
-43 | logging.info(f"Processing {len(data)} items")
-44 | logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:48:14
-   |
-47 | result = 123
-48 | logging.info(f"Calculated result: {result + 100}")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-49 |
-50 | temperature = 123
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:51:14
-   |
-50 | temperature = 123
-51 | logging.info(f"Temperature: {temperature:.1f}°C")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-52 |
-53 | class FilePath:
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:57:14
-   |
-55 |         self.name = name
-56 |
-57 | logging.info(f"No changes made to {file_path.name}.")
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-58 |
-59 | user = "tron"
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:61:15
-   |
-59 | user = "tron"
-60 | balance = 123.45
-61 | logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-62 |
-63 | import logging
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004.py:66:15
-   |
-65 | x = 1
-66 | logging.error(f"{x} -> %s", x)
-   |               ^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestspreview__G004_G004_arg_order.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestspreview__G004_G004_arg_order.py.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
---
-G004 Logging statement uses f-string
-  --> G004_arg_order.py:9:14
-   |
- 7 | X = 1
- 8 | Y = 2
- 9 | logger.error(f"{X} -> %s", Y)
-   |              ^^^^^^^^^^^^
-10 | logger.error(f"{Y} -> %s", X)
-   |
-help: Convert to lazy `%` formatting
-
-G004 Logging statement uses f-string
-  --> G004_arg_order.py:10:14
-   |
- 8 | Y = 2
- 9 | logger.error(f"{X} -> %s", Y)
-10 | logger.error(f"{Y} -> %s", X)
-   |              ^^^^^^^^^^^^
-   |
-help: Convert to lazy `%` formatting
--- a/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/violations.rs
@@ -327,16 +327,10 @@ impl Violation for LoggingStringConcat {
 pub(crate) struct LoggingFString;

 impl Violation for LoggingFString {
-    const FIX_AVAILABILITY: crate::FixAvailability = crate::FixAvailability::Sometimes;
-
    #[derive_message_formats]
    fn message(&self) -> String {
        "Logging statement uses f-string".to_string()
    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Convert to lazy `%` formatting".to_string())
-    }
 }

 /// ## What it does
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
@@ -178,21 +178,21 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                    .collect(),
                ctx: ExprContext::Load,
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
                parenthesized: true,
            });
            let node1 = Expr::Name(ast::ExprName {
                id: arg_name.into(),
                ctx: ExprContext::Load,
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            });
            let node2 = Expr::Attribute(ast::ExprAttribute {
                value: Box::new(node1),
                attr: Identifier::new(attr_name.to_string(), TextRange::default()),
                ctx: ExprContext::Load,
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            });
            let node3 = Expr::Call(ast::ExprCall {
                func: Box::new(node2),
@@ -200,10 +200,10 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                    args: Box::from([node]),
                    keywords: Box::from([]),
                    range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
                },
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            });
            let call = node3;

@@ -223,7 +223,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) {
                    })
                    .collect(),
                range: TextRange::default(),
-                node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            });
            let bool_op = node;
            diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs
@@ -92,14 +92,14 @@ pub(crate) fn duplicate_literal_member<'a>(checker: &Checker, expr: &'a Expr) {
                Expr::Tuple(ast::ExprTuple {
                    elts: unique_nodes.into_iter().cloned().collect(),
                    range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
                    ctx: ExprContext::Load,
                    parenthesized: false,
                })
            }),
            value: subscript.value.clone(),
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            ctx: ExprContext::Load,
        });
        let fix = Fix::applicable_edit(
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs
@@ -187,7 +187,7 @@ fn generate_pep604_fix(
                    op: Operator::BitOr,
                    right: Box::new(right.clone()),
                    range: TextRange::default(),
-                    node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+                    node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
                }))
            } else {
                Some(right.clone())
@@ -202,7 +202,7 @@ fn generate_pep604_fix(
 }

 static VIRTUAL_NONE_LITERAL: Expr = Expr::NoneLiteral(ExprNoneLiteral {
-    node_index: AtomicNodeIndex::NONE,
+    node_index: AtomicNodeIndex::dummy(),
    range: TextRange::new(TextSize::new(0), TextSize::new(0)),
 });

--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/future_annotations_in_stub.rs
@@ -16,7 +16,7 @@ use crate::{checkers::ast::Checker, fix};
 /// statement has no effect and should be omitted.
 ///
 /// ## References
-/// - [Typing Style Guide](https://typing.python.org/en/latest/guides/writing_stubs.html#language-features)
+/// - [Static Typing with Python: Type Stubs](https://typing.python.org/en/latest/source/stubs.html)
 #[derive(ViolationMetadata)]
 pub(crate) struct FutureAnnotationsInStub;

--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs
@@ -133,17 +133,17 @@ fn generate_union_fix(
    // Construct the expression as `Subscript[typing.Union, Tuple[expr, [expr, ...]]]`
    let new_expr = Expr::Subscript(ExprSubscript {
        range: TextRange::default(),
-        node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+        node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        value: Box::new(Expr::Name(ExprName {
            id: Name::new(binding),
            ctx: ExprContext::Store,
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
        })),
        slice: Box::new(Expr::Tuple(ExprTuple {
            elts: nodes.into_iter().cloned().collect(),
            range: TextRange::default(),
-            node_index: ruff_python_ast::AtomicNodeIndex::NONE,
+            node_index: ruff_python_ast::AtomicNodeIndex::dummy(),
            ctx: ExprContext::Load,
            parenthesized: false,
        })),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Waygood	c95cdb3d1d	Add regression test and comment for `GenericContext::from_type_params`	2025-08-15 11:15:42 +01:00
Alex Waygood	7c34ed3374	fix panic	2025-08-14 22:01:21 +01:00
Alex Waygood	5b0a93b3c0	fix memory usage reports	2025-08-14 22:01:21 +01:00
Alex Waygood	cfc46acc46	Do the hard things (with some help from Doug!)	2025-08-14 22:01:21 +01:00
Alex Waygood	671f1358fb	Do the easy functions	2025-08-14 22:01:21 +01:00