wip

clear source texts
2025-06-19 21:58:29 -04:00 · 2025-06-18 23:10:17 -04:00
951 changed files with 16310 additions and 33569 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@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        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@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        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@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        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@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        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@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -304,7 +304,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@@ -370,7 +370,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
@@ -435,7 +435,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -38,7 +38,7 @@ jobs:
          submodules: recursive
          persist-credentials: false

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
@@ -119,7 +119,7 @@ jobs:
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

      - name: Extract metadata (tags, labels) for Docker
        id: meta
@@ -167,7 +167,7 @@ jobs:
          - debian:bookworm-slim,bookworm-slim,debian-slim
          - buildpack-deps:bookworm,bookworm,debian
    steps:
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
@@ -262,7 +262,7 @@ jobs:
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0

      - name: Extract metadata (tags, labels) for Docker
        id: meta
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -238,13 +238,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -296,13 +296,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -325,7 +325,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -381,7 +381,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -406,13 +406,13 @@ jobs:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -438,7 +438,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@8aac5aa2bf0dfaa2863eccad9f43c68fe40e5ec8 # v1.14.1
+        uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
        with:
          tool: cargo-fuzz@0.11.2
      - name: "Install cargo-fuzz"
@@ -460,7 +460,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -661,7 +661,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -691,7 +691,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@8aac5aa2bf0dfaa2863eccad9f43c68fe40e5ec8 # v1.14.1
+      - uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -712,7 +712,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          args: --out dist
      - name: "Test wheel"
@@ -731,7 +731,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
@@ -774,7 +774,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -906,13 +906,13 @@ jobs:
          persist-credentials: false

      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-codspeed

@@ -939,13 +939,13 @@ jobs:
          persist-credentials: false

      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-codspeed

--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,11 +34,11 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -37,7 +37,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
@@ -48,8 +48,6 @@ jobs:

      - name: Run mypy_primer
        shell: bash
-        env:
-          TY_MEMORY_REPORT: mypy_primer
        run: |
          cd ruff

@@ -72,7 +70,7 @@ jobs:
          echo "Project selector: $PRIMER_SELECTOR"
          # Allow the exit code to be 0 or 1, only fail for actual mypy_primer crashes/bugs
          uvx \
-            --from="git+https://github.com/hauntsaninja/mypy_primer@e5f55447969d33ae3c7ccdb183e2a37101867270" \
+            --from="git+https://github.com/hauntsaninja/mypy_primer@01a7ca325f674433c58e02416a867178d1571128" \
            mypy_primer \
            --repo ruff \
            --type-checker ty \
--- 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@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels-*
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -1,94 +0,0 @@
-name: ty ecosystem-analyzer
-
-permissions: {}
-
-on:
-  pull_request:
-    types: [labeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-  RUST_BACKTRACE: 1
-  REF_NAME: ${{ github.ref_name }}
-
-jobs:
-  ty-ecosystem-analyzer:
-    name: Compute diagnostic diff
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 20
-    if: contains(github.event.label.name, 'ecosystem-analyzer')
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Compute diagnostic diff
-        shell: bash
-        run: |
-          cd ruff
-
-          echo "Enabling configuration overloads (see .github/mypy-primer-ty.toml)"
-          mkdir -p ~/.config/ty
-          cp .github/mypy-primer-ty.toml ~/.config/ty/ty.toml
-
-          echo "new commit"
-          git checkout -b new_commit "$GITHUB_SHA"
-          git rev-list --format=%s --max-count=1 new_commit
-          cp crates/ty_python_semantic/resources/primer/good.txt projects_new.txt
-
-          echo "old commit (merge base)"
-          MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
-          git checkout -b old_commit "$MERGE_BASE"
-          git rev-list --format=%s --max-count=1 old_commit
-          cp crates/ty_python_semantic/resources/primer/good.txt projects_old.txt
-
-          cd ..
-
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@9c34dc514ee9aef6735db1dfebb80f63acbc3440"
-
-          ecosystem-analyzer \
-            --repository ruff \
-            analyze \
-            --projects ruff/projects_old.txt \
-            --commit old_commit \
-            --output diagnostics_old.json
-
-          ecosystem-analyzer \
-            --repository ruff \
-            analyze \
-            --projects ruff/projects_new.txt \
-            --commit new_commit \
-            --output diagnostics_new.json
-
-          ecosystem-analyzer \
-            generate-diff \
-            diagnostics_old.json \
-            diagnostics_new.json \
-            --old-name "main (merge base)" \
-            --new-name "$REF_NAME" \
-            --output-html diff.html
-
-      - name: Upload HTML diff report
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: diff.html
-          path: diff.html
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -81,7 +81,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.1
+    rev: v0.11.13
    hooks:
      - id: ruff-format
      - id: ruff
@@ -91,7 +91,7 @@ repos:

  # Prettier
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.6.2
+    rev: v3.5.3
    hooks:
      - id: prettier
        types: [yaml]
@@ -99,12 +99,12 @@ repos:
  # zizmor detects security vulnerabilities in GitHub Actions workflows.
  # Additional configuration for the tool is found in `.github/zizmor.yml`
  - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.10.0
+    rev: v1.9.0
    hooks:
      - id: zizmor

  - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.1
+    rev: 0.33.0
    hooks:
      - id: check-github-workflows

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

-## 0.12.2
-
-### Preview features
-
- \[`flake8-pyi`\] Expand `Optional[A]` to `A | None` (`PYI016`) ([#18572](https://github.com/astral-sh/ruff/pull/18572))
- \[`pyupgrade`\] Mark `UP008` fix safe if no comments are in range ([#18683](https://github.com/astral-sh/ruff/pull/18683))
-
-### Bug fixes
-
- \[`flake8-comprehensions`\] Fix `C420` to prepend whitespace when needed ([#18616](https://github.com/astral-sh/ruff/pull/18616))
- \[`perflint`\] Fix `PERF403` panic on attribute or subscription loop variable ([#19042](https://github.com/astral-sh/ruff/pull/19042))
- \[`pydocstyle`\] Fix `D413` infinite loop for parenthesized docstring ([#18930](https://github.com/astral-sh/ruff/pull/18930))
- \[`pylint`\] Fix `PLW0108` autofix introducing a syntax error when the lambda's body contains an assignment expression ([#18678](https://github.com/astral-sh/ruff/pull/18678))
- \[`refurb`\] Fix false positive on empty tuples (`FURB168`) ([#19058](https://github.com/astral-sh/ruff/pull/19058))
- \[`ruff`\] Allow more `field` calls from `attrs` (`RUF009`) ([#19021](https://github.com/astral-sh/ruff/pull/19021))
- \[`ruff`\] Fix syntax error introduced for an empty string followed by a u-prefixed string (`UP025`) ([#18899](https://github.com/astral-sh/ruff/pull/18899))
-
-### Rule changes
-
- \[`flake8-executable`\] Allow `uvx` in shebang line (`EXE003`) ([#18967](https://github.com/astral-sh/ruff/pull/18967))
- \[`pandas`\] Avoid flagging `PD002` if `pandas` is not imported ([#18963](https://github.com/astral-sh/ruff/pull/18963))
- \[`pyupgrade`\] Avoid PEP-604 unions with `typing.NamedTuple` (`UP007`, `UP045`) ([#18682](https://github.com/astral-sh/ruff/pull/18682))
-
-### Documentation
-
- Document link between `import-outside-top-level (PLC0415)` and `lint.flake8-tidy-imports.banned-module-level-imports` ([#18733](https://github.com/astral-sh/ruff/pull/18733))
- Fix description of the `format.skip-magic-trailing-comma` example ([#19095](https://github.com/astral-sh/ruff/pull/19095))
- \[`airflow`\] Make `AIR302` example error out-of-the-box ([#18988](https://github.com/astral-sh/ruff/pull/18988))
- \[`airflow`\] Make `AIR312` example error out-of-the-box ([#18989](https://github.com/astral-sh/ruff/pull/18989))
- \[`flake8-annotations`\] Make `ANN401` example error out-of-the-box ([#18974](https://github.com/astral-sh/ruff/pull/18974))
- \[`flake8-async`\] Make `ASYNC100` example error out-of-the-box ([#18993](https://github.com/astral-sh/ruff/pull/18993))
- \[`flake8-async`\] Make `ASYNC105` example error out-of-the-box ([#19002](https://github.com/astral-sh/ruff/pull/19002))
- \[`flake8-async`\] Make `ASYNC110` example error out-of-the-box ([#18975](https://github.com/astral-sh/ruff/pull/18975))
- \[`flake8-async`\] Make `ASYNC210` example error out-of-the-box ([#18977](https://github.com/astral-sh/ruff/pull/18977))
- \[`flake8-async`\] Make `ASYNC220`, `ASYNC221`, and `ASYNC222` examples error out-of-the-box ([#18978](https://github.com/astral-sh/ruff/pull/18978))
- \[`flake8-async`\] Make `ASYNC251` example error out-of-the-box ([#18990](https://github.com/astral-sh/ruff/pull/18990))
- \[`flake8-bandit`\] Make `S201` example error out-of-the-box ([#19017](https://github.com/astral-sh/ruff/pull/19017))
- \[`flake8-bandit`\] Make `S604` and `S609` examples error out-of-the-box ([#19049](https://github.com/astral-sh/ruff/pull/19049))
- \[`flake8-bugbear`\] Make `B028` example error out-of-the-box ([#19054](https://github.com/astral-sh/ruff/pull/19054))
- \[`flake8-bugbear`\] Make `B911` example error out-of-the-box ([#19051](https://github.com/astral-sh/ruff/pull/19051))
- \[`flake8-datetimez`\] Make `DTZ011` example error out-of-the-box ([#19055](https://github.com/astral-sh/ruff/pull/19055))
- \[`flake8-datetimez`\] Make `DTZ901` example error out-of-the-box ([#19056](https://github.com/astral-sh/ruff/pull/19056))
- \[`flake8-pyi`\] Make `PYI032` example error out-of-the-box ([#19061](https://github.com/astral-sh/ruff/pull/19061))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI014`, `PYI015`) ([#19097](https://github.com/astral-sh/ruff/pull/19097))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI042`) ([#19101](https://github.com/astral-sh/ruff/pull/19101))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI059`) ([#19080](https://github.com/astral-sh/ruff/pull/19080))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI062`) ([#19079](https://github.com/astral-sh/ruff/pull/19079))
- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT023`) ([#19104](https://github.com/astral-sh/ruff/pull/19104))
- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT030`) ([#19105](https://github.com/astral-sh/ruff/pull/19105))
- \[`flake8-quotes`\] Make example error out-of-the-box (`Q003`) ([#19106](https://github.com/astral-sh/ruff/pull/19106))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM110`) ([#19113](https://github.com/astral-sh/ruff/pull/19113))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM113`) ([#19109](https://github.com/astral-sh/ruff/pull/19109))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM401`) ([#19110](https://github.com/astral-sh/ruff/pull/19110))
- \[`pyflakes`\] Fix backslash in docs (`F621`) ([#19098](https://github.com/astral-sh/ruff/pull/19098))
- \[`pylint`\] Fix `PLC0415` example ([#18970](https://github.com/astral-sh/ruff/pull/18970))
-
-## 0.12.1
-
-### Preview features
-
- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
-
-### Bug fixes
-
- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
-
-### Rule changes
-
- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
-
-### Server
-
- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
-
-### Documentation
-
- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
-
-### Other changes
-
- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
-
 ## 0.12.0

 Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
@@ -148,7 +16,7 @@ guide and overview of the changes!

 - **New default Python version handling for syntax errors**

-    Ruff will default to the *latest* supported Python version (3.13) when
+    Ruff will default to the _latest_ supported Python version (3.13) when
    checking for the version-related syntax errors mentioned above to prevent
    false positives in projects without a Python version configured. The default
    in all other cases, like applying lint rules, is unchanged and remains at the
@@ -203,7 +71,7 @@ The following rules have been stabilized and are no longer in preview:
 - [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
 - [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
 - [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
- [`non-pep604-annotation-optional`] (`UP045`)
+- [`non-pep604-annotation-optional`](https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional) (`UP045`)
 - [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
 - [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
 - [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,15 +132,6 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -178,36 +169,6 @@ dependencies = [
 "tempfile",
 ]

-[[package]]
-name = "attribute-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
-dependencies = [
- "attribute-derive-macro",
- "derive-where",
- "manyhow",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "attribute-derive-macro"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
-dependencies = [
- "collection_literals",
- "interpolator",
- "manyhow",
- "proc-macro-utils",
- "proc-macro2",
- "quote",
- "quote-use",
- "syn",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -220,15 +181,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "2.0.1"
@@ -467,9 +419,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"

 [[package]]
 name = "clearscreen"
-version = "4.0.2"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a8ab73a1c02b0c15597b22e09c7dc36e63b2f601f9d1e83ac0c3decd38b1ae"
+checksum = "8c41dc435a7b98e4608224bbf65282309f5403719df9113621b30f8b6f74e2f4"
 dependencies = [
 "nix 0.29.0",
 "terminfo",
@@ -480,27 +432,22 @@ dependencies = [

 [[package]]
 name = "codspeed"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922018102595f6668cdd09c03f4bff2d951ce2318c6dca4fe11bdcb24b65b2bf"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
 dependencies = [
- "anyhow",
- "bincode 1.3.3",
 "colored 2.2.0",
- "glob",
 "libc",
- "nix 0.29.0",
 "serde",
 "serde_json",
- "statrs",
 "uuid",
 ]

 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d8ad82d2383cb74995f58993cbdd2914aed57b2f91f46580310dd81dc3d05a"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
 dependencies = [
 "codspeed",
 "codspeed-criterion-compat-walltime",
@@ -509,9 +456,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61badaa6c452d192a29f8387147888f0ab358553597c3fe9bf8a162ef7c2fa64"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
 dependencies = [
 "anes",
 "cast",
@@ -534,9 +481,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acf1d6fe367c2ff5ff136ca723f678490c3691d59d7f2b83d5e53b7b25ac91e"
+checksum = "8620a09dfaf37b3c45f982c4b65bd8f9b0203944da3ffa705c0fcae6b84655ff"
 dependencies = [
 "codspeed",
 "codspeed-divan-compat-macros",
@@ -545,9 +492,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcfa2013d7bee54a497d0e1410751d5de690fd67a3e9eb728ca049b6a3d16d0b"
+checksum = "30fe872bc4214626b35d3a1706a905d0243503bb6ba3bb7be2fc59083d5d680c"
 dependencies = [
 "divan-macros",
 "itertools 0.14.0",
@@ -559,9 +506,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e513100fb0e7ba02fb3824546ecd2abfb8f334262f0972225b463aad07f99ff0"
+checksum = "104caa97b36d4092d89e24e4b103b40ede1edab03c0372d19e14a33f9393132b"
 dependencies = [
 "cfg-if",
 "clap",
@@ -572,12 +519,6 @@ dependencies = [
 "regex-lite",
 ]

-[[package]]
-name = "collection_literals"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.3"
@@ -867,17 +808,6 @@ dependencies = [
 "parking_lot_core",
 ]

-[[package]]
-name = "derive-where"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -1000,12 +930,35 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"

+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_home"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"

+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1137,29 +1090,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "get-size-derive2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aac2af9f9a6a50e31b1e541d05b7925add83d3982c2793193fe9d4ee584323c"
-dependencies = [
- "attribute-derive",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "get-size2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a0312efd19e1c45922dfcc2d6806d3ffc4bca261f89f31fcc4f63f438d885"
-dependencies = [
- "compact_str",
- "get-size-derive2",
- "hashbrown 0.15.4",
- "smallvec",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1470,9 +1400,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.4",
@@ -1548,12 +1478,6 @@ dependencies = [
 "serde_json",
 ]

-[[package]]
-name = "interpolator"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8"
-
 [[package]]
 name = "intrusive-collections"
 version = "0.9.7"
@@ -1739,9 +1663,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

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

 [[package]]
 name = "libcst"
@@ -1770,9 +1694,9 @@ dependencies = [

 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.43"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf88cd67e9de251c1781dbe2f641a1a3ad66eaae831b8a2c38fbdc5ddae16d4d"
+checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4"
 dependencies = [
 "cc",
 "libc",
@@ -1815,9 +1739,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"

 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -1854,29 +1778,6 @@ dependencies = [
 "url",
 ]

-[[package]]
-name = "manyhow"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587"
-dependencies = [
- "manyhow-macros",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "manyhow-macros"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495"
-dependencies = [
- "proc-macro-utils",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "markdown"
 version = "1.0.0"
@@ -1924,9 +1825,9 @@ dependencies = [

 [[package]]
 name = "mimalloc"
-version = "0.1.47"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1791cbe101e95af5764f06f20f6760521f7158f69dbf9d6baf941ee1bf6bc40"
+checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af"
 dependencies = [
 "libmimalloc-sys",
 ]
@@ -2103,9 +2004,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "ordermap"
-version = "0.5.8"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6bff06e4a5dc6416bead102d3e63c480dd852ffbb278bf8cfeb4966b329609"
+checksum = "7d31b8b7a99f71bdff4235faf9ce9eada0ad3562c8fbeb7d607d9f41a6ec569d"
 dependencies = [
 "indexmap",
 "serde",
@@ -2136,16 +2037,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"

-[[package]]
-name = "papaya"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
-dependencies = [
- "equivalent",
- "seize",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -2447,17 +2338,6 @@ dependencies = [
 "toml_edit",
 ]

-[[package]]
-name = "proc-macro-utils"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaf08a13de400bc215877b5bdc088f241b12eb42f0a548d3390dc1c56bb7071"
-dependencies = [
- "proc-macro2",
- "quote",
- "smallvec",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -2534,28 +2414,6 @@ dependencies = [
 "proc-macro2",
 ]

-[[package]]
-name = "quote-use"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9619db1197b497a36178cfc736dc96b271fe918875fbf1344c436a7e93d0321e"
-dependencies = [
- "quote",
- "quote-use-macros",
-]
-
-[[package]]
-name = "quote-use-macros"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35"
-dependencies = [
- "proc-macro-utils",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "r-efi"
 version = "5.2.0"
@@ -2724,19 +2582,18 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.12.2"
+version = "0.12.0"
 dependencies = [
 "anyhow",
 "argfile",
 "assert_fs",
- "bincode 2.0.1",
+ "bincode",
 "bitflags 2.9.1",
 "cachedir",
 "clap",
 "clap_complete_command",
 "clearscreen",
 "colored 3.0.0",
- "dunce",
 "filetime",
 "globwalk",
 "ignore",
@@ -2846,7 +2703,6 @@ dependencies = [
 "dunce",
 "etcetera",
 "filetime",
- "get-size2",
 "glob",
 "ignore",
 "insta",
@@ -2854,7 +2710,6 @@ dependencies = [
 "path-slash",
 "ruff_annotate_snippets",
 "ruff_cache",
- "ruff_diagnostics",
 "ruff_notebook",
 "ruff_python_ast",
 "ruff_python_parser",
@@ -2919,7 +2774,6 @@ dependencies = [
 name = "ruff_diagnostics"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "is-macro",
 "ruff_text_size",
 "serde",
@@ -2964,7 +2818,6 @@ dependencies = [
 name = "ruff_index"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "ruff_macros",
 "salsa",
 "static_assertions",
@@ -2972,7 +2825,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.12.2"
+version = "0.12.0"
 dependencies = [
 "aho-corasick",
 "anyhow",
@@ -2982,7 +2835,6 @@ dependencies = [
 "fern",
 "glob",
 "globset",
- "hashbrown 0.15.4",
 "imperative",
 "insta",
 "is-macro",
@@ -3078,7 +2930,6 @@ dependencies = [
 "aho-corasick",
 "bitflags 2.9.1",
 "compact_str",
- "get-size2",
 "is-macro",
 "itertools 0.14.0",
 "memchr",
@@ -3178,7 +3029,6 @@ dependencies = [
 "bitflags 2.9.1",
 "bstr",
 "compact_str",
- "get-size2",
 "insta",
 "memchr",
 "ruff_annotate_snippets",
@@ -3196,6 +3046,16 @@ dependencies = [
 "walkdir",
 ]

+[[package]]
+name = "ruff_python_resolver"
+version = "0.0.0"
+dependencies = [
+ "env_logger",
+ "insta",
+ "log",
+ "tempfile",
+]
+
 [[package]]
 name = "ruff_python_semantic"
 version = "0.0.0"
@@ -3258,7 +3118,6 @@ dependencies = [
 "lsp-server",
 "lsp-types",
 "regex",
- "ruff_db",
 "ruff_diagnostics",
 "ruff_formatter",
 "ruff_linter",
@@ -3286,7 +3145,6 @@ dependencies = [
 name = "ruff_source_file"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "memchr",
 "ruff_text_size",
 "serde",
@@ -3296,7 +3154,6 @@ dependencies = [
 name = "ruff_text_size"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "schemars",
 "serde",
 "serde_test",
@@ -3305,7 +3162,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.12.2"
+version = "0.12.0"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3424,8 +3281,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

 [[package]]
 name = "salsa"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3435,7 +3292,6 @@ dependencies = [
 "hashlink",
 "indexmap",
 "intrusive-collections",
- "papaya",
 "parking_lot",
 "portable-atomic",
 "rayon",
@@ -3449,13 +3305,13 @@ dependencies = [

 [[package]]
 name = "salsa-macro-rules"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"

 [[package]]
 name = "salsa-macros"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3508,16 +3364,6 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

-[[package]]
-name = "seize"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -3718,16 +3564,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

-[[package]]
-name = "statrs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
-dependencies = [
- "approx",
- "num-traits",
-]
-
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.2.1"
@@ -3767,9 +3603,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4188,7 +4024,6 @@ dependencies = [
 "camino",
 "colored 3.0.0",
 "crossbeam",
- "get-size2",
 "globset",
 "insta",
 "notify",
@@ -4228,7 +4063,6 @@ dependencies = [
 "countme",
 "dir-test",
 "drop_bomb",
- "get-size2",
 "glob",
 "hashbrown 0.15.4",
 "indexmap",
@@ -4290,7 +4124,6 @@ dependencies = [
 "ty_ide",
 "ty_project",
 "ty_python_semantic",
- "ty_vendored",
 ]

 [[package]]
@@ -4330,7 +4163,6 @@ version = "0.0.0"
 dependencies = [
 "path-slash",
 "ruff_db",
- "static_assertions",
 "walkdir",
 "zip",
 ]
@@ -4765,10 +4597,11 @@ dependencies = [

 [[package]]
 name = "which"
-version = "8.0.0"
+version = "7.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d"
+checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762"
 dependencies = [
+ "either",
 "env_home",
 "rustix",
 "winsafe",
--- 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.86"
+rust-version = "1.85"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -62,8 +62,8 @@ camino = { version = "1.1.7" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
-divan = { package = "codspeed-divan-compat", version = "3.0.2" }
-codspeed-criterion-compat = { version = "3.0.2", default-features = false }
+divan = { package = "codspeed-divan-compat", version = "2.10.1" }
+codspeed-criterion-compat = { version = "2.6.0", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
@@ -75,16 +75,11 @@ dashmap = { version = "6.0.1" }
 dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
+env_logger = { version = "0.11.0" }
 etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.5.0", features = [
-    "derive",
-    "smallvec",
-    "hashbrown",
-    "compact-str"
-] }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
@@ -137,7 +132,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", rev = "fc00eba89e5dcaa5edba51c41aa5f309b5cb126b" }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "09627e450566f894956710a3fd923dc80462ae6d" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
@@ -227,7 +222,6 @@ unnecessary_debug_formatting = "allow"  # too many instances, the display also d
 # Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
 needless_raw_string_hashes = "allow"
 # Disallowed restriction lints
-ignore_without_reason = "allow" # Too many exsisting instances, and there's no auto fix.
 print_stdout = "warn"
 print_stderr = "warn"
 dbg_macro = "warn"
--- 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.2/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.2/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.0/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.0/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.2
+  rev: v0.12.0
  hooks:
    # Run the linter.
    - id: ruff-check
@@ -423,7 +423,6 @@ Ruff is used by a number of major open-source projects and companies, including:

 - [Albumentations](https://github.com/albumentations-team/albumentations)
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
- [Anki](https://apps.ankiweb.net/)
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
 - AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.2"
+version = "0.12.0"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -68,7 +68,6 @@ ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
 assert_fs = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"] }
-dunce = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
--- a/crates/ruff/src/cache.rs
+++ b/crates/ruff/src/cache.rs
@@ -18,15 +18,14 @@ use rustc_hash::FxHashMap;
 use tempfile::NamedTempFile;

 use ruff_cache::{CacheKey, CacheKeyHasher};
-use ruff_db::diagnostic::Diagnostic;
 use ruff_diagnostics::Fix;
-use ruff_linter::message::create_lint_diagnostic;
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::{VERSION, warn_user};
 use ruff_macros::CacheKey;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::SourceFileBuilder;
-use ruff_text_size::{TextRange, TextSize};
+use ruff_text_size::{Ranged, TextRange, TextSize};
 use ruff_workspace::Settings;
 use ruff_workspace::resolver::Resolver;

@@ -342,16 +341,16 @@ impl FileCache {
    /// Convert the file cache into `Diagnostics`, using `path` as file name.
    pub(crate) fn to_diagnostics(&self, path: &Path) -> Option<Diagnostics> {
        self.data.lint.as_ref().map(|lint| {
-            let diagnostics = if lint.messages.is_empty() {
+            let messages = if lint.messages.is_empty() {
                Vec::new()
            } else {
                let file = SourceFileBuilder::new(path.to_string_lossy(), &*lint.source).finish();
                lint.messages
                    .iter()
                    .map(|msg| {
-                        create_lint_diagnostic(
-                            &msg.body,
-                            msg.suggestion.as_ref(),
+                        Message::diagnostic(
+                            msg.body.clone(),
+                            msg.suggestion.clone(),
                            msg.range,
                            msg.fix.clone(),
                            msg.parent,
@@ -367,7 +366,7 @@ impl FileCache {
            } else {
                FxHashMap::default()
            };
-            Diagnostics::new(diagnostics, notebook_indexes)
+            Diagnostics::new(messages, notebook_indexes)
        })
    }
 }
@@ -428,17 +427,17 @@ pub(crate) struct LintCacheData {
 }

 impl LintCacheData {
-    pub(crate) fn from_diagnostics(
-        diagnostics: &[Diagnostic],
+    pub(crate) fn from_messages(
+        messages: &[Message],
        notebook_index: Option<NotebookIndex>,
    ) -> Self {
-        let source = if let Some(msg) = diagnostics.first() {
-            msg.expect_ruff_source_file().source_text().to_owned()
+        let source = if let Some(msg) = messages.first() {
+            msg.source_file().source_text().to_owned()
        } else {
            String::new() // No messages, no need to keep the source!
        };

-        let messages = diagnostics
+        let messages = messages
            .iter()
            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
            // this also serves to filter them out, but we shouldn't be caching files with syntax
@@ -447,16 +446,16 @@ impl LintCacheData {
            .map(|(rule, msg)| {
                // Make sure that all message use the same source file.
                assert_eq!(
-                    msg.expect_ruff_source_file(),
-                    diagnostics.first().unwrap().expect_ruff_source_file(),
+                    msg.source_file(),
+                    messages.first().unwrap().source_file(),
                    "message uses a different source file"
                );
                CacheMessage {
                    rule,
                    body: msg.body().to_string(),
                    suggestion: msg.suggestion().map(ToString::to_string),
-                    range: msg.expect_range(),
-                    parent: msg.parent(),
+                    range: msg.range(),
+                    parent: msg.parent,
                    fix: msg.fix().cloned(),
                    noqa_offset: msg.noqa_offset(),
                }
@@ -609,12 +608,12 @@ mod tests {
    use anyhow::Result;
    use filetime::{FileTime, set_file_mtime};
    use itertools::Itertools;
+    use ruff_linter::settings::LinterSettings;
    use test_case::test_case;

    use ruff_cache::CACHE_DIR_NAME;
-    use ruff_db::diagnostic::Diagnostic;
+    use ruff_linter::message::Message;
    use ruff_linter::package::PackageRoot;
-    use ruff_linter::settings::LinterSettings;
    use ruff_linter::settings::flags;
    use ruff_linter::settings::types::UnsafeFixes;
    use ruff_python_ast::{PySourceType, PythonVersion};
@@ -681,7 +680,7 @@ mod tests {
                    UnsafeFixes::Enabled,
                )
                .unwrap();
-                if diagnostics.inner.iter().any(Diagnostic::is_syntax_error) {
+                if diagnostics.messages.iter().any(Message::is_syntax_error) {
                    parse_errors.push(path.clone());
                }
                paths.push(path);
--- a/crates/ruff/src/commands/check.rs
+++ b/crates/ruff/src/commands/check.rs
@@ -9,10 +9,11 @@ use ignore::Error;
 use log::{debug, error, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
-use ruff_linter::message::diagnostic_from_violation;
 use rustc_hash::FxHashMap;

 use ruff_db::panic::catch_unwind;
+use ruff_linter::OldDiagnostic;
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -129,10 +130,9 @@ pub(crate) fn check(
                        SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();

                    Diagnostics::new(
-                        vec![diagnostic_from_violation(
-                            IOError { message },
-                            TextRange::default(),
-                            &dummy,
+                        vec![Message::from_diagnostic(
+                            OldDiagnostic::new(IOError { message }, TextRange::default(), &dummy),
+                            None,
                        )],
                        FxHashMap::default(),
                    )
@@ -166,7 +166,7 @@ pub(crate) fn check(
            |a, b| (a.0 + b.0, a.1 + b.1),
        );

-    all_diagnostics.inner.sort();
+    all_diagnostics.messages.sort();

    // Store the caches.
    caches.persist()?;
@@ -283,7 +283,7 @@ mod test {
            .with_show_fix_status(true)
            .emit(
                &mut output,
-                &diagnostics.inner,
+                &diagnostics.messages,
                &EmitterContext::new(&FxHashMap::default()),
            )
            .unwrap();
--- a/crates/ruff/src/commands/check_stdin.rs
+++ b/crates/ruff/src/commands/check_stdin.rs
@@ -52,6 +52,6 @@ pub(crate) fn check_stdin(
        noqa,
        fix_mode,
    )?;
-    diagnostics.inner.sort_unstable();
+    diagnostics.messages.sort_unstable();
    Ok(diagnostics)
 }
--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -10,10 +10,12 @@ use std::path::Path;
 use anyhow::{Context, Result};
 use colored::Colorize;
 use log::{debug, warn};
-use ruff_db::diagnostic::Diagnostic;
+use rustc_hash::FxHashMap;
+
+use ruff_linter::OldDiagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
-use ruff_linter::message::{create_syntax_error_diagnostic, diagnostic_from_violation};
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -25,24 +27,23 @@ use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::Settings;
-use rustc_hash::FxHashMap;

 use crate::cache::{Cache, FileCacheKey, LintCacheData};

 #[derive(Debug, Default, PartialEq)]
 pub(crate) struct Diagnostics {
-    pub(crate) inner: Vec<Diagnostic>,
+    pub(crate) messages: Vec<Message>,
    pub(crate) fixed: FixMap,
    pub(crate) notebook_indexes: FxHashMap<String, NotebookIndex>,
 }

 impl Diagnostics {
    pub(crate) fn new(
-        diagnostics: Vec<Diagnostic>,
+        messages: Vec<Message>,
        notebook_indexes: FxHashMap<String, NotebookIndex>,
    ) -> Self {
        Self {
-            inner: diagnostics,
+            messages,
            fixed: FixMap::default(),
            notebook_indexes,
        }
@@ -62,12 +63,15 @@ impl Diagnostics {
                    let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                    let source_file = SourceFileBuilder::new(name, "").finish();
                    Self::new(
-                        vec![diagnostic_from_violation(
-                            IOError {
-                                message: err.to_string(),
-                            },
-                            TextRange::default(),
-                            &source_file,
+                        vec![Message::from_diagnostic(
+                            OldDiagnostic::new(
+                                IOError {
+                                    message: err.to_string(),
+                                },
+                                TextRange::default(),
+                                &source_file,
+                            ),
+                            None,
                        )],
                        FxHashMap::default(),
                    )
@@ -98,11 +102,7 @@ impl Diagnostics {
                let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                let dummy = SourceFileBuilder::new(name, "").finish();
                Self::new(
-                    vec![create_syntax_error_diagnostic(
-                        dummy,
-                        err,
-                        TextRange::default(),
-                    )],
+                    vec![Message::syntax_error(err, TextRange::default(), dummy)],
                    FxHashMap::default(),
                )
            }
@@ -121,7 +121,7 @@ impl Add for Diagnostics {

 impl AddAssign for Diagnostics {
    fn add_assign(&mut self, other: Self) {
-        self.inner.extend(other.inner);
+        self.messages.extend(other.messages);
        self.fixed += other.fixed;
        self.notebook_indexes.extend(other.notebook_indexes);
    }
@@ -202,7 +202,7 @@ pub(crate) fn lint_path(
                if match fix_mode {
                    flags::FixMode::Generate => true,
                    flags::FixMode::Apply | flags::FixMode::Diff => {
-                        diagnostics.inner.is_empty() && diagnostics.fixed.is_empty()
+                        diagnostics.messages.is_empty() && diagnostics.fixed.is_empty()
                    }
                } {
                    return Ok(diagnostics);
@@ -222,7 +222,7 @@ pub(crate) fn lint_path(
        Some(source_type) => source_type,
        None => match SourceType::from(path) {
            SourceType::Toml(TomlSourceType::Pyproject) => {
-                let diagnostics = if settings
+                let messages = if settings
                    .rules
                    .iter_enabled()
                    .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
@@ -240,7 +240,7 @@ pub(crate) fn lint_path(
                    vec![]
                };
                return Ok(Diagnostics {
-                    inner: diagnostics,
+                    messages,
                    ..Diagnostics::default()
                });
            }
@@ -324,7 +324,7 @@ pub(crate) fn lint_path(
        };

    let has_error = result.has_syntax_errors();
-    let diagnostics = result.diagnostics;
+    let messages = result.messages;

    if let Some((cache, relative_path, key)) = caching {
        // We don't cache parsing errors.
@@ -335,14 +335,14 @@ pub(crate) fn lint_path(
            if match fix_mode {
                flags::FixMode::Generate => true,
                flags::FixMode::Apply | flags::FixMode::Diff => {
-                    diagnostics.is_empty() && fixed.is_empty()
+                    messages.is_empty() && fixed.is_empty()
                }
            } {
                cache.update_lint(
                    relative_path.to_owned(),
                    &key,
-                    LintCacheData::from_diagnostics(
-                        &diagnostics,
+                    LintCacheData::from_messages(
+                        &messages,
                        transformed.as_ipy_notebook().map(Notebook::index).cloned(),
                    ),
                );
@@ -357,7 +357,7 @@ pub(crate) fn lint_path(
    };

    Ok(Diagnostics {
-        inner: diagnostics,
+        messages,
        fixed: FixMap::from_iter([(fs::relativize_path(path), fixed)]),
        notebook_indexes,
    })
@@ -396,7 +396,7 @@ pub(crate) fn lint_stdin(
                }

                return Ok(Diagnostics {
-                    inner: lint_pyproject_toml(&source_file, &settings.linter),
+                    messages: lint_pyproject_toml(&source_file, &settings.linter),
                    fixed: FixMap::from_iter([(fs::relativize_path(path), FixTable::default())]),
                    notebook_indexes: FxHashMap::default(),
                });
@@ -417,7 +417,7 @@ pub(crate) fn lint_stdin(
    };

    // Lint the inputs.
-    let (LinterResult { diagnostics, .. }, transformed, fixed) =
+    let (LinterResult { messages, .. }, transformed, fixed) =
        if matches!(fix_mode, flags::FixMode::Apply | flags::FixMode::Diff) {
            if let Ok(FixerResult {
                result,
@@ -501,7 +501,7 @@ pub(crate) fn lint_stdin(
    };

    Ok(Diagnostics {
-        inner: diagnostics,
+        messages,
        fixed: FixMap::from_iter([(
            fs::relativize_path(path.unwrap_or_else(|| Path::new("-"))),
            fixed,
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -363,7 +363,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
        Printer::clear_screen()?;
        printer.write_to_user("Starting linter in watch mode...\n");

-        let diagnostics = commands::check::check(
+        let messages = commands::check::check(
            &files,
            &pyproject_config,
            &config_arguments,
@@ -372,7 +372,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
            fix_mode,
            unsafe_fixes,
        )?;
-        printer.write_continuously(&mut writer, &diagnostics, preview)?;
+        printer.write_continuously(&mut writer, &messages, preview)?;

        // In watch mode, we may need to re-resolve the configuration.
        // TODO(charlie): Re-compute other derivative values, like the `printer`.
@@ -392,7 +392,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                    Printer::clear_screen()?;
                    printer.write_to_user("File change detected...\n");

-                    let diagnostics = commands::check::check(
+                    let messages = commands::check::check(
                        &files,
                        &pyproject_config,
                        &config_arguments,
@@ -401,7 +401,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                        fix_mode,
                        unsafe_fixes,
                    )?;
-                    printer.write_continuously(&mut writer, &diagnostics, preview)?;
+                    printer.write_continuously(&mut writer, &messages, preview)?;
                }
                Err(err) => return Err(err.into()),
            }
@@ -463,11 +463,11 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                // there are any violations, unless we're explicitly asked to exit zero on
                // fix.
                if cli.exit_non_zero_on_fix {
-                    if !diagnostics.fixed.is_empty() || !diagnostics.inner.is_empty() {
+                    if !diagnostics.fixed.is_empty() || !diagnostics.messages.is_empty() {
                        return Ok(ExitStatus::Failure);
                    }
                } else {
-                    if !diagnostics.inner.is_empty() {
+                    if !diagnostics.messages.is_empty() {
                        return Ok(ExitStatus::Failure);
                    }
                }
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -6,16 +6,16 @@ use anyhow::Result;
 use bitflags::bitflags;
 use colored::Colorize;
 use itertools::{Itertools, iterate};
+use ruff_linter::codes::NoqaCode;
 use ruff_linter::linter::FixTable;
 use serde::Serialize;

-use ruff_db::diagnostic::{Diagnostic, SecondaryCode};
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
-    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, RdjsonEmitter, SarifEmitter,
-    TextEmitter,
+    JsonEmitter, JsonLinesEmitter, JunitEmitter, Message, PylintEmitter, RdjsonEmitter,
+    SarifEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -36,8 +36,8 @@ bitflags! {
 }

 #[derive(Serialize)]
-struct ExpandedStatistics<'a> {
-    code: Option<&'a SecondaryCode>,
+struct ExpandedStatistics {
+    code: Option<NoqaCode>,
    name: &'static str,
    count: usize,
    fixable: bool,
@@ -85,7 +85,7 @@ impl Printer {
                .sum::<usize>();

            if self.flags.intersects(Flags::SHOW_VIOLATIONS) {
-                let remaining = diagnostics.inner.len();
+                let remaining = diagnostics.messages.len();
                let total = fixed + remaining;
                if fixed > 0 {
                    let s = if total == 1 { "" } else { "s" };
@@ -229,16 +229,16 @@ impl Printer {

        match self.format {
            OutputFormat::Json => {
-                JsonEmitter.emit(writer, &diagnostics.inner, &context)?;
+                JsonEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Rdjson => {
-                RdjsonEmitter.emit(writer, &diagnostics.inner, &context)?;
+                RdjsonEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::JsonLines => {
-                JsonLinesEmitter.emit(writer, &diagnostics.inner, &context)?;
+                JsonLinesEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Junit => {
-                JunitEmitter.emit(writer, &diagnostics.inner, &context)?;
+                JunitEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Concise | OutputFormat::Full => {
                TextEmitter::default()
@@ -246,7 +246,7 @@ impl Printer {
                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                    .with_show_source(self.format == OutputFormat::Full)
                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.inner, &context)?;
+                    .emit(writer, &diagnostics.messages, &context)?;

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                    if !diagnostics.fixed.is_empty() {
@@ -262,7 +262,7 @@ impl Printer {
                GroupedEmitter::default()
                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.inner, &context)?;
+                    .emit(writer, &diagnostics.messages, &context)?;

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                    if !diagnostics.fixed.is_empty() {
@@ -274,19 +274,19 @@ impl Printer {
                self.write_summary_text(writer, diagnostics)?;
            }
            OutputFormat::Github => {
-                GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
+                GithubEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Gitlab => {
-                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
+                GitlabEmitter::default().emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Pylint => {
-                PylintEmitter.emit(writer, &diagnostics.inner, &context)?;
+                PylintEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Azure => {
-                AzureEmitter.emit(writer, &diagnostics.inner, &context)?;
+                AzureEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
+                SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
        }

@@ -301,13 +301,13 @@ impl Printer {
        writer: &mut dyn Write,
    ) -> Result<()> {
        let statistics: Vec<ExpandedStatistics> = diagnostics
-            .inner
+            .messages
            .iter()
-            .map(|message| (message.secondary_code(), message))
+            .map(|message| (message.noqa_code(), message))
            .sorted_by_key(|(code, message)| (*code, message.fixable()))
            .fold(
                vec![],
-                |mut acc: Vec<((Option<&SecondaryCode>, &Diagnostic), usize)>, (code, message)| {
+                |mut acc: Vec<((Option<NoqaCode>, &Message), usize)>, (code, message)| {
                    if let Some(((prev_code, _prev_message), count)) = acc.last_mut() {
                        if *prev_code == code {
                            *count += 1;
@@ -349,7 +349,12 @@ impl Printer {
                );
                let code_width = statistics
                    .iter()
-                    .map(|statistic| statistic.code.map_or(0, |s| s.len()))
+                    .map(|statistic| {
+                        statistic
+                            .code
+                            .map_or_else(String::new, |rule| rule.to_string())
+                            .len()
+                    })
                    .max()
                    .unwrap();
                let any_fixable = statistics.iter().any(|statistic| statistic.fixable);
@@ -365,8 +370,7 @@ impl Printer {
                        statistic.count.to_string().bold(),
                        statistic
                            .code
-                            .map(SecondaryCode::as_str)
-                            .unwrap_or_default()
+                            .map_or_else(String::new, |rule| rule.to_string())
                            .red()
                            .bold(),
                        if any_fixable {
@@ -412,20 +416,20 @@ impl Printer {
        }

        if self.log_level >= LogLevel::Default {
-            let s = if diagnostics.inner.len() == 1 {
+            let s = if diagnostics.messages.len() == 1 {
                ""
            } else {
                "s"
            };
            notify_user!(
                "Found {} error{s}. Watching for file changes.",
-                diagnostics.inner.len()
+                diagnostics.messages.len()
            );
        }

        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);

-        if !diagnostics.inner.is_empty() {
+        if !diagnostics.messages.is_empty() {
            if self.log_level >= LogLevel::Default {
                writeln!(writer)?;
            }
@@ -435,7 +439,7 @@ impl Printer {
                .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
                .with_show_source(preview)
                .with_unsafe_fixes(self.unsafe_fixes)
-                .emit(writer, &diagnostics.inner, &context)?;
+                .emit(writer, &diagnostics.messages, &context)?;
        }
        writer.flush()?;

@@ -518,7 +522,7 @@ impl FixableStatistics {
        let mut applicable = 0;
        let mut inapplicable_unsafe = 0;

-        for message in &diagnostics.inner {
+        for message in &diagnostics.messages {
            if let Some(fix) = message.fix() {
                if fix.applies(unsafe_fixes.required_applicability()) {
                    applicable += 1;
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -17,7 +17,6 @@ fn command() -> Command {
    command.arg("analyze");
    command.arg("graph");
    command.arg("--preview");
-    command.env_clear();
    command
 }

@@ -566,8 +565,8 @@ fn venv() -> Result<()> {

        ----- stderr -----
        ruff failed
-          Cause: Invalid `--python` argument `none`: does not point to a Python executable or a directory on disk
-          Cause: No such file or directory (os error 2)
+          Cause: Invalid search path settings
+          Cause: Failed to discover the site-packages directory: Invalid `--python` argument `none`: does not point to a Python executable or a directory on disk
        ");
    });

--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -1067,7 +1067,7 @@ fn show_statistics_syntax_errors() {
    success: false
    exit_code: 1
    ----- stdout -----
-    1		invalid-syntax
+    1		syntax-error
    Found 1 error.

    ----- stderr -----
@@ -1080,7 +1080,7 @@ fn show_statistics_syntax_errors() {
    success: false
    exit_code: 1
    ----- stdout -----
-    1		invalid-syntax
+    1		syntax-error
    Found 1 error.

    ----- stderr -----
@@ -1093,7 +1093,7 @@ fn show_statistics_syntax_errors() {
    success: false
    exit_code: 1
    ----- stdout -----
-    1		invalid-syntax
+    1		syntax-error
    Found 1 error.

    ----- stderr -----
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -612,7 +612,7 @@ fn extend_passed_via_config_argument() {
 #[test]
 fn nonexistent_extend_file() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    fs::write(
        project_dir.join("ruff.toml"),
        r#"
@@ -653,7 +653,7 @@ extend = "ruff3.toml"
 #[test]
 fn circular_extend() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
+    let project_path = tempdir.path().canonicalize()?;

    fs::write(
        project_path.join("ruff.toml"),
@@ -698,7 +698,7 @@ extend = "ruff.toml"
 #[test]
 fn parse_error_extends() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
+    let project_path = tempdir.path().canonicalize()?;

    fs::write(
        project_path.join("ruff.toml"),
@@ -2130,7 +2130,7 @@ select = ["UP006"]
 #[test]
 fn requires_python_no_tool() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2441,7 +2441,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_target_version_override() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2752,7 +2752,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_with_check() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2797,7 +2797,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3118,7 +3118,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3173,7 +3173,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let outer_pyproject = tempdir.path().join("pyproject.toml");
    fs::write(
        &outer_pyproject,
@@ -3200,7 +3200,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"(?m)^foo\\test","foo/test")]
@@ -3499,7 +3499,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let outer_pyproject = tempdir.path().join("pyproject.toml");
    fs::write(
        &outer_pyproject,
@@ -3528,7 +3528,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"foo\\","foo/")]
@@ -3827,7 +3827,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_above() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3856,7 +3856,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
@@ -4441,7 +4441,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_extend_from_shared_config() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -4479,7 +4479,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
--- a/crates/ruff/tests/show_settings.rs
+++ b/crates/ruff/tests/show_settings.rs
@@ -12,8 +12,10 @@ fn display_default_settings() -> anyhow::Result<()> {

    // Tempdir path's on macos are symlinks, which doesn't play nicely with
    // our snapshot filtering.
-    let project_dir =
-        dunce::canonicalize(tempdir.path()).context("Failed to canonical tempdir path.")?;
+    let project_dir = tempdir
+        .path()
+        .canonicalize()
+        .context("Failed to canonical tempdir path.")?;

    std::fs::write(
        project_dir.join("pyproject.toml"),
--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -352,7 +352,7 @@ impl DisplaySet<'_> {
                        // FIXME: `unicode_width` sometimes disagrees with terminals on how wide a `char`
                        // is. For now, just accept that sometimes the code line will be longer than
                        // desired.
-                        let next = char_width(ch).unwrap_or(1);
+                        let next = unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1);
                        if taken + next > right - left {
                            was_cut_right = true;
                            break;
@@ -377,7 +377,7 @@ impl DisplaySet<'_> {
                    let left: usize = text
                        .chars()
                        .take(left)
-                        .map(|ch| char_width(ch).unwrap_or(1))
+                        .map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
                        .sum();

                    let mut annotations = annotations.clone();
@@ -821,7 +821,11 @@ impl DisplaySourceAnnotation<'_> {
    // Length of this annotation as displayed in the stderr output
    fn len(&self) -> usize {
        // Account for usize underflows
-        self.range.1.abs_diff(self.range.0)
+        if self.range.1 > self.range.0 {
+            self.range.1 - self.range.0
+        } else {
+            self.range.0 - self.range.1
+        }
    }

    fn takes_space(&self) -> bool {
@@ -1389,7 +1393,6 @@ fn format_body<'m>(
        let line_length: usize = line.len();
        let line_range = (current_index, current_index + line_length);
        let end_line_size = end_line.len();
-
        body.push(DisplayLine::Source {
            lineno: Some(current_line),
            inline_marks: vec![],
@@ -1449,12 +1452,12 @@ fn format_body<'m>(
                        let annotation_start_col = line
                            [0..(start - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        let mut annotation_end_col = line
                            [0..(end - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        if annotation_start_col == annotation_end_col {
                            // At least highlight something
@@ -1496,7 +1499,7 @@ fn format_body<'m>(
                        let annotation_start_col = line
                            [0..(start - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        let annotation_end_col = annotation_start_col + 1;

@@ -1555,7 +1558,7 @@ fn format_body<'m>(
                    {
                        let end_mark = line[0..(end - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>()
                            .saturating_sub(1);
                        // If the annotation ends on a line-end character, we
@@ -1751,11 +1754,3 @@ fn format_inline_marks(
    }
    Ok(())
 }
-
-fn char_width(c: char) -> Option<usize> {
-    if c == '\t' {
-        Some(4)
-    } else {
-        unicode_width::UnicodeWidthChar::width(c)
-    }
-}
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg
@@ -1,38 +0,0 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
-  <style>
-    .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
-    .fg-bright-blue { fill: #5555FF }
-    .fg-bright-red { fill: #FF5555 }
-    .container {
-      padding: 0 10px;
-      line-height: 18px;
-    }
-    .bold { font-weight: bold; }
-    tspan {
-      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
-      white-space: pre;
-      line-height: 18px;
-    }
-  </style>
-
-  <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
-
-  <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">call-non-callable</tspan>
-</tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/main.py:5:9</tspan>
-</tspan>
-    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">4 |</tspan><tspan> def f():</tspan>
-</tspan>
-    <tspan x="10px" y="100px"><tspan class="fg-bright-blue bold">5 |</tspan><tspan>     return (1 == '2')()  # Tab indented</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>            </tspan><tspan class="fg-bright-red bold">^^^^^^^^^^^^</tspan>
-</tspan>
-    <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-  </text>
-
-</svg>
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.toml
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.toml
@@ -1,45 +0,0 @@
-
-# [crates/ruff_db/src/diagnostic/render.rs:123:47] diag.to_annotate() = Message {
-    # level: Error,
-    # id: Some(
-        # "call-non-callable",
-    # ),
-    # title: "Object of type `bool` is not callable",
-    # snippets: [
-        # Snippet {
-            # origin: Some(
-                # "main.py",
-            # ),
-            # line_start: 1,
-            # source: "def f():\n\treturn (1 == '2')()  # Tab indented\n",
-            # annotations: [
-                # Annotation {
-                    # range: 17..29,
-                    # label: None,
-                    # level: Error,
-                # },
-            # ],
-            # fold: false,
-        # },
-    # ],
-    # footer: [],
-# }
-
-[message]
-level = "Error"
-id = "E0308"
-title = "call-non-callable"
-
-[[message.snippets]]
-source = "def f():\n\treturn (1 == '2')()  # Tab indented\n"
-line_start = 4
-origin = "$DIR/main.py"
-
-[[message.snippets.annotations]]
-label = ""
-level = "Error"
-range = [17, 29]
-
-[renderer]
-# anonymized_line_numbers = true
-color = true
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
@@ -1,36 +0,0 @@
-<svg width="1196px" height="128px" xmlns="http://www.w3.org/2000/svg">
-  <style>
-    .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
-    .fg-bright-blue { fill: #5555FF }
-    .fg-bright-red { fill: #FF5555 }
-    .container {
-      padding: 0 10px;
-      line-height: 18px;
-    }
-    .bold { font-weight: bold; }
-    tspan {
-      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
-      white-space: pre;
-      line-height: 18px;
-    }
-  </style>
-
-  <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
-
-  <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">mismatched types</tspan>
-</tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:6</tspan>
-</tspan>
-    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">4 |</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">...</tspan><tspan>   s_data['d_dails'] = bb['contacted'][hostip]['ansible_facts']['ansible_devices']['vda']['vendor'] + " " + bb['contacted'][hostip</tspan><tspan class="fg-bright-blue bold">...</tspan>
-</tspan>
-    <tspan x="10px" y="100px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>       </tspan><tspan class="fg-bright-red bold">^^^^^^</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-  </text>
-
-</svg>
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.toml
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.toml
@@ -1,20 +0,0 @@
-[message]
-level = "Error"
-id = "E0308"
-title = "mismatched types"
-
-[[message.snippets]]
-source = """
-					s_data['d_dails'] = bb['contacted'][hostip]['ansible_facts']['ansible_devices']['vda']['vendor'] + " " + bb['contacted'][hostip]['an
-"""
-line_start = 4
-origin = "$DIR/non-whitespace-trimming.rs"
-
-[[message.snippets.annotations]]
-label = ""
-level = "Error"
-range = [5, 11]
-
-[renderer]
-# anonymized_line_numbers = true
-color = true
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg
@@ -21,7 +21,7 @@
  <text xml:space="preserve" class="container fg">
    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">mismatched types</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan>  </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:238</tspan>
+    <tspan x="10px" y="46px"><tspan>  </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:242</tspan>
 </tspan>
    <tspan x="10px" y="64px"><tspan>   </tspan><tspan class="fg-bright-blue bold">|</tspan>
 </tspan>
--- a/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.toml
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.toml
@@ -13,12 +13,12 @@ origin = "$DIR/non-whitespace-trimming.rs"
 [[message.snippets.annotations]]
 label = "expected `()`, found integer"
 level = "Error"
-range = [237, 239]
+range = [241, 243]

 [[message.snippets.annotations]]
 label = "expected due to this"
 level = "Error"
-range = [232, 234]
+range = [236, 238]


 [renderer]
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -141,7 +141,7 @@ fn benchmark_incremental(criterion: &mut Criterion) {
                &case.file_path,
                format!(
                    "{}\n# A comment\n",
-                    source_text(&case.db, case.file).as_str()
+                    source_text(&case.db, case.file).load(&case.db).as_str()
                ),
            )
            .unwrap();
@@ -348,99 +348,6 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
    });
 }

-fn benchmark_complex_constrained_attributes_1(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_1]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression benchmark for https://github.com/astral-sh/ty/issues/627.
-                // Before this was fixed, the following sample would take >1s to type check.
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert!(!result.is_empty());
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is is similar to the case above, but now the attributes are actually defined.
-                // https://github.com/astral-sh/ty/issues/711
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            self.a = ""
-                            self.b = ""
-
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 struct ProjectBenchmark<'a> {
    project: InstalledProject<'a>,
    fs: MemoryFileSystem,
@@ -470,7 +377,8 @@ impl<'a> ProjectBenchmark<'a> {
        metadata.apply_options(Options {
            environment: Some(EnvironmentOptions {
                python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                ..EnvironmentOptions::default()
            }),
            ..Options::default()
@@ -575,8 +483,6 @@ criterion_group!(
    micro,
    benchmark_many_string_assignments,
    benchmark_many_tuple_assignments,
-    benchmark_complex_constrained_attributes_1,
-    benchmark_complex_constrained_attributes_2,
 );
 criterion_group!(project, anyio, attrs, hydra);
 criterion_main!(check_file, micro, project);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -36,7 +36,8 @@ impl<'a> Benchmark<'a> {
        metadata.apply_options(Options {
            environment: Some(EnvironmentOptions {
                python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                ..EnvironmentOptions::default()
            }),
            ..Options::default()
@@ -203,23 +204,8 @@ static SYMPY: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new
    )
 });

-static TANJUN: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "tanjun",
-            repository: "https://github.com/FasterSpeeding/Tanjun",
-            commit: "69f40db188196bc59516b6c69849c2d85fbc2f4a",
-            paths: vec![SystemPath::new("tanjun")],
-            dependencies: vec!["hikari", "alluka"],
-            max_dep_date: "2025-06-17",
-            python_version: PythonVersion::PY312,
-        },
-        100,
-    )
-});
-
-#[track_caller]
-fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
+#[bench(args=[&*ALTAIR, &*FREQTRADE, &*PYDANTIC], sample_size=2, sample_count=3)]
+fn small(bencher: Bencher, benchmark: &Benchmark) {
    bencher
        .with_inputs(|| benchmark.setup_iteration())
        .bench_local_refs(|db| {
@@ -227,56 +213,41 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
        });
 }

-#[bench(args=[&*ALTAIR, &*FREQTRADE, &*PYDANTIC, &*TANJUN], sample_size=2, sample_count=3)]
-fn small(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
-}
-
 #[bench(args=[&*COLOUR_SCIENCE, &*PANDAS], sample_size=1, sample_count=3)]
 fn medium(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
+    bencher
+        .with_inputs(|| benchmark.setup_iteration())
+        .bench_local_refs(|db| {
+            check_project(db, benchmark.max_diagnostics);
+        });
 }

 #[bench(args=[&*SYMPY], sample_size=1, sample_count=2)]
 fn large(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
+    bencher
+        .with_inputs(|| benchmark.setup_iteration())
+        .bench_local_refs(|db| {
+            check_project(db, benchmark.max_diagnostics);
+        });
 }

-// Currently disabled because the benchmark is too noisy (± 10%) to give useful feedback.
-// #[bench(args=[&*PYDANTIC], sample_size=3, sample_count=3)]
-// fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
-//     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
-
-//     bencher
-//         .with_inputs(|| benchmark.setup_iteration())
-//         .bench_local_values(|db| {
-//             thread_pool.install(|| {
-//                 check_project(&db, benchmark.max_diagnostics);
-//                 db
-//             })
-//         });
-// }
-
 fn main() {
+    let filter =
+        std::env::var("TY_LOG").unwrap_or("ty_walltime=info,ruff_benchmark=info".to_string());
+
+    let _logging = setup_logging_with_filter(&filter).expect("Filter to be valid");
+
+    // Disable multithreading for now due to
+    // https://github.com/salsa-rs/salsa/issues/918.
+    //
+    // Salsa has a fast-path for the first db when looking up ingredients.
+    // It seems that this fast-path becomes extremely slow for all db's other
+    // than the first one, especially when using multithreading (10x slower than the first run).
    ThreadPoolBuilder::new()
        .num_threads(1)
        .use_current_thread()
        .build_global()
        .unwrap();

-    let filter =
-        std::env::var("TY_LOG").unwrap_or("ty_walltime=info,ruff_benchmark=info".to_string());
-
-    let _logging = setup_logging_with_filter(&filter).expect("Filter to be valid");
-
-    // Salsa uses an optimized lookup for the ingredient index when using only a single database.
-    // This optimization results in at least a 10% speedup compared to when using multiple databases.
-    // To reduce noise, run one benchmark so that all benchmarks take the less optimized "not the first db"
-    // branch when looking up the ingredient index.
-    {
-        let db = TANJUN.setup_iteration();
-        check_project(&db, TANJUN.max_diagnostics);
-    }
-
    divan::main();
 }
--- a/crates/ruff_benchmark/src/real_world_projects.rs
+++ b/crates/ruff_benchmark/src/real_world_projects.rs
@@ -74,17 +74,19 @@ impl<'a> RealWorldProject<'a> {
        };

        // Install dependencies if specified
-        tracing::debug!(
-            "Installing {} dependencies for project '{}'...",
-            checkout.project().dependencies.len(),
-            checkout.project().name
-        );
-        let start_install = std::time::Instant::now();
-        install_dependencies(&checkout)?;
-        tracing::debug!(
-            "Dependency installation completed in {:.2}s",
-            start_install.elapsed().as_secs_f64()
-        );
+        if !checkout.project().dependencies.is_empty() {
+            tracing::debug!(
+                "Installing {} dependencies for project '{}'...",
+                checkout.project().dependencies.len(),
+                checkout.project().name
+            );
+            let start = std::time::Instant::now();
+            install_dependencies(&checkout)?;
+            tracing::debug!(
+                "Dependency installation completed in {:.2}s",
+                start.elapsed().as_secs_f64()
+            );
+        }

        tracing::debug!("Project setup took: {:.2}s", start.elapsed().as_secs_f64());

@@ -279,14 +281,6 @@ fn install_dependencies(checkout: &Checkout) -> Result<()> {
        String::from_utf8_lossy(&output.stderr)
    );

-    if checkout.project().dependencies.is_empty() {
-        tracing::debug!(
-            "No dependencies to install for project '{}'",
-            checkout.project().name
-        );
-        return Ok(());
-    }
-
    // Install dependencies with date constraint in the isolated environment
    let mut cmd = Command::new("uv");
    cmd.args([
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -13,12 +13,11 @@ license = { workspace = true }
 [dependencies]
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true, optional = true }
-ruff_diagnostics = { workspace = true }
 ruff_notebook = { workspace = true }
-ruff_python_ast = { workspace = true, features = ["get-size"] }
+ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
-ruff_source_file = { workspace = true, features = ["get-size"] }
+ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }

 anstyle = { workspace = true }
@@ -28,18 +27,17 @@ countme = { workspace = true }
 dashmap = { workspace = true }
 dunce = { workspace = true }
 filetime = { workspace = true }
-get-size2 = { workspace = true }
 glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
-path-slash = { workspace = true }
-rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+path-slash = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
+rustc-hash = { workspace = true }
 zip = { workspace = true }

 [target.'cfg(target_arch="wasm32")'.dependencies]
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,11 +1,10 @@
 use std::{fmt::Formatter, sync::Arc};

 use render::{FileResolver, Input};
-use ruff_diagnostics::Fix;
-use ruff_source_file::{LineColumn, SourceCode, SourceFile};
+use ruff_source_file::{SourceCode, SourceFile};

 use ruff_annotate_snippets::Level as AnnotateLevel;
-use ruff_text_size::{Ranged, TextRange, TextSize};
+use ruff_text_size::{Ranged, TextRange};

 pub use self::render::DisplayDiagnostic;
 use crate::{Db, files::File};
@@ -20,7 +19,7 @@ mod stylesheet;
 /// characteristics in the inputs given to the tool. Typically, but not always,
 /// a characteristic is a deficiency. An example of a characteristic that is
 /// _not_ a deficiency is the `reveal_type` diagnostic for our type checker.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Diagnostic {
    /// The actual diagnostic.
    ///
@@ -63,37 +62,10 @@ impl Diagnostic {
            message: message.into_diagnostic_message(),
            annotations: vec![],
            subs: vec![],
-            fix: None,
-            parent: None,
-            noqa_offset: None,
-            secondary_code: None,
        });
        Diagnostic { inner }
    }

-    /// Creates a `Diagnostic` for a syntax error.
-    ///
-    /// Unlike the more general [`Diagnostic::new`], this requires a [`Span`] and a [`TextRange`]
-    /// attached to it.
-    ///
-    /// This should _probably_ be a method on the syntax errors, but
-    /// at time of writing, `ruff_db` depends on `ruff_python_parser` instead of
-    /// the other way around. And since we want to do this conversion in a couple
-    /// places, it makes sense to centralize it _somewhere_. So it's here for now.
-    ///
-    /// Note that `message` is stored in the primary annotation, _not_ in the primary diagnostic
-    /// message.
-    pub fn syntax_error(
-        span: impl Into<Span>,
-        message: impl IntoDiagnosticMessage,
-        range: impl Ranged,
-    ) -> Diagnostic {
-        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
-        let span = span.into().with_range(range.range());
-        diag.annotate(Annotation::primary(span).message(message));
-        diag
-    }
-
    /// Add an annotation to this diagnostic.
    ///
    /// Annotations for a diagnostic are optional, but if any are added,
@@ -254,11 +226,6 @@ impl Diagnostic {
        self.primary_annotation().map(|ann| ann.span.clone())
    }

-    /// Returns a reference to the primary span of this diagnostic.
-    pub fn primary_span_ref(&self) -> Option<&Span> {
-        self.primary_annotation().map(|ann| &ann.span)
-    }
-
    /// Returns the tags from the primary annotation of this diagnostic if it exists.
    pub fn primary_tags(&self) -> Option<&[DiagnosticTag]> {
        self.primary_annotation().map(|ann| ann.tags.as_slice())
@@ -301,180 +268,15 @@ impl Diagnostic {
    pub fn sub_diagnostics(&self) -> &[SubDiagnostic] {
        &self.inner.subs
    }
-
-    /// Returns the fix for this diagnostic if it exists.
-    pub fn fix(&self) -> Option<&Fix> {
-        self.inner.fix.as_ref()
-    }
-
-    /// Set the fix for this diagnostic.
-    pub fn set_fix(&mut self, fix: Fix) {
-        Arc::make_mut(&mut self.inner).fix = Some(fix);
-    }
-
-    /// Remove the fix for this diagnostic.
-    pub fn remove_fix(&mut self) {
-        Arc::make_mut(&mut self.inner).fix = None;
-    }
-
-    /// Returns `true` if the diagnostic contains a [`Fix`].
-    pub fn fixable(&self) -> bool {
-        self.fix().is_some()
-    }
-
-    /// Returns the offset of the parent statement for this diagnostic if it exists.
-    ///
-    /// This is primarily used for checking noqa/secondary code suppressions.
-    pub fn parent(&self) -> Option<TextSize> {
-        self.inner.parent
-    }
-
-    /// Set the offset of the diagnostic's parent statement.
-    pub fn set_parent(&mut self, parent: TextSize) {
-        Arc::make_mut(&mut self.inner).parent = Some(parent);
-    }
-
-    /// Returns the remapped offset for a suppression comment if it exists.
-    ///
-    /// Like [`Diagnostic::parent`], this is used for noqa code suppression comments in Ruff.
-    pub fn noqa_offset(&self) -> Option<TextSize> {
-        self.inner.noqa_offset
-    }
-
-    /// Set the remapped offset for a suppression comment.
-    pub fn set_noqa_offset(&mut self, noqa_offset: TextSize) {
-        Arc::make_mut(&mut self.inner).noqa_offset = Some(noqa_offset);
-    }
-
-    /// Returns the secondary code for the diagnostic if it exists.
-    ///
-    /// The "primary" code for the diagnostic is its lint name. Diagnostics in ty don't have
-    /// secondary codes (yet), but in Ruff the noqa code is used.
-    pub fn secondary_code(&self) -> Option<&SecondaryCode> {
-        self.inner.secondary_code.as_ref()
-    }
-
-    /// Set the secondary code for this diagnostic.
-    pub fn set_secondary_code(&mut self, code: SecondaryCode) {
-        Arc::make_mut(&mut self.inner).secondary_code = Some(code);
-    }
-
-    /// Returns the name used to represent the diagnostic.
-    pub fn name(&self) -> &'static str {
-        self.id().as_str()
-    }
-
-    /// Returns `true` if `self` is a syntax error message.
-    pub fn is_syntax_error(&self) -> bool {
-        self.id().is_invalid_syntax()
-    }
-
-    /// Returns the message body to display to the user.
-    pub fn body(&self) -> &str {
-        self.primary_message()
-    }
-
-    /// Returns the fix suggestion for the violation.
-    pub fn suggestion(&self) -> Option<&str> {
-        self.primary_annotation()?.get_message()
-    }
-
-    /// Returns the URL for the rule documentation, if it exists.
-    pub fn to_url(&self) -> Option<String> {
-        if self.is_syntax_error() {
-            None
-        } else {
-            Some(format!(
-                "{}/rules/{}",
-                env!("CARGO_PKG_HOMEPAGE"),
-                self.name()
-            ))
-        }
-    }
-
-    /// Returns the filename for the message.
-    ///
-    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn expect_ruff_filename(&self) -> String {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .name()
-            .to_string()
-    }
-
-    /// Computes the start source location for the message.
-    ///
-    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
-    /// span has no range.
-    pub fn expect_ruff_start_location(&self) -> LineColumn {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .to_source_code()
-            .line_column(self.expect_range().start())
-    }
-
-    /// Computes the end source location for the message.
-    ///
-    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
-    /// span has no range.
-    pub fn expect_ruff_end_location(&self) -> LineColumn {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .to_source_code()
-            .line_column(self.expect_range().end())
-    }
-
-    /// Returns the [`SourceFile`] which the message belongs to.
-    pub fn ruff_source_file(&self) -> Option<&SourceFile> {
-        self.primary_span_ref()?.as_ruff_file()
-    }
-
-    /// Returns the [`SourceFile`] which the message belongs to.
-    ///
-    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn expect_ruff_source_file(&self) -> SourceFile {
-        self.expect_primary_span().expect_ruff_file().clone()
-    }
-
-    /// Returns the [`TextRange`] for the diagnostic.
-    pub fn range(&self) -> Option<TextRange> {
-        self.primary_span()?.range()
-    }
-
-    /// Returns the [`TextRange`] for the diagnostic.
-    ///
-    /// Panics if the diagnostic has no primary span or if the span has no range.
-    pub fn expect_range(&self) -> TextRange {
-        self.range().expect("Expected a range for the primary span")
-    }
 }

-impl Ord for Diagnostic {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.partial_cmp(other).unwrap_or(std::cmp::Ordering::Equal)
-    }
-}
-
-impl PartialOrd for Diagnostic {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(
-            (self.ruff_source_file()?, self.range()?.start())
-                .cmp(&(other.ruff_source_file()?, other.range()?.start())),
-        )
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct DiagnosticInner {
    id: DiagnosticId,
    severity: Severity,
    message: DiagnosticMessage,
    annotations: Vec<Annotation>,
    subs: Vec<SubDiagnostic>,
-    fix: Option<Fix>,
-    parent: Option<TextSize>,
-    noqa_offset: Option<TextSize>,
-    secondary_code: Option<SecondaryCode>,
 }

 struct RenderingSortKey<'a> {
@@ -540,7 +342,7 @@ impl Eq for RenderingSortKey<'_> {}
 /// Currently, the order in which sub-diagnostics are rendered relative to one
 /// another (for a single parent diagnostic) is the order in which they were
 /// attached to the diagnostic.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct SubDiagnostic {
    /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
    /// pointer-sized.
@@ -641,7 +443,7 @@ impl SubDiagnostic {
    }
 }

-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct SubDiagnosticInner {
    severity: Severity,
    message: DiagnosticMessage,
@@ -669,7 +471,7 @@ struct SubDiagnosticInner {
 ///
 /// Messages attached to annotations should also be as brief and specific as
 /// possible. Long messages could negative impact the quality of rendering.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Annotation {
    /// The span of this annotation, corresponding to some subsequence of the
    /// user's input that we want to highlight.
@@ -789,7 +591,7 @@ impl Annotation {
 ///
 /// These tags are used to provide additional information about the annotation.
 /// and are passed through to the language server protocol.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum DiagnosticTag {
    /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
    Unnecessary,
@@ -803,7 +605,7 @@ pub enum DiagnosticTag {
 /// be in kebab case, e.g. `no-foo` (all lower case).
 ///
 /// Rules use kebab case, e.g. `no-foo`.
-#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub struct LintName(&'static str);

 impl LintName {
@@ -843,7 +645,7 @@ impl PartialEq<&str> for LintName {
 }

 /// Uniquely identifies the kind of a diagnostic.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, get_size2::GetSize)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
 pub enum DiagnosticId {
    Panic,

@@ -933,9 +735,6 @@ pub enum DiagnosticId {
    /// # no `[overrides.rules]`
    /// ```
    UselessOverridesSection,
-
-    /// Use of a deprecated setting.
-    DeprecatedSetting,
 }

 impl DiagnosticId {
@@ -974,7 +773,6 @@ impl DiagnosticId {
            DiagnosticId::EmptyInclude => "empty-include",
            DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
            DiagnosticId::UselessOverridesSection => "useless-overrides-section",
-            DiagnosticId::DeprecatedSetting => "deprecated-setting",
        }
    }

@@ -998,7 +796,7 @@ impl std::fmt::Display for DiagnosticId {
 ///
 /// This enum presents a unified interface to these two types for the sake of creating [`Span`]s and
 /// emitting diagnostics from both ty and ruff.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum UnifiedFile {
    Ty(File),
    Ruff(SourceFile),
@@ -1050,7 +848,7 @@ impl DiagnosticSource {
 /// It consists of a `File` and an optional range into that file. When the
 /// range isn't present, it semantically implies that the diagnostic refers to
 /// the entire file. For example, when the file should be executable but isn't.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Span {
    file: UnifiedFile,
    range: Option<TextRange>,
@@ -1095,15 +893,9 @@ impl Span {
    ///
    /// Panics if the file is a [`UnifiedFile::Ty`] instead of a [`UnifiedFile::Ruff`].
    pub fn expect_ruff_file(&self) -> &SourceFile {
-        self.as_ruff_file()
-            .expect("Expected a ruff `SourceFile`, found a ty `File`")
-    }
-
-    /// Returns the [`SourceFile`] attached to this [`Span`].
-    pub fn as_ruff_file(&self) -> Option<&SourceFile> {
        match &self.file {
-            UnifiedFile::Ty(_) => None,
-            UnifiedFile::Ruff(file) => Some(file),
+            UnifiedFile::Ty(_) => panic!("Expected a ruff `SourceFile`, found a ty `File`"),
+            UnifiedFile::Ruff(file) => file,
        }
    }
 }
@@ -1128,7 +920,7 @@ impl From<crate::files::FileRange> for Span {
    }
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd)]
 pub enum Severity {
    Info,
    Warning,
@@ -1291,7 +1083,7 @@ impl std::fmt::Display for ConciseMessage<'_> {
 /// In most cases, callers shouldn't need to use this. Instead, there is
 /// a blanket trait implementation for `IntoDiagnosticMessage` for
 /// anything that implements `std::fmt::Display`.
-#[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DiagnosticMessage(Box<str>);

 impl DiagnosticMessage {
@@ -1351,52 +1143,41 @@ impl<T: std::fmt::Display> IntoDiagnosticMessage for T {
    }
 }

-/// A secondary identifier for a lint diagnostic.
+/// Creates a `Diagnostic` from a parse error.
 ///
-/// For Ruff rules this means the noqa code.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Hash, get_size2::GetSize)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize), serde(transparent))]
-pub struct SecondaryCode(String);
-
-impl SecondaryCode {
-    pub fn new(code: String) -> Self {
-        Self(code)
-    }
-
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
+/// This should _probably_ be a method on `ruff_python_parser::ParseError`, but
+/// at time of writing, `ruff_db` depends on `ruff_python_parser` instead of
+/// the other way around. And since we want to do this conversion in a couple
+/// places, it makes sense to centralize it _somewhere_. So it's here for now.
+pub fn create_parse_diagnostic(file: File, err: &ruff_python_parser::ParseError) -> Diagnostic {
+    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
+    let span = Span::from(file).with_range(err.location);
+    diag.annotate(Annotation::primary(span).message(&err.error));
+    diag
 }

-impl std::fmt::Display for SecondaryCode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.0)
-    }
+/// Creates a `Diagnostic` from an unsupported syntax error.
+///
+/// See [`create_parse_diagnostic`] for more details.
+pub fn create_unsupported_syntax_diagnostic(
+    file: File,
+    err: &ruff_python_parser::UnsupportedSyntaxError,
+) -> Diagnostic {
+    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
+    let span = Span::from(file).with_range(err.range);
+    diag.annotate(Annotation::primary(span).message(err.to_string()));
+    diag
 }

-impl std::ops::Deref for SecondaryCode {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl PartialEq<&str> for SecondaryCode {
-    fn eq(&self, other: &&str) -> bool {
-        self.0 == *other
-    }
-}
-
-impl PartialEq<SecondaryCode> for &str {
-    fn eq(&self, other: &SecondaryCode) -> bool {
-        other.eq(self)
-    }
-}
-
-// for `hashbrown::EntryRef`
-impl From<&SecondaryCode> for SecondaryCode {
-    fn from(value: &SecondaryCode) -> Self {
-        value.clone()
-    }
+/// Creates a `Diagnostic` from a semantic syntax error.
+///
+/// See [`create_parse_diagnostic`] for more details.
+pub fn create_semantic_syntax_diagnostic(
+    file: File,
+    err: &ruff_python_parser::semantic_errors::SemanticSyntaxError,
+) -> Diagnostic {
+    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
+    let span = Span::from(file).with_range(err.range);
+    diag.annotate(Annotation::primary(span).message(err.to_string()));
+    diag
 }
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -8,10 +8,11 @@ use ruff_source_file::{LineIndex, OneIndexed, SourceCode};
 use ruff_text_size::{TextRange, TextSize};

 use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
+use crate::source::SourceTextRef;
 use crate::{
    Db,
    files::File,
-    source::{SourceText, line_index, source_text},
+    source::{line_index, source_text},
    system::SystemPath,
 };

@@ -637,22 +638,6 @@ pub trait FileResolver {
    fn input(&self, file: File) -> Input;
 }

-impl<T> FileResolver for T
-where
-    T: Db,
-{
-    fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(self).as_str())
-    }
-
-    fn input(&self, file: File) -> Input {
-        Input {
-            text: source_text(self, file),
-            line_index: line_index(self, file),
-        }
-    }
-}
-
 impl FileResolver for &dyn Db {
    fn path(&self, file: File) -> &str {
        relativize_path(self.system().current_directory(), file.path(*self).as_str())
@@ -660,7 +645,7 @@ impl FileResolver for &dyn Db {

    fn input(&self, file: File) -> Input {
        Input {
-            text: source_text(*self, file),
+            text: source_text(*self, file).load(*self),
            line_index: line_index(*self, file),
        }
    }
@@ -673,7 +658,7 @@ impl FileResolver for &dyn Db {
 /// line index for efficiently querying its contents.
 #[derive(Clone, Debug)]
 pub struct Input {
-    pub(crate) text: SourceText,
+    pub(crate) text: SourceTextRef,
    pub(crate) line_index: LineIndex,
 }

@@ -724,6 +709,7 @@ fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
 #[cfg(test)]
 mod tests {

+    use crate::Upcast;
    use crate::diagnostic::{Annotation, DiagnosticId, Severity, Span};
    use crate::files::system_path_to_file;
    use crate::system::{DbWithWritableSystem, SystemPath};
@@ -2173,7 +2159,7 @@ watermelon
            let span = self.path(path);

            let file = span.expect_ty_file();
-            let text = source_text(&self.db, file);
+            let text = source_text(&self.db, file).load(&self.db);
            let line_index = line_index(&self.db, file);
            let source = SourceCode::new(text.as_str(), &line_index);

@@ -2236,7 +2222,7 @@ watermelon
        ///
        /// (This will set the "printed" flag on `Diagnostic`.)
        fn render(&self, diag: &Diagnostic) -> String {
-            diag.display(&self.db, &self.config).to_string()
+            diag.display(&self.db.upcast(), &self.config).to_string()
        }
    }

--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -263,23 +263,12 @@ impl Files {

 impl fmt::Debug for Files {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if f.alternate() {
-            let mut map = f.debug_map();
+        let mut map = f.debug_map();

-            for entry in self.inner.system_by_path.iter() {
-                map.entry(entry.key(), entry.value());
-            }
-            map.finish()
-        } else {
-            f.debug_struct("Files")
-                .field("system_by_path", &self.inner.system_by_path.len())
-                .field(
-                    "system_virtual_by_path",
-                    &self.inner.system_virtual_by_path.len(),
-                )
-                .field("vendored_by_path", &self.inner.vendored_by_path.len())
-                .finish()
+        for entry in self.inner.system_by_path.iter() {
+            map.entry(entry.key(), entry.value());
        }
+        map.finish()
    }
 }

@@ -319,9 +308,6 @@ pub struct File {
    count: Count<File>,
 }

-// The Salsa heap is tracked separately.
-impl get_size2::GetSize for File {}
-
 impl File {
    /// Reads the content of the file into a [`String`].
    ///
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -36,6 +36,12 @@ pub trait Db: salsa::Database {
    fn python_version(&self) -> PythonVersion;
 }

+/// Trait for upcasting a reference to a base trait object.
+pub trait Upcast<T: ?Sized> {
+    fn upcast(&self) -> &T;
+    fn upcast_mut(&mut self) -> &mut T;
+}
+
 /// Returns the maximum number of tasks that ty is allowed
 /// to process in parallel.
 ///
@@ -70,11 +76,11 @@ pub trait RustDoc {
 mod tests {
    use std::sync::{Arc, Mutex};

-    use crate::Db;
    use crate::files::Files;
    use crate::system::TestSystem;
    use crate::system::{DbWithTestSystem, System};
    use crate::vendored::VendoredFileSystem;
+    use crate::{Db, Upcast};

    type Events = Arc<Mutex<Vec<salsa::Event>>>;

@@ -147,6 +153,15 @@ mod tests {
        }
    }

+    impl Upcast<dyn Db> for TestDb {
+        fn upcast(&self) -> &(dyn Db + 'static) {
+            self
+        }
+        fn upcast_mut(&mut self) -> &mut (dyn Db + 'static) {
+            self
+        }
+    }
+
    impl DbWithTestSystem for TestDb {
        fn test_system(&self) -> &TestSystem {
            &self.system
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -2,7 +2,6 @@ use std::fmt::Formatter;
 use std::sync::Arc;

 use arc_swap::ArcSwapOption;
-use get_size2::GetSize;
 use ruff_python_ast::{AnyRootNodeRef, ModModule, NodeIndex};
 use ruff_python_parser::{ParseOptions, Parsed, parse_unchecked};

@@ -21,7 +20,7 @@ use crate::source::source_text;
 /// reflected in the changed AST offsets.
 /// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
 /// for determining if a query result is unchanged.
-#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(returns(ref), no_eq)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
    let _span = tracing::trace_span!("parsed_module", ?file).entered();

@@ -31,7 +30,7 @@ pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
 }

 pub fn parsed_module_impl(db: &dyn Db, file: File) -> Parsed<ModModule> {
-    let source = source_text(db, file);
+    let source = source_text(db, file).load(db);
    let ty = file.source_type(db);

    let target_version = db.python_version();
@@ -45,10 +44,9 @@ pub fn parsed_module_impl(db: &dyn Db, file: File) -> Parsed<ModModule> {
 ///
 /// This type manages instances of the module AST. A particular instance of the AST
 /// is represented with the [`ParsedModuleRef`] type.
-#[derive(Clone, get_size2::GetSize)]
+#[derive(Clone)]
 pub struct ParsedModule {
    file: File,
-    #[get_size(size_fn = arc_swap_size)]
    inner: Arc<ArcSwapOption<indexed::IndexedModule>>,
 }

@@ -144,18 +142,6 @@ impl std::ops::Deref for ParsedModuleRef {
    }
 }

-/// Returns the heap-size of the currently stored `T` in the `ArcSwap`.
-fn arc_swap_size<T>(arc_swap: &Arc<ArcSwapOption<T>>) -> usize
-where
-    T: GetSize,
-{
-    if let Some(value) = &*arc_swap.load() {
-        T::get_heap_size(value)
-    } else {
-        0
-    }
-}
-
 mod indexed {
    use std::sync::Arc;

@@ -164,7 +150,7 @@ mod indexed {
    use ruff_python_parser::Parsed;

    /// A wrapper around the AST that allows access to AST nodes by index.
-    #[derive(Debug, get_size2::GetSize)]
+    #[derive(Debug)]
    pub struct IndexedModule {
        index: Box<[AnyRootNodeRef<'static>]>,
        pub parsed: Parsed<ModModule>,
--- a/crates/ruff_db/src/source.rs
+++ b/crates/ruff_db/src/source.rs
@@ -1,6 +1,7 @@
 use std::ops::Deref;
 use std::sync::Arc;

+use arc_swap::ArcSwapOption;
 use countme::Count;

 use ruff_notebook::Notebook;
@@ -11,8 +12,17 @@ use crate::Db;
 use crate::files::{File, FilePath};

 /// Reads the source text of a python text file (must be valid UTF8) or notebook.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(no_eq)]
 pub fn source_text(db: &dyn Db, file: File) -> SourceText {
+    let source_text = source_text_impl(db, file);
+
+    SourceText {
+        file,
+        inner: Arc::new(ArcSwapOption::new(Some(Arc::new(source_text)))),
+    }
+}
+
+fn source_text_impl(db: &dyn Db, file: File) -> SourceTextInner {
    let path = file.path(db);
    let _span = tracing::trace_span!("source_text", file = %path).entered();
    let mut read_error = None;
@@ -37,12 +47,10 @@ pub fn source_text(db: &dyn Db, file: File) -> SourceText {
            .into()
    };

-    SourceText {
-        inner: Arc::new(SourceTextInner {
-            kind,
-            read_error,
-            count: Count::new(),
-        }),
+    SourceTextInner {
+        kind,
+        read_error,
+        _count: Count::new(),
    }
 }

@@ -65,12 +73,41 @@ fn is_notebook(path: &FilePath) -> bool {
 /// The file containing the source text can either be a text file or a notebook.
 ///
 /// Cheap cloneable in `O(1)`.
-#[derive(Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Clone)]
 pub struct SourceText {
+    file: File,
+    inner: Arc<ArcSwapOption<SourceTextInner>>,
+}
+
+impl PartialEq for SourceText {
+    fn eq(&self, other: &Self) -> bool {
+        Arc::ptr_eq(&self.inner, &other.inner)
+    }
+}
+
+impl Eq for SourceText {}
+
+impl SourceText {
+    pub fn load(&self, db: &dyn Db) -> SourceTextRef {
+        SourceTextRef {
+            inner: self
+                .inner
+                .load_full()
+                .unwrap_or_else(|| Arc::new(source_text_impl(db, self.file))),
+        }
+    }
+
+    pub fn clear(&self) {
+        self.inner.store(None);
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct SourceTextRef {
    inner: Arc<SourceTextInner>,
 }

-impl SourceText {
+impl SourceTextRef {
    /// Returns the python code as a `str`.
    pub fn as_str(&self) -> &str {
        match &self.inner.kind {
@@ -98,7 +135,7 @@ impl SourceText {
    }
 }

-impl Deref for SourceText {
+impl Deref for SourceTextRef {
    type Target = str;

    fn deref(&self) -> &str {
@@ -106,7 +143,7 @@ impl Deref for SourceText {
    }
 }

-impl std::fmt::Debug for SourceText {
+impl std::fmt::Debug for SourceTextRef {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let mut dbg = f.debug_tuple("SourceText");

@@ -123,12 +160,18 @@ impl std::fmt::Debug for SourceText {
    }
 }

-#[derive(Eq, PartialEq, get_size2::GetSize)]
 struct SourceTextInner {
-    #[get_size(ignore)]
-    count: Count<SourceText>,
    kind: SourceTextKind,
    read_error: Option<SourceTextError>,
+    _count: Count<SourceText>,
+}
+
+impl Eq for SourceTextInner {}
+
+impl PartialEq for SourceTextInner {
+    fn eq(&self, other: &Self) -> bool {
+        self.kind.eq(&other.kind) && self.read_error.eq(&other.read_error)
+    }
 }

 #[derive(Eq, PartialEq)]
@@ -137,19 +180,6 @@ enum SourceTextKind {
    Notebook(Box<Notebook>),
 }

-impl get_size2::GetSize for SourceTextKind {
-    fn get_heap_size(&self) -> usize {
-        match self {
-            SourceTextKind::Text(text) => text.get_heap_size(),
-            // TODO: The `get-size` derive does not support ignoring enum variants.
-            //
-            // Jupyter notebooks are not very relevant for memory profiling, and contain
-            // arbitrary JSON values that do not implement the `GetSize` trait.
-            SourceTextKind::Notebook(_) => 0,
-        }
-    }
-}
-
 impl From<String> for SourceTextKind {
    fn from(value: String) -> Self {
        SourceTextKind::Text(value)
@@ -162,7 +192,7 @@ impl From<Notebook> for SourceTextKind {
    }
 }

-#[derive(Debug, thiserror::Error, PartialEq, Eq, Clone, get_size2::GetSize)]
+#[derive(Debug, thiserror::Error, PartialEq, Eq, Clone)]
 pub enum SourceTextError {
    #[error("Failed to read notebook: {0}`")]
    FailedToReadNotebook(String),
@@ -171,11 +201,11 @@ pub enum SourceTextError {
 }

 /// Computes the [`LineIndex`] for `file`.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked]
 pub fn line_index(db: &dyn Db, file: File) -> LineIndex {
    let _span = tracing::trace_span!("line_index", ?file).entered();

-    let source = source_text(db, file);
+    let source = source_text(db, file).load(db);

    LineIndex::from_source_text(&source)
 }
@@ -202,11 +232,11 @@ mod tests {

        let file = system_path_to_file(&db, path).unwrap();

-        assert_eq!(source_text(&db, file).as_str(), "x = 10");
+        assert_eq!(source_text(&db, file).load(&db).as_str(), "x = 10");

        db.write_file(path, "x = 20").unwrap();

-        assert_eq!(source_text(&db, file).as_str(), "x = 20");
+        assert_eq!(source_text(&db, file).load(&db).as_str(), "x = 20");

        Ok(())
    }
@@ -220,13 +250,13 @@ mod tests {

        let file = system_path_to_file(&db, path).unwrap();

-        assert_eq!(source_text(&db, file).as_str(), "x = 10");
+        assert_eq!(source_text(&db, file).load(&db).as_str(), "x = 10");

        // Change the file permission only
        file.set_permissions(&mut db).to(Some(0o777));

        db.clear_salsa_events();
-        assert_eq!(source_text(&db, file).as_str(), "x = 10");
+        assert_eq!(source_text(&db, file).load(&db).as_str(), "x = 10");

        let events = db.take_salsa_events();

@@ -248,7 +278,7 @@ mod tests {

        let file = system_path_to_file(&db, path).unwrap();
        let index = line_index(&db, file);
-        let source = source_text(&db, file);
+        let source = source_text(&db, file).load(&db);

        assert_eq!(index.line_count(), 2);
        assert_eq!(
@@ -290,7 +320,7 @@ mod tests {
        )?;

        let file = system_path_to_file(&db, path).unwrap();
-        let source = source_text(&db, file);
+        let source = source_text(&db, file).load(&db);

        assert!(source.is_notebook());
        assert_eq!(source.as_str(), "x = 10\n");
--- a/crates/ruff_db/src/system.rs
+++ b/crates/ruff_db/src/system.rs
@@ -124,11 +124,6 @@ pub trait System: Debug {
    /// Returns `None` if no such convention exists for the system.
    fn user_config_directory(&self) -> Option<SystemPathBuf>;

-    /// Returns the directory path where cached files are stored.
-    ///
-    /// Returns `None` if no such convention exists for the system.
-    fn cache_dir(&self) -> Option<SystemPathBuf>;
-
    /// Iterate over the contents of the directory at `path`.
    ///
    /// The returned iterator must have the following properties:
@@ -191,9 +186,6 @@ pub trait System: Debug {
        Err(std::env::VarError::NotPresent)
    }

-    /// Returns a handle to a [`WritableSystem`] if this system is writeable.
-    fn as_writable(&self) -> Option<&dyn WritableSystem>;
-
    fn as_any(&self) -> &dyn std::any::Any;

    fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
@@ -234,52 +226,11 @@ impl fmt::Display for CaseSensitivity {

 /// System trait for non-readonly systems.
 pub trait WritableSystem: System {
-    /// Creates a file at the given path.
-    ///
-    /// Returns an error if the file already exists.
-    fn create_new_file(&self, path: &SystemPath) -> Result<()>;
-
    /// Writes the given content to the file at the given path.
    fn write_file(&self, path: &SystemPath, content: &str) -> Result<()>;

    /// Creates a directory at `path` as well as any intermediate directories.
    fn create_directory_all(&self, path: &SystemPath) -> Result<()>;
-
-    /// Reads the provided file from the system cache, or creates the file if necessary.
-    ///
-    /// Returns `Ok(None)` if the system does not expose a suitable cache directory.
-    fn get_or_cache(
-        &self,
-        path: &SystemPath,
-        read_contents: &dyn Fn() -> Result<String>,
-    ) -> Result<Option<SystemPathBuf>> {
-        let Some(cache_dir) = self.cache_dir() else {
-            return Ok(None);
-        };
-
-        let cache_path = cache_dir.join(path);
-
-        // The file has already been cached.
-        if self.is_file(&cache_path) {
-            return Ok(Some(cache_path));
-        }
-
-        // Read the file contents.
-        let contents = read_contents()?;
-
-        // Create the parent directory.
-        self.create_directory_all(cache_path.parent().unwrap())?;
-
-        // Create and write to the file on the system.
-        //
-        // Note that `create_new_file` will fail if the file has already been created. This
-        // ensures that only one thread/process ever attempts to write to it to avoid corrupting
-        // the cache.
-        self.create_new_file(&cache_path)?;
-        self.write_file(&cache_path, &contents)?;
-
-        Ok(Some(cache_path))
-    }
 }

 #[derive(Clone, Debug, Eq, PartialEq)]
--- a/crates/ruff_db/src/system/memory_fs.rs
+++ b/crates/ruff_db/src/system/memory_fs.rs
@@ -1,5 +1,4 @@
-use std::collections::{BTreeMap, btree_map};
-use std::io;
+use std::collections::BTreeMap;
 use std::iter::FusedIterator;
 use std::sync::{Arc, RwLock, RwLockWriteGuard};

@@ -154,26 +153,6 @@ impl MemoryFileSystem {
        virtual_files.contains_key(&path.to_path_buf())
    }

-    pub(crate) fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        let normalized = self.normalize_path(path);
-
-        let mut by_path = self.inner.by_path.write().unwrap();
-        match by_path.entry(normalized) {
-            btree_map::Entry::Vacant(entry) => {
-                entry.insert(Entry::File(File {
-                    content: String::new(),
-                    last_modified: file_time_now(),
-                }));
-
-                Ok(())
-            }
-            btree_map::Entry::Occupied(_) => Err(io::Error::new(
-                io::ErrorKind::AlreadyExists,
-                "File already exists",
-            )),
-        }
-    }
-
    /// Stores a new file in the file system.
    ///
    /// The operation overrides the content for an existing file with the same normalized `path`.
@@ -299,14 +278,14 @@ impl MemoryFileSystem {
            let normalized = fs.normalize_path(path);

            match by_path.entry(normalized) {
-                btree_map::Entry::Occupied(entry) => match entry.get() {
+                std::collections::btree_map::Entry::Occupied(entry) => match entry.get() {
                    Entry::File(_) => {
                        entry.remove();
                        Ok(())
                    }
                    Entry::Directory(_) => Err(is_a_directory()),
                },
-                btree_map::Entry::Vacant(_) => Err(not_found()),
+                std::collections::btree_map::Entry::Vacant(_) => Err(not_found()),
            }
        }

@@ -366,14 +345,14 @@ impl MemoryFileSystem {
            }

            match by_path.entry(normalized.clone()) {
-                btree_map::Entry::Occupied(entry) => match entry.get() {
+                std::collections::btree_map::Entry::Occupied(entry) => match entry.get() {
                    Entry::Directory(_) => {
                        entry.remove();
                        Ok(())
                    }
                    Entry::File(_) => Err(not_a_directory()),
                },
-                btree_map::Entry::Vacant(_) => Err(not_found()),
+                std::collections::btree_map::Entry::Vacant(_) => Err(not_found()),
            }
        }

--- a/crates/ruff_db/src/system/os.rs
+++ b/crates/ruff_db/src/system/os.rs
@@ -160,39 +160,6 @@ impl System for OsSystem {
        None
    }

-    /// Returns an absolute cache directory on the system.
-    ///
-    /// On Linux and macOS, uses `$XDG_CACHE_HOME/ty` or `.cache/ty`.
-    /// On Windows, uses `C:\Users\User\AppData\Local\ty\cache`.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        use etcetera::BaseStrategy as _;
-
-        let cache_dir = etcetera::base_strategy::choose_base_strategy()
-            .ok()
-            .map(|dirs| dirs.cache_dir().join("ty"))
-            .map(|cache_dir| {
-                if cfg!(windows) {
-                    // On Windows, we append `cache` to the LocalAppData directory, i.e., prefer
-                    // `C:\Users\User\AppData\Local\ty\cache` over `C:\Users\User\AppData\Local\ty`.
-                    cache_dir.join("cache")
-                } else {
-                    cache_dir
-                }
-            })
-            .and_then(|path| SystemPathBuf::from_path_buf(path).ok())
-            .unwrap_or_else(|| SystemPathBuf::from(".ty_cache"));
-
-        Some(cache_dir)
-    }
-
-    // TODO: Remove this feature gating once `ruff_wasm` no longer indirectly depends on `ruff_db` with the
-    //   `os` feature enabled (via `ruff_workspace` -> `ruff_graph` -> `ruff_db`).
-    #[cfg(target_arch = "wasm32")]
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        None
-    }
-
    /// Creates a builder to recursively walk `path`.
    ///
    /// The walker ignores files according to [`ignore::WalkBuilder::standard_filters`]
@@ -225,10 +192,6 @@ impl System for OsSystem {
        })
    }

-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
    fn as_any(&self) -> &dyn Any {
        self
    }
@@ -347,10 +310,6 @@ impl OsSystem {
 }

 impl WritableSystem for OsSystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        std::fs::File::create_new(path).map(drop)
-    }
-
    fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
        std::fs::write(path.as_std_path(), content)
    }
--- a/crates/ruff_db/src/system/path.rs
+++ b/crates/ruff_db/src/system/path.rs
@@ -503,12 +503,6 @@ impl ToOwned for SystemPath {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct SystemPathBuf(#[cfg_attr(feature = "schemars", schemars(with = "String"))] Utf8PathBuf);

-impl get_size2::GetSize for SystemPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
-    }
-}
-
 impl SystemPathBuf {
    pub fn new() -> Self {
        Self(Utf8PathBuf::new())
--- a/crates/ruff_db/src/system/test.rs
+++ b/crates/ruff_db/src/system/test.rs
@@ -102,10 +102,6 @@ impl System for TestSystem {
        self.system().user_config_directory()
    }

-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        self.system().cache_dir()
-    }
-
    fn read_directory<'a>(
        &'a self,
        path: &SystemPath,
@@ -127,10 +123,6 @@ impl System for TestSystem {
        self.system().glob(pattern)
    }

-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
    fn as_any(&self) -> &dyn std::any::Any {
        self
    }
@@ -157,10 +149,6 @@ impl Default for TestSystem {
 }

 impl WritableSystem for TestSystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        self.system().create_new_file(path)
-    }
-
    fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
        self.system().write_file(path, content)
    }
@@ -347,10 +335,6 @@ impl System for InMemorySystem {
        self.user_config_directory.lock().unwrap().clone()
    }

-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        None
-    }
-
    fn read_directory<'a>(
        &'a self,
        path: &SystemPath,
@@ -373,10 +357,6 @@ impl System for InMemorySystem {
        Ok(Box::new(iterator))
    }

-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
    fn as_any(&self) -> &dyn std::any::Any {
        self
    }
@@ -397,10 +377,6 @@ impl System for InMemorySystem {
 }

 impl WritableSystem for InMemorySystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        self.memory_fs.create_new_file(path)
-    }
-
    fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
        self.memory_fs.write_file(path, content)
    }
--- a/crates/ruff_db/src/system/walk_directory.rs
+++ b/crates/ruff_db/src/system/walk_directory.rs
@@ -212,7 +212,7 @@ impl Display for Error {
                path: Some(path),
                err,
            } => {
-                write!(f, "IO error for operation on {path}: {err}")
+                write!(f, "IO error for operation on {}: {}", path, err)
            }
            ErrorKind::Io { path: None, err } => err.fmt(f),
            ErrorKind::NonUtf8Path { path } => {
--- a/crates/ruff_db/src/vendored.rs
+++ b/crates/ruff_db/src/vendored.rs
@@ -4,12 +4,12 @@ use std::fmt::{self, Debug};
 use std::io::{self, Read, Write};
 use std::sync::{Arc, Mutex, MutexGuard};

+use crate::file_revision::FileRevision;
 use zip::result::ZipResult;
 use zip::write::FileOptions;
 use zip::{CompressionMethod, ZipArchive, ZipWriter, read::ZipFile};

 pub use self::path::{VendoredPath, VendoredPathBuf};
-use crate::file_revision::FileRevision;

 mod path;

--- a/crates/ruff_db/src/vendored/path.rs
+++ b/crates/ruff_db/src/vendored/path.rs
@@ -87,12 +87,6 @@ impl ToOwned for VendoredPath {
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub struct VendoredPathBuf(Utf8PathBuf);

-impl get_size2::GetSize for VendoredPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
-    }
-}
-
 impl Default for VendoredPathBuf {
    fn default() -> Self {
        Self::new()
--- a/crates/ruff_dev/src/generate_ty_options.rs
+++ b/crates/ruff_dev/src/generate_ty_options.rs
@@ -114,7 +114,6 @@ fn generate_set(output: &mut String, set: Set, parents: &mut Vec<Set>) {
    parents.pop();
 }

-#[derive(Debug)]
 enum Set {
    Toplevel(OptionSet),
    Named { name: String, set: OptionSet },
@@ -137,7 +136,7 @@ impl Set {
 }

 fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[Set]) {
-    let header_level = "#".repeat(parents.len() + 1);
+    let header_level = if parents.is_empty() { "###" } else { "####" };

    let _ = writeln!(output, "{header_level} `{name}`");

--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -73,20 +73,12 @@ fn generate_markdown() -> String {
    for lint in lints {
        let _ = writeln!(&mut output, "## `{rule_name}`\n", rule_name = lint.name());

-        // Reformat headers as bold text
-        let mut in_code_fence = false;
+        // Increase the header-level by one
        let documentation = lint
            .documentation_lines()
            .map(|line| {
-                // Toggle the code fence state if we encounter a boundary
-                if line.starts_with("```") {
-                    in_code_fence = !in_code_fence;
-                }
-                if !in_code_fence && line.starts_with('#') {
-                    Cow::Owned(format!(
-                        "**{line}**\n",
-                        line = line.trim_start_matches('#').trim_start()
-                    ))
+                if line.starts_with('#') {
+                    Cow::Owned(format!("#{line}"))
                } else {
                    Cow::Borrowed(line)
                }
@@ -95,15 +87,21 @@ fn generate_markdown() -> String {

        let _ = writeln!(
            &mut output,
-            r#"<small>
-Default level: [`{level}`](../rules.md#rule-levels "This lint has a default level of '{level}'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/{file}#L{line})
-</small>
+            r#"**Default level**: {level}
+
+<details>
+<summary>{summary}</summary>

 {documentation}
+
+### Links
+* [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name})
+* [View source](https://github.com/astral-sh/ruff/blob/main/{file}#L{line})
+</details>
 "#,
            level = lint.default_level(),
+            // GitHub doesn't support markdown in `summary` headers
+            summary = replace_inline_code(lint.summary()),
            encoded_name = url::form_urlencoded::byte_serialize(lint.name().as_str().as_bytes())
                .collect::<String>(),
            file = url::form_urlencoded::byte_serialize(lint.file().replace('\\', "/").as_bytes())
@@ -115,6 +113,25 @@ Default level: [`{level}`](../rules.md#rule-levels "This lint has a default leve
    output
 }

+/// Replaces inline code blocks (`code`) with `<code>code</code>`
+fn replace_inline_code(input: &str) -> String {
+    let mut output = String::new();
+    let mut parts = input.split('`');
+
+    while let Some(before) = parts.next() {
+        if let Some(between) = parts.next() {
+            output.push_str(before);
+            output.push_str("<code>");
+            output.push_str(between);
+            output.push_str("</code>");
+        } else {
+            output.push_str(before);
+        }
+    }
+
+    output
+}
+
 #[cfg(test)]
 mod tests {
    use anyhow::Result;
--- a/crates/ruff_diagnostics/Cargo.toml
+++ b/crates/ruff_diagnostics/Cargo.toml
@@ -16,6 +16,5 @@ doctest = false
 [dependencies]
 ruff_text_size = { workspace = true }

-get-size2 = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
--- a/crates/ruff_diagnostics/src/edit.rs
+++ b/crates/ruff_diagnostics/src/edit.rs
@@ -7,7 +7,7 @@ use ruff_text_size::{Ranged, TextRange, TextSize};

 /// A text edit to be applied to a source file. Inserts, deletes, or replaces
 /// content at a given location.
-#[derive(Clone, Debug, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Edit {
    /// The start location of the edit.
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -6,9 +6,7 @@ use ruff_text_size::{Ranged, TextSize};
 use crate::edit::Edit;

 /// Indicates if a fix can be applied.
-#[derive(
-    Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, is_macro::Is, get_size2::GetSize,
-)]
+#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, is_macro::Is)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
 pub enum Applicability {
@@ -32,7 +30,7 @@ pub enum Applicability {
 }

 /// Indicates the level of isolation required to apply a fix.
-#[derive(Default, Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, get_size2::GetSize)]
+#[derive(Default, Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum IsolationLevel {
    /// The fix should be applied as long as no other fixes in the same group have been applied.
@@ -43,7 +41,7 @@ pub enum IsolationLevel {
 }

 /// A collection of [`Edit`] elements to be applied to a source file.
-#[derive(Debug, PartialEq, Eq, Clone, get_size2::GetSize)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Fix {
    /// The [`Edit`] elements to be applied, sorted by [`Edit::start`] in ascending order.
--- a/crates/ruff_graph/src/db.rs
+++ b/crates/ruff_graph/src/db.rs
@@ -1,15 +1,15 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use std::sync::Arc;
 use zip::CompressionMethod;

-use ruff_db::Db as SourceDb;
 use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
+use ruff_db::{Db as SourceDb, Upcast};
 use ruff_python_ast::PythonVersion;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    Db, Program, ProgramSettings, PythonPath, PythonPlatform, PythonVersionSource,
    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };

@@ -35,37 +35,38 @@ impl ModuleDb {
        python_version: PythonVersion,
        venv_path: Option<SystemPathBuf>,
    ) -> Result<Self> {
-        let db = Self::default();
        let mut search_paths = SearchPathSettings::new(src_roots);
-        // TODO: Consider calling `PythonEnvironment::discover` if the `venv_path` is not provided.
        if let Some(venv_path) = venv_path {
-            let environment =
-                PythonEnvironment::new(venv_path, SysPrefixPathOrigin::PythonCliFlag, db.system())?;
-            search_paths.site_packages_paths = environment
-                .site_packages_paths(db.system())
-                .context("Failed to discover the site-packages directory")?
-                .into_vec();
+            search_paths.python_path =
+                PythonPath::sys_prefix(venv_path, SysPrefixPathOrigin::PythonCliFlag);
        }
-        let search_paths = search_paths
-            .to_search_paths(db.system(), db.vendored())
-            .context("Invalid search path settings")?;

+        let db = Self::default();
        Program::from_settings(
            &db,
            ProgramSettings {
-                python_version: PythonVersionWithSource {
+                python_version: Some(PythonVersionWithSource {
                    version: python_version,
                    source: PythonVersionSource::default(),
-                },
+                }),
                python_platform: PythonPlatform::default(),
                search_paths,
            },
-        );
+        )?;

        Ok(db)
    }
 }

+impl Upcast<dyn SourceDb> for ModuleDb {
+    fn upcast(&self) -> &(dyn SourceDb + 'static) {
+        self
+    }
+    fn upcast_mut(&mut self) -> &mut (dyn SourceDb + 'static) {
+        self
+    }
+}
+
 #[salsa::db]
 impl SourceDb for ModuleDb {
    fn vendored(&self) -> &VendoredFileSystem {
--- a/crates/ruff_graph/src/settings.rs
+++ b/crates/ruff_graph/src/settings.rs
@@ -36,20 +36,14 @@ impl fmt::Display for AnalyzeSettings {
 }

 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, CacheKey)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize),
-    serde(rename_all = "kebab-case")
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 pub enum Direction {
    /// Construct a map from module to its dependencies (i.e., the modules that it imports).
    #[default]
-    #[cfg_attr(feature = "serde", serde(alias = "Dependencies"))]
    Dependencies,
    /// Construct a map from module to its dependents (i.e., the modules that import it).
-    #[cfg_attr(feature = "serde", serde(alias = "Dependents"))]
    Dependents,
 }

--- a/crates/ruff_index/Cargo.toml
+++ b/crates/ruff_index/Cargo.toml
@@ -14,7 +14,6 @@ license = { workspace = true }
 doctest = false

 [dependencies]
-get-size2 = { workspace = true }
 ruff_macros = { workspace = true }
 salsa = { workspace = true, optional = true }

--- a/crates/ruff_index/src/vec.rs
+++ b/crates/ruff_index/src/vec.rs
@@ -6,7 +6,7 @@ use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut, RangeBounds};

 /// An owned sequence of `T` indexed by `I`
-#[derive(Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 #[repr(transparent)]
 pub struct IndexVec<I, T> {
    pub raw: Vec<T>,
@@ -191,6 +191,6 @@ where
    #[expect(unsafe_code)]
    unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool {
        let old_vec: &mut IndexVec<I, T> = unsafe { &mut *old_pointer };
-        unsafe { salsa::Update::maybe_update(&raw mut old_vec.raw, new_value.raw) }
+        unsafe { salsa::Update::maybe_update(&mut old_vec.raw, new_value.raw) }
    }
 }
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.2"
+version = "0.12.0"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -15,7 +15,7 @@ license = { workspace = true }
 [dependencies]
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true }
-ruff_db = { workspace = true, features = ["serde"] }
+ruff_db = { workspace = true }
 ruff_diagnostics = { workspace = true, features = ["serde"] }
 ruff_notebook = { workspace = true }
 ruff_macros = { workspace = true }
@@ -38,7 +38,6 @@ colored = { workspace = true }
 fern = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
-hashbrown = { workspace = true }
 imperative = { workspace = true }
 is-macro = { workspace = true }
 is-wsl = { workspace = true }
--- a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC115.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC115.py
@@ -165,15 +165,3 @@ async def test_trio_async115_helpers():

    await trio.sleep(seconds=0)  # ASYNC115
    await trio.sleep(delay=0)  # OK
-
-# https://github.com/astral-sh/ruff/issues/18740
-# The autofix for this is unsafe due to the comments.
-async def func():
-    import trio
-
-    await (
-    trio # comment
-    .sleep( # comment
-    0 # comment
-    )
-    )
--- a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC116.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC116.py
@@ -128,11 +128,3 @@ async def test_trio_async116_helpers():

    await trio.sleep(seconds=86401)  # ASYNC116
    await trio.sleep(delay=86401)  # OK
-
-
-async def _():
-    import trio
-    from trio import sleep
-
-    await sleep(18446744073709551616)
-    await trio.sleep(99999999999999999999)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B004.py
@@ -29,13 +29,3 @@ def this_is_fine():
    o = object()
    if callable(o):
        print("Ooh, this is actually callable.")
-
-# https://github.com/astral-sh/ruff/issues/18741
-# The autofix for this is unsafe due to the comments.
-hasattr(
-    # comment 1
-    obj,  # comment 2
-    # comment 3
-    "__call__",  # comment 4
-    # comment 5
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C401.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C401.py
@@ -36,19 +36,9 @@ set(
    # some more
 )

-# t-strings
-print(t"Hello {set(f(a) for a in 'abc')} World")
-print(t"Hello { set(f(a) for a in 'abc') } World")
-small_nums = t"{set(a if a < 6 else 0 for a in range(3))}"
-print(t"Hello {set(a for a in range(3))} World")
-print(t"{set(a for a in 'abc') - set(a for a in 'ab')}")
-print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-
-
 # Not built-in set.
 def set(*args, **kwargs):
    return None

 set(2 * x for x in range(3))
 set(x for x in range(3))
-
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C403.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C403.py
@@ -34,16 +34,4 @@ s = set( # outer set comment
 ))))

 # Test trailing comma case
-s = set([x for x in range(3)],)
-
-s = t"{set([x for x in 'ab'])}"
-s = t'{set([x for x in "ab"])}'
-
-def f(x):
-    return x
-
-s = t"{set([f(x) for x in 'ab'])}"
-
-s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-
+s = set([x for x in range(3)],)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C405.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C405.py
@@ -24,12 +24,3 @@ f"{set(['a', 'b']) - set(['a'])}"
 f"{ set(['a', 'b']) - set(['a']) }"
 f"a {set(['a', 'b']) - set(['a'])} b"
 f"a { set(['a', 'b']) - set(['a']) } b"
-
-t"{set([1,2,3])}"
-t"{set(['a', 'b'])}"
-t'{set(["a", "b"])}'
-
-t"{set(['a', 'b']) - set(['a'])}"
-t"{ set(['a', 'b']) - set(['a']) }"
-t"a {set(['a', 'b']) - set(['a'])} b"
-t"a { set(['a', 'b']) - set(['a']) } b"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C408.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C408.py
@@ -27,13 +27,3 @@ dict(

 tuple(  # comment
 )
-
-t"{dict(x='y')}"
-t'{dict(x="y")}'
-t"{dict()}"
-t"a {dict()} b"
-
-t"{dict(x='y') | dict(y='z')}"
-t"{ dict(x='y') | dict(y='z') }"
-t"a {dict(x='y') | dict(y='z')} b"
-t"a { dict(x='y') | dict(y='z') } b"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py
@@ -70,8 +70,3 @@ list(map(lambda: 1, "xyz"))
 list(map(lambda x, y: x, [(1, 2), (3, 4)]))
 list(map(lambda: 1, "xyz"))
 list(map(lambda x, y: x, [(1, 2), (3, 4)]))
-
-# When inside t-string, then the fix should be surrounded by whitespace
-_ = t"{set(map(lambda x: x % 2 == 0, nums))}"
-_ = t"{dict(map(lambda v: (v, v**2), nums))}"
-
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420.py
@@ -90,14 +90,3 @@ def func():

 def func():
    {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]}  # OK
-
-# https://github.com/astral-sh/ruff/issues/18764
-{ # 1
-a # 2
-: # 3
-None # 4
-for # 5
-a # 6
-in # 7
-iterable # 8
-} # 9
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420_2.py
@@ -1,5 +0,0 @@
-foo or{x: None for x in bar}
-
-
-# C420 fix must make sure to insert a leading space if needed,
-# See https://github.com/astral-sh/ruff/issues/18599
--- a/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM101_byte_string.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM101_byte_string.py
@@ -1,6 +0,0 @@
-def f_byte():
-    raise RuntimeError(b"This is an example exception")
-
-
-def f_byte_empty():
-    raise RuntimeError(b"")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uv_tool.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uv_tool.py
@@ -1,2 +0,0 @@
-#!/usr/bin/env -S uv tool run ruff check --isolated --select EXE003
-print("hello world")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uvx.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uvx.py
@@ -1,2 +0,0 @@
-#!/usr/bin/env -S uvx ruff check --isolated --select EXE003
-print("hello world")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging/LOG014_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging/LOG014_0.py
@@ -32,12 +32,6 @@ except ...:

 ### No errors

-logging.info("", exc_info=ValueError())
-logger.info("", exc_info=ValueError())
-
-logging.info("", exc_info=(exc_type, exc_value, exc_traceback))
-logger.info("", exc_info=(exc_type, exc_value, exc_traceback))
-
 logging.info("", exc_info=a)
 logger.info("", exc_info=a)

--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE808.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE808.py
@@ -14,6 +14,3 @@ range(0, 10, 1)
 range(0, 10, step=1)
 range(start=0, stop=10)
 range(0, stop=10)
-
-# regression test for https://github.com/astral-sh/ruff/pull/18805
-range((0), 42)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.py
@@ -119,26 +119,4 @@ field35: "int | str | int"  # Error
 # Technically, this falls into the domain of the rule but it is an unlikely edge case,
 # only works if you have from `__future__ import annotations` at the top of the file,
 # and stringified annotations are discouraged in stub files.
-field36: "int | str" | int  # Ok
-
-# https://github.com/astral-sh/ruff/issues/18546
-# Expand Optional[T] to Union[T, None]
-# OK
-field37: typing.Optional[int]
-field38: typing.Union[int, None]
-# equivalent to None
-field39: typing.Optional[None]
-# equivalent to int | None
-field40: typing.Union[typing.Optional[int], None]
-field41: typing.Optional[typing.Union[int, None]]
-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-field43: typing.Optional[int] | None
-field44: typing.Optional[int | None]
-field45: typing.Optional[int] | typing.Optional[int]
-# equivalent to int | dict | None
-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-field47: typing.Optional[int] | typing.Optional[dict]
-
-# avoid reporting twice
-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-field49: typing.Optional[complex | complex] | complex
+field36: "int | str" | int  # Ok
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.pyi
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.pyi
@@ -111,25 +111,3 @@ field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error

 # Test case for mixed union type
 field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-
-# https://github.com/astral-sh/ruff/issues/18546
-# Expand Optional[T] to Union[T, None]
-# OK
-field37: typing.Optional[int]
-field38: typing.Union[int, None]
-# equivalent to None
-field39: typing.Optional[None]
-# equivalent to int | None
-field40: typing.Union[typing.Optional[int], None]
-field41: typing.Optional[typing.Union[int, None]]
-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-field43: typing.Optional[int] | None
-field44: typing.Optional[int | None]
-field45: typing.Optional[int] | typing.Optional[int]
-# equivalent to int | dict | None
-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-field47: typing.Optional[int] | typing.Optional[dict]
-
-# avoid reporting twice
-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-field49: typing.Optional[complex | complex] | complex
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_1.py
@@ -1,5 +1,4 @@
 from typing import (
-    TYPE_CHECKING,
    Union,
 )

@@ -91,22 +90,3 @@ class Foo:

    def bad5(self, arg: int | (float | complex)) -> None: 
        ...
-
-
-# https://github.com/astral-sh/ruff/issues/18298
-# fix must not yield runtime `None | None | ...` (TypeError)
-class Issue18298:
-    def f1(self, arg: None | int | None | float = None) -> None:  # PYI041 - no fix
-        pass
-
-    if TYPE_CHECKING:
-
-        def f2(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
-
-    else:
-
-        def f2(self, arg=None) -> None:
-            pass
-
-    def f3(self, arg: None | float | None | int | None = None) -> None:  # PYI041 - with fix
-        pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_1.pyi
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_1.pyi
@@ -70,11 +70,3 @@ class Foo:
    def bad4(self, arg: Union[float | complex, int]) -> None: ...  # PYI041

    def bad5(self, arg: int | (float | complex)) -> None: ...  # PYI041
-
-
-# https://github.com/astral-sh/ruff/issues/18298
-# fix must not yield runtime `None | None | ...` (TypeError)
-class Issue18298:
-    def f1(self, arg: None | int | None | float = None) -> None: ...  # PYI041 - with fix
-
-    def f3(self, arg: None | float | None | int | None = None) -> None: ...  # PYI041 - with fix
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI041_2.py
@@ -1,8 +0,0 @@
-from __future__ import annotations
-
-
-# https://github.com/astral-sh/ruff/issues/18298
-# fix must not yield runtime `None | None | ...` (TypeError)
-class Issue18298:
-    def f1(self, arg: None | int | None | float = None) -> None:
-        pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT001.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT001.py
@@ -76,20 +76,3 @@ def aliased_parentheses_with_params():
 )
 def aliased_parentheses_no_params_multiline():
    return 42
-
-# https://github.com/astral-sh/ruff/issues/18770
-@pytest.fixture(
-    # TODO: use module scope
-    # scope="module"
-)
-def my_fixture(): ...
-
-
-@(pytest.fixture())
-def outer_paren_fixture_no_params():
-    return 42
-
-
-@(fixture())
-def outer_paren_imported_fixture_no_params():
-    return 42
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT023.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT023.py
@@ -1,8 +1,3 @@
-@pytest.mark.foo(scope="module")
-def ok_due_to_missing_import():
-    pass
-
-
 import pytest


@@ -77,25 +72,3 @@ class TestClass:
        @pytest.mark.foo()
        def test_something():
            pass
-
-# https://github.com/astral-sh/ruff/issues/18770
-@pytest.mark.parametrize(
-    # TODO: fix later
-    # ("param1", "param2"),
-    # (
-    #     (1, 2),
-    #     (3, 4),
-    # ),
-)
-def test_bar(param1, param2): ...
-
-
-@(pytest.mark.foo())
-def test_outer_paren_mark_function():
-    pass
-
-
-class TestClass:
-    @(pytest.mark.foo())
-    def test_method_outer_paren():
-        pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_raise/RSE102.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_raise/RSE102.py
@@ -105,8 +105,3 @@ if future.exception():
 future = executor.submit(float, "a")
 if future.exception():
    raise future.Exception()
-
-
-raise TypeError(
-    # comment
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_return/RET501.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_return/RET501.py
@@ -49,13 +49,3 @@ class Baz:
    def prop4(self) -> None:
        print("I've run out of things to say")
        return None
-
-
-# https://github.com/astral-sh/ruff/issues/18774
-class _:
-    def foo(bar):
-        if not bar:
-            return
-        return (
-            None # comment
-        )
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM105_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM105_0.py
@@ -128,16 +128,3 @@ def write_models(directory, Models):
        pass; \
            \
            #
-
-# Regression tests for: https://github.com/astral-sh/ruff/issues/18209
-try:
-    1 / 0
-except ():
-    pass
-
-
-BaseException = ValueError
-try:
-    int("a")
-except BaseException:
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM910.py
@@ -49,9 +49,3 @@ def foo(some_other: object):
 # OK
 def foo(some_other):
    a = some_other.get('a', None)
-
-
-# https://github.com/astral-sh/ruff/issues/18777
-def foo():
-    dict = {"Tom": 23, "Maria": 23, "Dog": 11}
-    age = dict.get("Cat", None)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py
@@ -23,14 +23,3 @@ for k, v in zip(d2.keys(), d2.values()):  # SIM911
 items = zip(x.keys(), x.values())  # OK

 items.bar = zip(x.keys(), x.values())  # OK
-
-# https://github.com/astral-sh/ruff/issues/18777
-def foo():
-    dict = {}
-    for country, stars in zip(dict.keys(), dict.values()):
-        ...
-
-
-# https://github.com/astral-sh/ruff/issues/18776
-flag_stars = {}
-for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202.py
@@ -2,81 +2,13 @@ import os.path
 from pathlib import Path
 from os.path import getsize

-filename = "filename"
-filename1 = __file__
-filename2 = Path("filename")
-

 os.path.getsize("filename")
 os.path.getsize(b"filename")
 os.path.getsize(Path("filename"))
 os.path.getsize(__file__)

-os.path.getsize(filename)
-os.path.getsize(filename1)
-os.path.getsize(filename2)
-
-os.path.getsize(filename="filename")
-os.path.getsize(filename=b"filename")
-os.path.getsize(filename=Path("filename"))
-os.path.getsize(filename=__file__)
-
 getsize("filename")
 getsize(b"filename")
 getsize(Path("filename"))
 getsize(__file__)
-
-getsize(filename="filename")
-getsize(filename=b"filename")
-getsize(filename=Path("filename"))
-getsize(filename=__file__)
-
-getsize(filename)
-getsize(filename1)
-getsize(filename2)
-
-
-os.path.getsize(
-    "filename", # comment
-)
-
-os.path.getsize(
-    # comment
-    "filename"
-    ,
-    # comment
-)
-
-os.path.getsize(
-    # comment
-    b"filename"
-    # comment
-)
-
-os.path.getsize( # comment
-    Path(__file__)
-    # comment
-) # comment
-
-getsize( # comment
-    "filename")
-
-getsize( # comment
-    b"filename",
-    #comment
-)
-
-os.path.getsize("file" + "name")
-
-getsize \
-\
-\
-        ( # comment
-    "filename",
-    )
-
-getsize(Path("filename").resolve())
-
-import pathlib
-
-os.path.getsize(pathlib.Path("filename"))
--- a/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202_2.py
@@ -1,5 +0,0 @@
-import os
-
-os.path.getsize(filename="filename")
-os.path.getsize(filename=b"filename")
-os.path.getsize(filename=__file__)
--- a/crates/ruff_linter/resources/test/fixtures/perflint/PERF101.py
+++ b/crates/ruff_linter/resources/test/fixtures/perflint/PERF101.py
@@ -85,19 +85,3 @@ import builtins

 for i in builtins.list(nested_tuple):  # PERF101
    pass
-
-# https://github.com/astral-sh/ruff/issues/18783
-items = (1, 2, 3)
-for i in(list)(items):
-    print(i)
-
-# https://github.com/astral-sh/ruff/issues/18784
-items = (1, 2, 3)
-for i in (  # 1
-    list  # 2
-    # 3
-)(  # 4
-    items  # 5
-    # 6
-):
-    print(i)
--- a/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py
+++ b/crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py
@@ -163,32 +163,4 @@ def foo():

    for k, v in src:
        if lambda: 0:
-            dst[k] = v
-
-# https://github.com/astral-sh/ruff/issues/18859
-def foo():
-    v = {}
-    for o,(x,)in():
-        v[x,]=o
-
-
-# https://github.com/astral-sh/ruff/issues/19005
-def issue_19005_1():
-    c = {}
-    a = object()
-    for a.b in ():
-        c[a.b] = a.b
-
-
-def issue_19005_2():
-    a = object()
-    c = {}
-    for a.k, a.v in ():
-        c[a.k] = a.v
-
-
-def issue_19005_3():
-    a = [None, None]
-    c = {}
-    for a[0], a[1] in ():
-        c[a[0]] = a[1]
+            dst[k] = v
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D413.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D413.py
@@ -69,11 +69,3 @@ def func():
    Returns:
        the value
        """
-
-
-def func():
-    ("""Docstring.
-
-    Raises:
-        ValueError: An error.
-    """)
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F504.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F504.py
@@ -14,6 +14,3 @@ hidden = {"a": "!"}
 "" % {
  'test1': '',
  'test2': '',
-}
-
-# https://github.com/astral-sh/ruff/issues/18806
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F522.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F522.py
@@ -4,11 +4,3 @@
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
 (''
 .format(x=2))  # F522
-
-# https://github.com/astral-sh/ruff/issues/18806
-# The fix here is unsafe because the unused argument has side effect
-"Hello, {name}".format(greeting=print(1), name="World")
-
-# The fix here is safe because the unused argument has no side effect,
-# even though the used argument has a side effect
-"Hello, {name}".format(greeting="Pikachu", name=print(1))
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F523.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F523.py
@@ -35,11 +35,3 @@
 # Removing the final argument.
 "Hello".format("world")
 "Hello".format("world", key="value")
-
-# https://github.com/astral-sh/ruff/issues/18806
-# The fix here is unsafe because the unused argument has side effect
-"Hello, {0}".format("world", print(1))
-
-# The fix here is safe because the unused argument has no side effect,
-# even though the used argument has a side effect
-"Hello, {0}".format(print(1), "Pikachu")
--- a/crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH005_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH005_0.py
@@ -1,5 +1,3 @@
-# Mock objects
-# ============
 # Errors
 assert my_mock.not_called()
 assert my_mock.called_once_with()
@@ -19,25 +17,3 @@ my_mock.assert_called()
 my_mock.assert_called_once_with()
 """like :meth:`Mock.assert_called_once_with`"""
 """like :meth:`MagicMock.assert_called_once_with`"""
-
-# AsyncMock objects
-# =================
-# Errors
-assert my_mock.not_awaited()
-assert my_mock.awaited_once_with()
-assert my_mock.not_awaited
-assert my_mock.awaited_once_with
-my_mock.assert_not_awaited
-my_mock.assert_awaited
-my_mock.assert_awaited_once_with
-my_mock.assert_awaited_once_with
-MyMock.assert_awaited_once_with
-assert my_mock.awaited
-
-# OK
-assert my_mock.await_count == 1
-my_mock.assert_not_awaited()
-my_mock.assert_awaited()
-my_mock.assert_awaited_once_with()
-"""like :meth:`Mock.assert_awaited_once_with`"""
-"""like :meth:`MagicMock.assert_awaited_once_with`"""
--- a/crates/ruff_linter/resources/test/fixtures/pylint/duplicate_bases.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/duplicate_bases.py
@@ -70,9 +70,3 @@ class D(C):

 class E(A, C):
    ...
-
-# https://github.com/astral-sh/ruff/issues/18814
-class Bar(Foo,  # 1
-    Foo  # 2
-):
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/pylint/import_aliasing_2/init.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/import_aliasing_2/init.py
@@ -1,4 +0,0 @@
-import collections as collections
-from collections import OrderedDict as OrderedDict
-from . import foo as foo
-from .foo import bar as bar
--- a/crates/ruff_linter/resources/test/fixtures/pylint/invalid_characters.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/invalid_characters.py
--- a/crates/ruff_linter/resources/test/fixtures/pylint/len_as_condition.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/len_as_condition.py
@@ -168,7 +168,7 @@ def github_issue_1879():
    def function_returning_function(r):
        return function_returning_generator(r)

-    assert len(function_returning_list(z))  # [PLC1802] differs from pylint
+    assert len(function_returning_list(z))  # [PLC1802] differs from pylint 
    assert len(function_returning_int(z))
    # This should raise a PLC1802 once astroid can infer it
    # See https://github.com/pylint-dev/pylint/pull/3821#issuecomment-743771514
@@ -196,7 +196,7 @@ def f(cond:bool):
 def g(cond:bool):
    x = [1,2,3]
    if cond:
-        x = [4,5,6]
+        x = [4,5,6] 
    if len(x): # this should be addressed
        print(x)
    del x
@@ -236,15 +236,3 @@ def j():
 # regression tests for https://github.com/astral-sh/ruff/issues/14690
 bool(len(ascii(1)))
 bool(len(sorted("")))
-
-# regression tests for https://github.com/astral-sh/ruff/issues/18811
-fruits = []
-if(len)(fruits):
-    ...
-
-# regression tests for https://github.com/astral-sh/ruff/issues/18812
-fruits = []
-if len(
-    fruits  # comment
-):
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/pylint/nan_comparison.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/nan_comparison.py
@@ -92,8 +92,3 @@ if y == np.inf:
 # OK
 if x == "nan":
    pass
-
-# PLW0117
-# https://github.com/astral-sh/ruff/issues/18596
-assert x == float("-NaN ")
-assert x == float(" \n+nan   \t")
--- a/crates/ruff_linter/resources/test/fixtures/pylint/nested_min_max.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/nested_min_max.py
@@ -14,7 +14,7 @@ min(1, min(2, 3, key=test))
 # This will still trigger, to merge the calls without keyword args.
 min(1, min(2, 3, key=test), min(4, 5))

-# The fix is already unsafe, so deleting comments is okay.
+# Don't provide a fix if there are comments within the call.
 min(
    1,  # This is a comment.
    min(2, 3),
@@ -55,8 +55,3 @@ max_word_len = max(
    *(len(word) for word in "blah blah blah".split(" ")),
    len("Done!"),
 )
-
-
-# Outer call has a single argument, inner call has multiple arguments; should not trigger.
-min(min([2, 3], [4, 1]))
-max(max([2, 4], [3, 1]))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibraheem Ahmed	541b2096b6	wip	2025-06-19 21:58:29 -04:00
Ibraheem Ahmed	d1f16703ab	clear source texts	2025-06-18 23:10:17 -04:00