Create Definition for all place expressions

2025-06-24 11:09:54 +05:30
646 changed files with 14620 additions and 28304 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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        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@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -214,7 +214,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: |
          rustup component add clippy
@@ -234,17 +234,17 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -292,17 +292,17 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -321,11 +321,11 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -348,7 +348,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -377,7 +377,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -400,7 +400,7 @@ jobs:
        with:
          file: "Cargo.toml"
          field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        env:
          MSRV: ${{ steps.msrv.outputs.value }}
@@ -408,11 +408,11 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -432,7 +432,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: "fuzz -> target"
      - name: "Install Rust toolchain"
@@ -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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -494,7 +494,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -708,11 +708,11 @@ jobs:
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
        with:
          args: --out dist
      - name: "Test wheel"
@@ -731,8 +731,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
@@ -765,7 +765,7 @@ jobs:
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.13"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -804,7 +804,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Run checks"
@@ -874,7 +874,7 @@ jobs:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
@@ -905,14 +905,14 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0

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

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

@@ -938,14 +938,14 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0

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

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

--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,12 +34,12 @@ 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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
        # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -37,9 +37,9 @@ 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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: "ruff"

@@ -48,13 +48,45 @@ jobs:

      - name: Run mypy_primer
        shell: bash
-        env:
-          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
-          DIFF_FILE: mypy_primer.diff
        run: |
          cd ruff
-          scripts/mypy_primer.sh
-          echo ${{ github.event.number }} > ../pr-number
+
+          echo "Enabling mypy primer specific configuration overloads (see .github/mypy-primer-ty.toml)"
+          mkdir -p ~/.config/ty
+          cp .github/mypy-primer-ty.toml ~/.config/ty/ty.toml
+
+          PRIMER_SELECTOR="$(paste -s -d'|' crates/ty_python_semantic/resources/primer/good.txt)"
+
+          echo "new commit"
+          git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
+
+          MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
+          git checkout -b base_commit "$MERGE_BASE"
+          echo "base commit"
+          git rev-list --format=%s --max-count=1 base_commit
+
+          cd ..
+
+          echo "Project selector: $PRIMER_SELECTOR"
+          # Allow the exit code to be 0 or 1, only fail for actual mypy_primer crashes/bugs
+          uvx \
+            --from="git+https://github.com/hauntsaninja/mypy_primer@e5f55447969d33ae3c7ccdb183e2a37101867270" \
+            mypy_primer \
+            --repo ruff \
+            --type-checker ty \
+            --old base_commit \
+            --new "$GITHUB_SHA" \
+            --project-selector "/($PRIMER_SELECTOR)\$" \
+            --output concise \
+            --debug > mypy_primer.diff || [ $? -eq 1 ]
+
+          # Output diff with ANSI color codes
+          cat mypy_primer.diff
+
+          # Remove ANSI color codes before uploading
+          sed -ie 's/\x1b\[[0-9;]*m//g' mypy_primer.diff
+
+          echo ${{ github.event.number }} > pr-number

      - name: Upload diff
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -67,41 +99,3 @@ jobs:
        with:
          name: pr-number
          path: pr-number
-
-  memory_usage:
-    name: Run memory statistics
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Run mypy_primer
-        shell: bash
-        env:
-          TY_MAX_PARALLELISM: 1 # for deterministic memory numbers
-          TY_MEMORY_REPORT: mypy_primer
-          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/memory.txt
-          DIFF_FILE: mypy_primer_memory.diff
-        run: |
-          cd ruff
-          scripts/mypy_primer.sh
-
-      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: mypy_primer_memory_diff
-          path: mypy_primer_memory.diff
--- a/.github/workflows/mypy_primer_comment.yaml
+++ b/.github/workflows/mypy_primer_comment.yaml
@@ -45,28 +45,15 @@ jobs:
          if_no_artifact_found: ignore
          allow_forks: true

-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: "Download mypy_primer memory results"
-        id: download-mypy_primer_memory_diff
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: mypy_primer_memory_diff
-          workflow: mypy_primer.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/mypy_primer_memory_diff
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-          allow_forks: true
-
      - name: Generate comment content
        id: generate-comment
-        if: ${{ steps.download-mypy_primer_diff.outputs.found_artifact == 'true' && steps.download-mypy_primer_memory_diff.outputs.found_artifact == 'true' }}
+        if: steps.download-mypy_primer_diff.outputs.found_artifact == 'true'
        run: |
          # Guard against malicious mypy_primer results that symlink to a secret
          # file on this runner
-          if [[ -L pr/mypy_primer_diff/mypy_primer.diff ]] || [[ -L pr/mypy_primer_memory_diff/mypy_primer_memory.diff ]]
+          if [[ -L pr/mypy_primer_diff/mypy_primer.diff ]]
          then
-              echo "Error: mypy_primer.diff and mypy_primer_memory.diff cannot be a symlink"
+              echo "Error: mypy_primer.diff cannot be a symlink"
              exit 1
          fi

@@ -87,18 +74,6 @@ jobs:
            echo 'No ecosystem changes detected ✅' >> comment.txt
          fi

-          if [ -s "pr/mypy_primer_memory_diff/mypy_primer_memory.diff" ]; then
-            echo '<details>' >> comment.txt
-            echo '<summary>Memory usage changes were detected when running on open source projects</summary>' >> comment.txt
-            echo '' >> comment.txt
-            echo '```diff' >> comment.txt
-            cat pr/mypy_primer_memory_diff/mypy_primer_memory.diff >> comment.txt
-            echo '```' >> comment.txt
-            echo '</details>' >> comment.txt
-          else
-            echo 'No memory usage changes detected ✅' >> comment.txt
-          fi
-
          echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
          cat comment.txt >> "$GITHUB_OUTPUT"
          echo 'EOF' >> "$GITHUB_OUTPUT"
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -68,7 +68,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
--- 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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.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
@@ -32,9 +32,9 @@ 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@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: "ruff"

--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -67,7 +67,7 @@ repos:
          - black==25.1.0

  - repo: https://github.com/crate-ci/typos
-    rev: v1.34.0
+    rev: v1.33.1
    hooks:
      - id: typos

@@ -81,7 +81,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.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.11.0
+    rev: v1.9.0
    hooks:
      - id: zizmor

  - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
+    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"
@@ -591,7 +532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -600,7 +541,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -629,24 +570,12 @@ name = "console"
 version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
-dependencies = [
- "encode_unicode",
- "libc",
- "once_cell",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "console"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
 dependencies = [
 "encode_unicode",
 "libc",
 "once_cell",
 "unicode-width 0.2.1",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -879,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"
@@ -1012,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"
@@ -1031,7 +972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1149,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"
@@ -1482,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",
@@ -1493,14 +1411,14 @@ dependencies = [

 [[package]]
 name = "indicatif"
-version = "0.18.0"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a646d946d06bedbbc4cac4c218acf4bbf2d87757a784857025f4d447e4e1cd"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
- "console 0.16.0",
+ "console",
+ "number_prefix",
 "portable-atomic",
 "unicode-width 0.2.1",
- "unit-prefix",
 "vt100",
 "web-time",
 ]
@@ -1537,7 +1455,7 @@ version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
 dependencies = [
- "console 0.15.11",
+ "console",
 "globset",
 "once_cell",
 "pest",
@@ -1560,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"
@@ -1604,7 +1516,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi 0.5.1",
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1668,7 +1580,7 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1827,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",
@@ -1866,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"
@@ -2037,11 +1926,12 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"

 [[package]]
 name = "notify"
-version = "8.1.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
 "bitflags 2.9.1",
+ "filetime",
 "fsevent-sys",
 "inotify",
 "kqueue",
@@ -2050,7 +1940,7 @@ dependencies = [
 "mio",
 "notify-types",
 "walkdir",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -2088,6 +1978,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -2108,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",
@@ -2141,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"
@@ -2171,7 +2057,7 @@ dependencies = [
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]

 [[package]]
@@ -2452,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"
@@ -2539,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"
@@ -2729,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",
@@ -2851,7 +2703,6 @@ dependencies = [
 "dunce",
 "etcetera",
 "filetime",
- "get-size2",
 "glob",
 "ignore",
 "insta",
@@ -2859,7 +2710,6 @@ dependencies = [
 "path-slash",
 "ruff_annotate_snippets",
 "ruff_cache",
- "ruff_diagnostics",
 "ruff_notebook",
 "ruff_python_ast",
 "ruff_python_parser",
@@ -2924,7 +2774,6 @@ dependencies = [
 name = "ruff_diagnostics"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "is-macro",
 "ruff_text_size",
 "serde",
@@ -2969,7 +2818,6 @@ dependencies = [
 name = "ruff_index"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "ruff_macros",
 "salsa",
 "static_assertions",
@@ -2977,7 +2825,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.12.2"
+version = "0.12.0"
 dependencies = [
 "aho-corasick",
 "anyhow",
@@ -2987,7 +2835,6 @@ dependencies = [
 "fern",
 "glob",
 "globset",
- "hashbrown 0.15.4",
 "imperative",
 "insta",
 "is-macro",
@@ -3083,7 +2930,6 @@ dependencies = [
 "aho-corasick",
 "bitflags 2.9.1",
 "compact_str",
- "get-size2",
 "is-macro",
 "itertools 0.14.0",
 "memchr",
@@ -3183,7 +3029,6 @@ dependencies = [
 "bitflags 2.9.1",
 "bstr",
 "compact_str",
- "get-size2",
 "insta",
 "memchr",
 "ruff_annotate_snippets",
@@ -3201,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"
@@ -3263,7 +3118,6 @@ dependencies = [
 "lsp-server",
 "lsp-types",
 "regex",
- "ruff_db",
 "ruff_diagnostics",
 "ruff_formatter",
 "ruff_linter",
@@ -3291,7 +3145,6 @@ dependencies = [
 name = "ruff_source_file"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "memchr",
 "ruff_text_size",
 "serde",
@@ -3301,7 +3154,6 @@ dependencies = [
 name = "ruff_text_size"
 version = "0.0.0"
 dependencies = [
- "get-size2",
 "schemars",
 "serde",
 "serde_test",
@@ -3310,7 +3162,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.12.2"
+version = "0.12.0"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3412,7 +3264,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -3429,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",
@@ -3440,7 +3292,6 @@ dependencies = [
 "hashlink",
 "indexmap",
 "intrusive-collections",
- "papaya",
 "parking_lot",
 "portable-atomic",
 "rayon",
@@ -3454,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",
@@ -3513,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"
@@ -3608,9 +3449,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
 "serde",
 "serde_derive",
@@ -3619,9 +3460,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -3723,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"
@@ -3802,7 +3633,7 @@ dependencies = [
 "getrandom 0.3.3",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4061,9 +3892,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
 "once_cell",
 "valuable",
@@ -4082,9 +3913,9 @@ dependencies = [

 [[package]]
 name = "tracing-indicatif"
-version = "0.3.11"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c714cc8fc46db04fcfddbd274c6ef59bebb1b435155984e7c6e89c3ce66f200"
+checksum = "8201ca430e0cd893ef978226fd3516c06d9c494181c8bf4e5b32e30ed4b40aa1"
 dependencies = [
 "indicatif",
 "tracing",
@@ -4172,7 +4003,6 @@ dependencies = [
 name = "ty_ide"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.9.1",
 "insta",
 "ruff_db",
 "ruff_python_ast",
@@ -4194,7 +4024,6 @@ dependencies = [
 "camino",
 "colored 3.0.0",
 "crossbeam",
- "get-size2",
 "globset",
 "insta",
 "notify",
@@ -4234,7 +4063,6 @@ dependencies = [
 "countme",
 "dir-test",
 "drop_bomb",
- "get-size2",
 "glob",
 "hashbrown 0.15.4",
 "indexmap",
@@ -4296,7 +4124,6 @@ dependencies = [
 "ty_ide",
 "ty_project",
 "ty_python_semantic",
- "ty_vendored",
 ]

 [[package]]
@@ -4336,7 +4163,6 @@ version = "0.0.0"
 dependencies = [
 "path-slash",
 "ruff_db",
- "static_assertions",
 "walkdir",
 "zip",
 ]
@@ -4479,12 +4305,6 @@ dependencies = [
 "rand 0.8.5",
 ]

-[[package]]
-name = "unit-prefix"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817"
-
 [[package]]
 name = "unscanny"
 version = "0.1.0"
@@ -4777,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",
@@ -4817,7 +4638,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4891,7 +4712,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]

 [[package]]
@@ -4900,16 +4721,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets",
 ]

 [[package]]
@@ -4918,30 +4730,14 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]

 [[package]]
@@ -4950,96 +4746,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
 [[package]]
 name = "winnow"
 version = "0.7.10"
--- 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" }
@@ -98,7 +93,7 @@ ignore = { version = "0.4.22" }
 imara-diff = { version = "0.1.5" }
 imperative = { version = "1.0.4" }
 indexmap = { version = "2.6.0" }
-indicatif = { version = "0.18.0" }
+indicatif = { version = "0.17.8" }
 indoc = { version = "2.0.4" }
 insta = { version = "1.35.1" }
 insta-cmd = { version = "0.6.0" }
@@ -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"] }
@@ -167,7 +162,7 @@ tikv-jemallocator = { version = "0.6.0" }
 toml = { version = "0.8.11" }
 tracing = { version = "0.1.40" }
 tracing-flame = { version = "0.2.0" }
-tracing-indicatif = { version = "0.3.11" }
+tracing-indicatif = { version = "0.3.6" }
 tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.18", default-features = false, features = [
    "env-filter",
@@ -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))
@@ -506,7 +505,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Streamlit](https://github.com/streamlit/streamlit)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
- [Weblate](https://weblate.org/)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))
 - [ZenML](https://github.com/zenml-io/zenml)
 - [Zulip](https://github.com/zulip/zulip)
--- 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::OldDiagnostic;
 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;

@@ -349,7 +348,7 @@ impl FileCache {
                lint.messages
                    .iter()
                    .map(|msg| {
-                        create_lint_diagnostic(
+                        OldDiagnostic::lint(
                            &msg.body,
                            msg.suggestion.as_ref(),
                            msg.range,
@@ -429,11 +428,11 @@ pub(crate) struct LintCacheData {

 impl LintCacheData {
    pub(crate) fn from_diagnostics(
-        diagnostics: &[Diagnostic],
+        diagnostics: &[OldDiagnostic],
        notebook_index: Option<NotebookIndex>,
    ) -> Self {
        let source = if let Some(msg) = diagnostics.first() {
-            msg.expect_ruff_source_file().source_text().to_owned()
+            msg.source_file().source_text().to_owned()
        } else {
            String::new() // No messages, no need to keep the source!
        };
@@ -443,20 +442,20 @@ impl LintCacheData {
            // 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
            // errors anyway.
-            .filter_map(|msg| Some((msg.name().parse().ok()?, msg)))
+            .filter_map(|msg| Some((msg.noqa_code().and_then(|code| code.rule())?, msg)))
            .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(),
+                    diagnostics.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::OldDiagnostic;
    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.inner.iter().any(OldDiagnostic::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,10 @@ 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::package::PackageRoot;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -129,7 +129,7 @@ pub(crate) fn check(
                        SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();

                    Diagnostics::new(
-                        vec![diagnostic_from_violation(
+                        vec![OldDiagnostic::new(
                            IOError { message },
                            TextRange::default(),
                            &dummy,
--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -10,10 +10,11 @@ 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::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -25,20 +26,19 @@ 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) inner: Vec<OldDiagnostic>,
    pub(crate) fixed: FixMap,
    pub(crate) notebook_indexes: FxHashMap<String, NotebookIndex>,
 }

 impl Diagnostics {
    pub(crate) fn new(
-        diagnostics: Vec<Diagnostic>,
+        diagnostics: Vec<OldDiagnostic>,
        notebook_indexes: FxHashMap<String, NotebookIndex>,
    ) -> Self {
        Self {
@@ -62,7 +62,7 @@ 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(
+                        vec![OldDiagnostic::new(
                            IOError {
                                message: err.to_string(),
                            },
@@ -98,10 +98,10 @@ 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,
+                    vec![OldDiagnostic::syntax_error(
                        err,
                        TextRange::default(),
+                        dummy,
                    )],
                    FxHashMap::default(),
                )
--- 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, OldDiagnostic, 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,
@@ -303,11 +303,11 @@ impl Printer {
        let statistics: Vec<ExpandedStatistics> = diagnostics
            .inner
            .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>, &OldDiagnostic), 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 {
--- 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
@@ -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()
@@ -498,8 +406,11 @@ fn bench_project(benchmark: &ProjectBenchmark, criterion: &mut Criterion) {
        let diagnostics = result.len();

        assert!(
-            diagnostics <= max_diagnostics,
-            "Expected <={max_diagnostics} diagnostics but got {diagnostics}"
+            diagnostics > 1 && diagnostics <= max_diagnostics,
+            "Expected between {} and {} diagnostics but got {}",
+            1,
+            max_diagnostics,
+            diagnostics
        );
    }

@@ -567,30 +478,11 @@ fn anyio(criterion: &mut Criterion) {
    bench_project(&benchmark, criterion);
 }

-fn datetype(criterion: &mut Criterion) {
-    let benchmark = ProjectBenchmark::new(
-        RealWorldProject {
-            name: "DateType",
-            repository: "https://github.com/glyph/DateType",
-            commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
-            max_dep_date: "2025-07-04",
-            python_version: PythonVersion::PY313,
-        },
-        0,
-    );
-
-    bench_project(&benchmark, criterion);
-}
-
 criterion_group!(check_file, benchmark_cold, benchmark_incremental);
 criterion_group!(
    micro,
    benchmark_many_string_assignments,
    benchmark_many_tuple_assignments,
-    benchmark_complex_constrained_attributes_1,
-    benchmark_complex_constrained_attributes_2,
 );
-criterion_group!(project, anyio, attrs, hydra, datetype);
+criterion_group!(project, anyio, attrs, hydra);
 criterion_main!(check_file, micro, project);
--- 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()
@@ -242,7 +243,7 @@ fn large(bencher: Bencher, benchmark: &Benchmark) {
    run_single_threaded(bencher, benchmark);
 }

-#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=8)]
+#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=3)]
 fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
    let thread_pool = ThreadPoolBuilder::new().build().unwrap();

--- 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
@@ -637,22 +637,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())
@@ -724,6 +708,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};
@@ -2236,7 +2221,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();

@@ -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
@@ -11,7 +11,7 @@ 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]
 pub fn source_text(db: &dyn Db, file: File) -> SourceText {
    let path = file.path(db);
    let _span = tracing::trace_span!("source_text", file = %path).entered();
@@ -65,7 +65,7 @@ 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, Eq, PartialEq)]
 pub struct SourceText {
    inner: Arc<SourceTextInner>,
 }
@@ -123,9 +123,8 @@ impl std::fmt::Debug for SourceText {
    }
 }

-#[derive(Eq, PartialEq, get_size2::GetSize)]
+#[derive(Eq, PartialEq)]
 struct SourceTextInner {
-    #[get_size(ignore)]
    count: Count<SourceText>,
    kind: SourceTextKind,
    read_error: Option<SourceTextError>,
@@ -137,19 +136,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 +148,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,7 +157,7 @@ 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();

--- 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_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_bandit/S112.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S112.py
@@ -1,30 +1,29 @@
-for _ in []:
-    try:
-        pass
-    except Exception:
-        continue
+try:
+    pass
+except Exception:
+    continue

-    try:
-        pass
-    except:
-        continue
+try:
+    pass
+except:
+    continue

-    try:
-        pass
-    except (Exception,):
-        continue
+try:
+    pass
+except (Exception,):
+    continue

-    try:
-        pass
-    except (Exception, ValueError):
-        continue
+try:
+    pass
+except (Exception, ValueError):
+    continue

-    try:
-        pass
-    except ValueError:
-        continue
+try:
+    pass
+except ValueError:
+    continue

-    try:
-        pass
-    except (ValueError,):
-        continue
+try:
+    pass
+except (ValueError,):
+    continue
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B031.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B031.py
@@ -185,45 +185,38 @@ for _section, section_items in groupby(items, key=lambda p: p[1]):
    collect_shop_items(shopper, section_items)

 # Shouldn't trigger the warning when there is a return statement.
-def foo():
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            return section_items
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        return section_items
+    collect_shop_items(shopper, section_items)

 # Should trigger the warning for duplicate access, even if is a return statement after.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            collect_shop_items(shopper, section_items)
-            return
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)
+        return

 # Should trigger the warning for duplicate access, even if is a return in another branch.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            collect_shop_items(shopper, section_items)
-            collect_shop_items(shopper, section_items)
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)

 # Should trigger, since only one branch has a return statement.
-def foo():
-    from itertools import groupby
-    for _section, section_items in groupby(items, key=lambda p: p[1]):
-        if _section == "greens":
-            collect_shop_items(shopper, section_items)
-            return
-        elif _section == "frozen items":
-            collect_shop_items(shopper, section_items)
-        collect_shop_items(shopper, section_items)  # B031
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+    collect_shop_items(shopper, section_items)  # B031

 # Let's redefine the `groupby` function to make sure we pick up the correct one.
 # NOTE: This should always be at the end of the file.
--- 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_pie/PIE804.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py
@@ -26,9 +26,8 @@ abc(**{'a': b}, **{'a': c})  # PIE804
 abc(a=1, **{'a': c}, **{'b': c})  # PIE804

 # Some values need to be parenthesized.
-def foo():
-    abc(foo=1, **{'bar': (bar := 1)})  # PIE804
-    abc(foo=1, **{'bar': (yield 1)})  # PIE804
+abc(foo=1, **{'bar': (bar := 1)})  # PIE804
+abc(foo=1, **{'bar': (yield 1)})  # PIE804

 # https://github.com/astral-sh/ruff/issues/18036
 # The autofix for this is unsafe due to the comments inside the dictionary.
--- 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_simplify/SIM115.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM115.py
@@ -27,9 +27,8 @@ with contextlib.ExitStack() as stack:
    close_files = stack.pop_all().close

 # OK
-async def foo():
-    with contextlib.AsyncExitStack() as exit_stack:
-        f = await exit_stack.enter_async_context(open("filename"))
+with contextlib.AsyncExitStack() as exit_stack:
+    f = await exit_stack.enter_async_context(open("filename"))

 # OK (false negative)
 with contextlib.ExitStack():
@@ -276,10 +275,9 @@ class ExampleClassTests(TestCase):
        cls.enterClassContext(open("filename"))

 # OK
-async def foo():
-    class ExampleAsyncTests(IsolatedAsyncioTestCase):
-        async def test_something(self):
-            await self.enterAsyncContext(open("filename"))
+class ExampleAsyncTests(IsolatedAsyncioTestCase):
+    async def test_something(self):
+        await self.enterAsyncContext(open("filename"))

 # OK
 class ExampleTests(TestCase):
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM116.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM116.py
@@ -1,99 +1,98 @@
-def foo():
-    # Errors
-    a = "hello"
+# Errors
+a = "hello"

-    # SIM116
-    if a == "foo":
-        return "bar"
-    elif a == "bar":
-        return "baz"
-    elif a == "boo":
-        return "ooh"
+# SIM116
+if a == "foo":
+    return "bar"
+elif a == "bar":
+    return "baz"
+elif a == "boo":
+    return "ooh"
+else:
+    return 42
+
+# SIM116
+if a == 1:
+    return (1, 2, 3)
+elif a == 2:
+    return (4, 5, 6)
+elif a == 3:
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# SIM116
+if a == 1:
+    return (1, 2, 3)
+elif a == 2:
+    return (4, 5, 6)
+elif a == 3:
+    return (7, 8, 9)
+
+# SIM116
+if a == "hello 'sir'":
+    return (1, 2, 3)
+elif a == 'goodbye "mam"':
+    return (4, 5, 6)
+elif a == """Fairwell 'mister'""":
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# SIM116
+if a == b"one":
+    return 1
+elif a == b"two":
+    return 2
+elif a == b"three":
+    return 3
+
+# SIM116
+if a == "hello 'sir'":
+    return ("hello'", 'hi"', 3)
+elif a == 'goodbye "mam"':
+    return (4, 5, 6)
+elif a == """Fairwell 'mister'""":
+    return (7, 8, 9)
+else:
+    return (10, 11, 12)
+
+# OK
+if a == "foo":
+    return "bar"
+elif a == "bar":
+    return baz()
+elif a == "boo":
+    return "ooh"
+else:
+    return 42
+
+# OK
+if a == b"one":
+    return 1
+elif b == b"two":
+    return 2
+elif a == b"three":
+    return 3
+
+# SIM116
+if func_name == "create":
+    return "A"
+elif func_name == "modify":
+    return "M"
+elif func_name == "remove":
+    return "D"
+elif func_name == "move":
+    return "MV"
+
+# OK
+def no_return_in_else(platform):
+    if platform == "linux":
+        return "auditwheel repair -w {dest_dir} {wheel}"
+    elif platform == "macos":
+        return "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
+    elif platform == "windows":
+        return ""
    else:
-        return 42
-
-    # SIM116
-    if a == 1:
-        return (1, 2, 3)
-    elif a == 2:
-        return (4, 5, 6)
-    elif a == 3:
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # SIM116
-    if a == 1:
-        return (1, 2, 3)
-    elif a == 2:
-        return (4, 5, 6)
-    elif a == 3:
-        return (7, 8, 9)
-
-    # SIM116
-    if a == "hello 'sir'":
-        return (1, 2, 3)
-    elif a == 'goodbye "mam"':
-        return (4, 5, 6)
-    elif a == """Fairwell 'mister'""":
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # SIM116
-    if a == b"one":
-        return 1
-    elif a == b"two":
-        return 2
-    elif a == b"three":
-        return 3
-
-    # SIM116
-    if a == "hello 'sir'":
-        return ("hello'", 'hi"', 3)
-    elif a == 'goodbye "mam"':
-        return (4, 5, 6)
-    elif a == """Fairwell 'mister'""":
-        return (7, 8, 9)
-    else:
-        return (10, 11, 12)
-
-    # OK
-    if a == "foo":
-        return "bar"
-    elif a == "bar":
-        return baz()
-    elif a == "boo":
-        return "ooh"
-    else:
-        return 42
-
-    # OK
-    if a == b"one":
-        return 1
-    elif b == b"two":
-        return 2
-    elif a == b"three":
-        return 3
-
-    # SIM116
-    if func_name == "create":
-        return "A"
-    elif func_name == "modify":
-        return "M"
-    elif func_name == "remove":
-        return "D"
-    elif func_name == "move":
-        return "MV"
-
-    # OK
-    def no_return_in_else(platform):
-        if platform == "linux":
-            return "auditwheel repair -w {dest_dir} {wheel}"
-        elif platform == "macos":
-            return "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
-        elif platform == "windows":
-            return ""
-        else:
-            msg = f"Unknown platform: {platform!r}"
-            raise ValueError(msg)
+        msg = f"Unknown platform: {platform!r}"
+        raise ValueError(msg)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TC008.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TC008.py
@@ -50,23 +50,3 @@ class Baz:
    class Nested:
        a: TypeAlias = 'Baz'  # OK
        type A = 'Baz'  # TC008
-
-# O should have parenthesis added
-o: TypeAlias = """int
-| None"""
-type O = """int
-| None"""
-
-# P, Q, and R should not have parenthesis added
-p: TypeAlias = ("""int
-| None""")
-type P = ("""int
-| None""")
-
-q: TypeAlias = """(int
-| None)"""
-type Q = """(int
-| None)"""
-
-r: TypeAlias = """int | None"""
-type R = """int | None"""
--- 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/flake8_use_pathlib/PTH203.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH203.py
@@ -1,4 +1,4 @@
-import os.path, pathlib
+import os.path
 from pathlib import Path
 from os.path import getatime

@@ -10,26 +10,3 @@ os.path.getatime(Path("filename"))
 getatime("filename")
 getatime(b"filename")
 getatime(Path("filename"))
-
-
-file = __file__
-
-os.path.getatime(file)
-os.path.getatime(filename="filename")
-os.path.getatime(filename=Path("filename"))
-
-os.path.getatime(  # comment 1
-    # comment 2
-    "filename"  # comment 3
-    # comment 4
-    ,  # comment 5
-    # comment 6
-)  # comment 7
-
-os.path.getatime("file" + "name")
-
-getatime(Path("filename").resolve())
-
-os.path.getatime(pathlib.Path("filename"))
-
-getatime(Path("dir") / "file.txt")
--- 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/pycodestyle/E27.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E27.py
@@ -81,5 +81,4 @@ match(foo):
 # https://github.com/astral-sh/ruff/issues/12094
 pass;

-def foo():
-    yield, x
+yield, x
--- 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/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),
--- a/crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_lambda.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_lambda.py
@@ -57,7 +57,3 @@ _ = lambda x: z(lambda y: x + y)(x)
 # lambda uses an additional keyword
 _ = lambda *args: f(*args, y=1)
 _ = lambda *args: f(*args, y=x)
-
-# https://github.com/astral-sh/ruff/issues/18675
-_ = lambda x: (string := str)(x)
-_ = lambda x: ((x := 1) and str)(x)
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP007.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP007.py
@@ -90,52 +90,3 @@ class AClass:

 def myfunc(param: "tuple[Union[int, 'AClass', None], str]"):
    print(param)
-
-
-from typing import NamedTuple, Union
-
-import typing_extensions
-from typing_extensions import (
-    NamedTuple as NamedTupleTE,
-    Union as UnionTE,
-)
-
-# Regression test for https://github.com/astral-sh/ruff/issues/18619
-# Don't emit lint for `NamedTuple`
-a_plain_1: Union[NamedTuple, int] = None
-a_plain_2: Union[int, NamedTuple] = None
-a_plain_3: Union[NamedTuple, None] = None
-a_plain_4: Union[None, NamedTuple] = None
-a_plain_te_1: UnionTE[NamedTupleTE, int] = None
-a_plain_te_2: UnionTE[int, NamedTupleTE] = None
-a_plain_te_3: UnionTE[NamedTupleTE, None] = None
-a_plain_te_4: UnionTE[None, NamedTupleTE] = None
-a_plain_typing_1: UnionTE[typing.NamedTuple, int] = None
-a_plain_typing_2: UnionTE[int, typing.NamedTuple] = None
-a_plain_typing_3: UnionTE[typing.NamedTuple, None] = None
-a_plain_typing_4: UnionTE[None, typing.NamedTuple] = None
-a_string_1: "Union[NamedTuple, int]" = None
-a_string_2: "Union[int, NamedTuple]" = None
-a_string_3: "Union[NamedTuple, None]" = None
-a_string_4: "Union[None, NamedTuple]" = None
-a_string_te_1: "UnionTE[NamedTupleTE, int]" = None
-a_string_te_2: "UnionTE[int, NamedTupleTE]" = None
-a_string_te_3: "UnionTE[NamedTupleTE, None]" = None
-a_string_te_4: "UnionTE[None, NamedTupleTE]" = None
-a_string_typing_1: "typing.Union[typing.NamedTuple, int]" = None
-a_string_typing_2: "typing.Union[int, typing.NamedTuple]" = None
-a_string_typing_3: "typing.Union[typing.NamedTuple, None]" = None
-a_string_typing_4: "typing.Union[None, typing.NamedTuple]" = None
-
-b_plain_1: Union[NamedTuple] = None
-b_plain_2: Union[NamedTuple, None] = None
-b_plain_te_1: UnionTE[NamedTupleTE] = None
-b_plain_te_2: UnionTE[NamedTupleTE, None] = None
-b_plain_typing_1: UnionTE[typing.NamedTuple] = None
-b_plain_typing_2: UnionTE[typing.NamedTuple, None] = None
-b_string_1: "Union[NamedTuple]" = None
-b_string_2: "Union[NamedTuple, None]" = None
-b_string_te_1: "UnionTE[NamedTupleTE]" = None
-b_string_te_2: "UnionTE[NamedTupleTE, None]" = None
-b_string_typing_1: "typing.Union[typing.NamedTuple]" = None
-b_string_typing_2: "typing.Union[typing.NamedTuple, None]" = None
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py
@@ -105,23 +105,3 @@ import builtins
 class C:
    def f(self):
        builtins.super(C, self)
-
-
-# see: https://github.com/astral-sh/ruff/issues/18533
-class ClassForCommentEnthusiasts(BaseClass):
-    def with_comments(self):
-        super(
-            # super helpful comment
-            ClassForCommentEnthusiasts,
-            self
-        ).f()
-        super(
-            ClassForCommentEnthusiasts,
-            # even more helpful comment
-            self
-        ).f()
-        super(
-            ClassForCommentEnthusiasts,
-            self
-            # also a comment
-        ).f()
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py
@@ -26,9 +26,3 @@ def hello():

 f"foo"u"bar"  # OK
 f"foo" u"bar"  # OK
-
-# https://github.com/astral-sh/ruff/issues/18895
-""u""
-""u"hi"
-""""""""""""""""""""u"hi"
-""U"helloooo"
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py
@@ -47,25 +47,3 @@ class ServiceRefOrValue:
 # Test for: https://github.com/astral-sh/ruff/issues/18508
 # Optional[None] should not be offered a fix
 foo: Optional[None] = None
-
-
-from typing import NamedTuple, Optional
-
-import typing_extensions
-from typing_extensions import (
-    NamedTuple as NamedTupleTE,
-    Optional as OptionalTE,
-)
-
-# Regression test for https://github.com/astral-sh/ruff/issues/18619
-# Don't emit lint for `NamedTuple`
-a1: Optional[NamedTuple] = None
-a2: typing.Optional[NamedTuple] = None
-a3: OptionalTE[NamedTuple] = None
-a4: typing_extensions.Optional[NamedTuple] = None
-a5: Optional[typing.NamedTuple] = None
-a6: typing.Optional[typing.NamedTuple] = None
-a7: OptionalTE[typing.NamedTuple] = None
-a8: typing_extensions.Optional[typing.NamedTuple] = None
-a9: "Optional[NamedTuple]" = None
-a10: Optional[NamedTupleTE] = None
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB164.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB164.py
@@ -20,12 +20,6 @@ _ = Decimal.from_float(float("-inf"))
 _ = Decimal.from_float(float("Infinity"))
 _ = Decimal.from_float(float("-Infinity"))
 _ = Decimal.from_float(float("nan"))
-_ = Decimal.from_float(float("-NaN "))
-_ = Decimal.from_float(float(" \n+nan   \t"))
-_ = Decimal.from_float(float("  iNf \n\t "))
-_ = Decimal.from_float(float("   -inF\n \t"))
-_ = Decimal.from_float(float("  InfinIty \n\t "))
-_ = Decimal.from_float(float("   -InfinIty\n \t"))

 # OK
 _ = Fraction(0.1)
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB168.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB168.py
@@ -85,10 +85,3 @@ def _():

    if isinstance(foo, type(None)):
        ...
-
-# https://github.com/astral-sh/ruff/issues/19047
-if isinstance(foo, ()):
-    pass
-
-if isinstance(foo, Union[()]):
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF009_attrs.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF009_attrs.py
@@ -125,20 +125,3 @@ class J:
 class K:
    f: F = F()
    g: G = G()
-
-
-# Regression test for https://github.com/astral-sh/ruff/issues/19014
-# These are all valid field calls and should not cause diagnostics.
-@attr.define
-class TestAttrField:
-    attr_field_factory: list[int] = attr.field(factory=list)
-    attr_field_default: list[int] = attr.field(default=attr.Factory(list))
-    attr_factory: list[int] = attr.Factory(list)
-    attr_ib: list[int] = attr.ib(factory=list)
-    attr_attr: list[int] = attr.attr(factory=list)
-    attr_attrib: list[int] = attr.attrib(factory=list)
-
-
-@attr.attributes
-class TestAttrAttributes:
-    x: list[int] = list()  # RUF009
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py
@@ -36,19 +36,5 @@ f"{ascii(bla)}"  # OK
 )


-# https://github.com/astral-sh/ruff/issues/16325
+# OK
 f"{str({})}"
-
-f"{str({} | {})}"
-
-import builtins
-
-f"{builtins.repr(1)}"
-
-f"{repr(1)=}"
-
-f"{repr(lambda: 1)}"
-
-f"{repr(x := 2)}"
-
-f"{str(object=3)}"
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py
@@ -1,5 +1,5 @@
-import collections
 from collections import deque
+import collections


 def f():
@@ -91,14 +91,3 @@ def f():

 def f():
    deque([], iterable=[])
-
-# https://github.com/astral-sh/ruff/issues/18854
-deque("")
-deque(b"")
-deque(f"")
-deque(f"" "")
-deque(f"" f"")
-deque("abc") # OK
-deque(b"abc") # OK
-deque(f"" "a")  # OK
-deque(f"{x}" "")  # OK
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -1,7 +1,12 @@
-use ruff_python_semantic::{Binding, ScopeKind};
+use ruff_python_semantic::analyze::visibility;
+use ruff_python_semantic::{Binding, BindingKind, Imported, ResolvedReference, ScopeKind};
+use ruff_text_size::Ranged;
+use rustc_hash::FxHashMap;

+use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
+use crate::fix;
 use crate::rules::{
    flake8_builtins, flake8_pyi, flake8_type_checking, flake8_unused_arguments, pep8_naming,
    pyflakes, pylint, ruff,
@@ -89,19 +94,260 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
        }

        if checker.is_rule_enabled(Rule::GlobalVariableNotAssigned) {
-            pylint::rules::global_variable_not_assigned(checker, scope);
+            for (name, binding_id) in scope.bindings() {
+                let binding = checker.semantic.binding(binding_id);
+                // If the binding is a `global`, then it's a top-level `global` that was never
+                // assigned in the current scope. If it were assigned, the `global` would be
+                // shadowed by the assignment.
+                if binding.kind.is_global() {
+                    // If the binding was conditionally deleted, it will include a reference within
+                    // a `Del` context, but won't be shadowed by a `BindingKind::Deletion`, as in:
+                    // ```python
+                    // if condition:
+                    //     del var
+                    // ```
+                    if binding
+                        .references
+                        .iter()
+                        .map(|id| checker.semantic.reference(*id))
+                        .all(ResolvedReference::is_load)
+                    {
+                        checker.report_diagnostic(
+                            pylint::rules::GlobalVariableNotAssigned {
+                                name: (*name).to_string(),
+                            },
+                            binding.range(),
+                        );
+                    }
+                }
+            }
        }

        if checker.is_rule_enabled(Rule::RedefinedArgumentFromLocal) {
-            pylint::rules::redefined_argument_from_local(checker, scope_id, scope);
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if !matches!(
+                        binding.kind,
+                        BindingKind::LoopVar
+                            | BindingKind::BoundException
+                            | BindingKind::WithItemVar
+                    ) {
+                        continue;
+                    }
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if !shadowed.kind.is_argument() {
+                        continue;
+                    }
+                    if checker.settings().dummy_variable_rgx.is_match(name) {
+                        continue;
+                    }
+                    let scope = &checker.semantic.scopes[binding.scope];
+                    if scope.kind.is_generator() {
+                        continue;
+                    }
+                    checker.report_diagnostic(
+                        pylint::rules::RedefinedArgumentFromLocal {
+                            name: name.to_string(),
+                        },
+                        binding.range(),
+                    );
+                }
+            }
        }

        if checker.is_rule_enabled(Rule::ImportShadowedByLoopVar) {
-            pyflakes::rules::import_shadowed_by_loop_var(checker, scope_id, scope);
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding isn't a loop variable, abort.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if !binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding isn't an import, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if !matches!(
+                        shadowed.kind,
+                        BindingKind::Import(..)
+                            | BindingKind::FromImport(..)
+                            | BindingKind::SubmoduleImport(..)
+                            | BindingKind::FutureImport
+                    ) {
+                        continue;
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.is_none_or(|left| {
+                        binding
+                            .source
+                            .is_none_or(|right| !checker.semantic.same_branch(left, right))
+                    }) {
+                        continue;
+                    }
+
+                    checker.report_diagnostic(
+                        pyflakes::rules::ImportShadowedByLoopVar {
+                            name: name.to_string(),
+                            row: checker.compute_source_row(shadowed.start()),
+                        },
+                        binding.range(),
+                    );
+                }
+            }
        }

        if checker.is_rule_enabled(Rule::RedefinedWhileUnused) {
-            pyflakes::rules::redefined_while_unused(checker, scope_id, scope);
+            // Index the redefined bindings by statement.
+            let mut redefinitions = FxHashMap::default();
+
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding is a loop variable, abort, to avoid overlap
+                    // with F402.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding is used, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if shadowed.is_used() {
+                        continue;
+                    }
+
+                    // If the shadowing binding isn't considered a "redefinition" of the
+                    // shadowed binding, abort.
+                    if !binding.redefines(shadowed) {
+                        continue;
+                    }
+
+                    if shadow.same_scope() {
+                        // If the symbol is a dummy variable, abort, unless the shadowed
+                        // binding is an import.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) && checker.settings().dummy_variable_rgx.is_match(name)
+                        {
+                            continue;
+                        }
+
+                        let Some(node_id) = shadowed.source else {
+                            continue;
+                        };
+
+                        // If this is an overloaded function, abort.
+                        if shadowed.kind.is_function_definition() {
+                            if checker
+                                .semantic
+                                .statement(node_id)
+                                .as_function_def_stmt()
+                                .is_some_and(|function| {
+                                    visibility::is_overload(
+                                        &function.decorator_list,
+                                        &checker.semantic,
+                                    )
+                                })
+                            {
+                                continue;
+                            }
+                        }
+                    } else {
+                        // Only enforce cross-scope shadowing for imports.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) {
+                            continue;
+                        }
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.is_none_or(|left| {
+                        binding
+                            .source
+                            .is_none_or(|right| !checker.semantic.same_branch(left, right))
+                    }) {
+                        continue;
+                    }
+
+                    redefinitions
+                        .entry(binding.source)
+                        .or_insert_with(Vec::new)
+                        .push((shadowed, binding));
+                }
+            }
+
+            // Create a fix for each source statement.
+            let mut fixes = FxHashMap::default();
+            for (source, entries) in &redefinitions {
+                let Some(source) = source else {
+                    continue;
+                };
+
+                let member_names = entries
+                    .iter()
+                    .filter_map(|(shadowed, binding)| {
+                        if let Some(shadowed_import) = shadowed.as_any_import() {
+                            if let Some(import) = binding.as_any_import() {
+                                if shadowed_import.qualified_name() == import.qualified_name() {
+                                    return Some(import.member_name());
+                                }
+                            }
+                        }
+                        None
+                    })
+                    .collect::<Vec<_>>();
+
+                if !member_names.is_empty() {
+                    let statement = checker.semantic.statement(*source);
+                    let parent = checker.semantic.parent_statement(*source);
+                    let Ok(edit) = fix::edits::remove_unused_imports(
+                        member_names.iter().map(std::convert::AsRef::as_ref),
+                        statement,
+                        parent,
+                        checker.locator(),
+                        checker.stylist(),
+                        checker.indexer(),
+                    ) else {
+                        continue;
+                    };
+                    fixes.insert(
+                        *source,
+                        Fix::safe_edit(edit).isolate(Checker::isolation(
+                            checker.semantic().parent_statement_id(*source),
+                        )),
+                    );
+                }
+            }
+
+            // Create diagnostics for each statement.
+            for (source, entries) in &redefinitions {
+                for (shadowed, binding) in entries {
+                    let mut diagnostic = checker.report_diagnostic(
+                        pyflakes::rules::RedefinedWhileUnused {
+                            name: binding.name(checker.source()).to_string(),
+                            row: checker.compute_source_row(shadowed.start()),
+                        },
+                        binding.range(),
+                    );
+
+                    if let Some(range) = binding.parent_range(&checker.semantic) {
+                        diagnostic.set_parent(range.start());
+                    }
+
+                    if let Some(fix) = source.as_ref().and_then(|source| fixes.get(source)) {
+                        diagnostic.set_fix(fix.clone());
+                    }
+                }
+            }
        }

        if checker.source_type.is_stub()
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -7,7 +7,6 @@ use ruff_python_semantic::analyze::typing;
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
-use crate::preview::is_optional_as_none_in_union_enabled;
 use crate::registry::Rule;
 use crate::rules::{
    airflow, flake8_2020, flake8_async, flake8_bandit, flake8_boolean_trap, flake8_bugbear,
@@ -91,13 +90,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                    if checker.is_rule_enabled(Rule::UnnecessaryLiteralUnion) {
                        flake8_pyi::rules::unnecessary_literal_union(checker, expr);
                    }
-                    if checker.is_rule_enabled(Rule::DuplicateUnionMember)
-                        // Avoid duplicate checks inside `Optional`
-                        && !(
-                            is_optional_as_none_in_union_enabled(checker.settings())
-                            && checker.semantic.inside_optional()
-                        )
-                    {
+                    if checker.is_rule_enabled(Rule::DuplicateUnionMember) {
                        flake8_pyi::rules::duplicate_union_member(checker, expr);
                    }
                    if checker.is_rule_enabled(Rule::RedundantLiteralUnion) {
@@ -546,13 +539,14 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                            let location = expr.range();
                            match pyflakes::format::FormatSummary::try_from(string_value.to_str()) {
                                Err(e) => {
-                                    // F521
-                                    checker.report_diagnostic_if_enabled(
-                                        pyflakes::rules::StringDotFormatInvalidFormat {
-                                            message: pyflakes::format::error_to_string(&e),
-                                        },
-                                        location,
-                                    );
+                                    if checker.is_rule_enabled(Rule::StringDotFormatInvalidFormat) {
+                                        checker.report_diagnostic(
+                                            pyflakes::rules::StringDotFormatInvalidFormat {
+                                                message: pyflakes::format::error_to_string(&e),
+                                            },
+                                            location,
+                                        );
+                                    }
                                }
                                Ok(summary) => {
                                    if checker
@@ -1062,24 +1056,16 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                Rule::OsPathSplitext,
                Rule::BuiltinOpen,
                Rule::PyPath,
+                Rule::OsPathGetsize,
+                Rule::OsPathGetatime,
+                Rule::OsPathGetmtime,
+                Rule::OsPathGetctime,
                Rule::Glob,
                Rule::OsListdir,
                Rule::OsSymlink,
            ]) {
                flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
            }
-            if checker.is_rule_enabled(Rule::OsPathGetsize) {
-                flake8_use_pathlib::rules::os_path_getsize(checker, call);
-            }
-            if checker.is_rule_enabled(Rule::OsPathGetatime) {
-                flake8_use_pathlib::rules::os_path_getatime(checker, call);
-            }
-            if checker.is_rule_enabled(Rule::OsPathGetctime) {
-                flake8_use_pathlib::rules::os_path_getctime(checker, call);
-            }
-            if checker.is_rule_enabled(Rule::OsPathGetmtime) {
-                flake8_use_pathlib::rules::os_path_getmtime(checker, call);
-            }
            if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
                flake8_use_pathlib::rules::path_constructor_current_directory(checker, call);
            }
@@ -1327,22 +1313,26 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                            typ: CFormatErrorType::UnsupportedFormatChar(c),
                            ..
                        }) => {
-                            // F509
-                            checker.report_diagnostic_if_enabled(
-                                pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
-                                    char: c,
-                                },
-                                location,
-                            );
+                            if checker
+                                .is_rule_enabled(Rule::PercentFormatUnsupportedFormatCharacter)
+                            {
+                                checker.report_diagnostic(
+                                    pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
+                                        char: c,
+                                    },
+                                    location,
+                                );
+                            }
                        }
                        Err(e) => {
-                            // F501
-                            checker.report_diagnostic_if_enabled(
-                                pyflakes::rules::PercentFormatInvalidFormat {
-                                    message: e.to_string(),
-                                },
-                                location,
-                            );
+                            if checker.is_rule_enabled(Rule::PercentFormatInvalidFormat) {
+                                checker.report_diagnostic(
+                                    pyflakes::rules::PercentFormatInvalidFormat {
+                                        message: e.to_string(),
+                                    },
+                                    location,
+                                );
+                            }
                        }
                        Ok(summary) => {
                            if checker.is_rule_enabled(Rule::PercentFormatExpectedMapping) {
@@ -1443,11 +1433,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
            if !checker.semantic.in_nested_union() {
                if checker.is_rule_enabled(Rule::DuplicateUnionMember)
                    && checker.semantic.in_type_definition()
-                    // Avoid duplicate checks inside `Optional`
-                    && !(
-                        is_optional_as_none_in_union_enabled(checker.settings())
-                        && checker.semantic.inside_optional()
-                    )
                {
                    flake8_pyi::rules::duplicate_union_member(checker, expr);
                }
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -45,7 +45,18 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                }
            }
            if checker.is_rule_enabled(Rule::NonlocalWithoutBinding) {
-                pylint::rules::nonlocal_without_binding(checker, nonlocal);
+                if !checker.semantic.scope_id.is_global() {
+                    for name in names {
+                        if checker.semantic.nonlocal(name).is_none() {
+                            checker.report_diagnostic(
+                                pylint::rules::NonlocalWithoutBinding {
+                                    name: name.to_string(),
+                                },
+                                name.range(),
+                            );
+                        }
+                    }
+                }
            }
            if checker.is_rule_enabled(Rule::NonlocalAndGlobal) {
                pylint::rules::nonlocal_and_global(checker, nonlocal);
@@ -817,7 +828,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                        pyflakes::rules::future_feature_not_defined(checker, alias);
                    }
                } else if &alias.name == "*" {
-                    // F406
                    if checker.is_rule_enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
                        if !matches!(checker.semantic.current_scope().kind, ScopeKind::Module) {
                            checker.report_diagnostic(
@@ -828,13 +838,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                            );
                        }
                    }
-                    // F403
-                    checker.report_diagnostic_if_enabled(
-                        pyflakes::rules::UndefinedLocalWithImportStar {
-                            name: helpers::format_import_from(level, module).to_string(),
-                        },
-                        stmt.range(),
-                    );
+                    if checker.is_rule_enabled(Rule::UndefinedLocalWithImportStar) {
+                        checker.report_diagnostic(
+                            pyflakes::rules::UndefinedLocalWithImportStar {
+                                name: helpers::format_import_from(level, module).to_string(),
+                            },
+                            stmt.range(),
+                        );
+                    }
                }
                if checker.is_rule_enabled(Rule::RelativeImports) {
                    flake8_tidy_imports::rules::banned_relative_import(
--- a/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs
@@ -13,15 +13,15 @@ pub(crate) fn unresolved_references(checker: &Checker) {

    for reference in checker.semantic.unresolved_references() {
        if reference.is_wildcard_import() {
-            // F406
-            checker.report_diagnostic_if_enabled(
-                pyflakes::rules::UndefinedLocalWithImportStarUsage {
-                    name: reference.name(checker.source()).to_string(),
-                },
-                reference.range(),
-            );
+            if checker.is_rule_enabled(Rule::UndefinedLocalWithImportStarUsage) {
+                checker.report_diagnostic(
+                    pyflakes::rules::UndefinedLocalWithImportStarUsage {
+                        name: reference.name(checker.source()).to_string(),
+                    },
+                    reference.range(),
+                );
+            }
        } else {
-            // F821
            if checker.is_rule_enabled(Rule::UndefinedName) {
                if checker.semantic.in_no_type_check() {
                    continue;
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -28,8 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};

-use ruff_db::diagnostic::Diagnostic;
-use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
+use ruff_diagnostics::IsolationLevel;
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
 use ruff_python_ast::identifier::Identifier;
@@ -64,7 +63,6 @@ use ruff_text_size::{Ranged, TextRange, TextSize};
 use crate::checkers::ast::annotation::AnnotationContext;
 use crate::docstrings::extraction::ExtractionTarget;
 use crate::importer::{ImportRequest, Importer, ResolutionError};
-use crate::message::diagnostic_from_violation;
 use crate::noqa::NoqaMapping;
 use crate::package::PackageRoot;
 use crate::preview::is_undefined_export_in_dunder_init_enabled;
@@ -76,7 +74,7 @@ use crate::rules::pylint::rules::{AwaitOutsideAsync, LoadBeforeGlobalDeclaration
 use crate::rules::{flake8_pyi, flake8_type_checking, pyflakes, pyupgrade};
 use crate::settings::rule_table::RuleTable;
 use crate::settings::{LinterSettings, TargetVersion, flags};
-use crate::{Edit, Violation};
+use crate::{Edit, OldDiagnostic, Violation};
 use crate::{Locator, docstrings, noqa};

 mod analyze;
@@ -403,8 +401,8 @@ impl<'a> Checker<'a> {
    /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
    /// enabled.
    ///
-    /// The guard derefs to a [`Diagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the checker on `Drop`.
+    /// Prefer [`Checker::report_diagnostic`] in general because the conversion from a `Diagnostic`
+    /// to a `Rule` is somewhat expensive.
    pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
        &'chk self,
        kind: T,
@@ -627,7 +625,6 @@ impl SemanticSyntaxContext for Checker<'_> {
    fn report_semantic_error(&self, error: SemanticSyntaxError) {
        match error.kind {
            SemanticSyntaxErrorKind::LateFutureImport => {
-                // F404
                if self.is_rule_enabled(Rule::LateFutureImport) {
                    self.report_diagnostic(LateFutureImport, error.range);
                }
@@ -649,7 +646,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                }
            }
            SemanticSyntaxErrorKind::ReturnOutsideFunction => {
-                // F706
                if self.is_rule_enabled(Rule::ReturnOutsideFunction) {
                    self.report_diagnostic(ReturnOutsideFunction, error.range);
                }
@@ -2767,7 +2763,9 @@ impl<'a> Checker<'a> {

                        self.semantic.restore(snapshot);

-                        if self.semantic.in_typing_only_annotation() {
+                        if self.semantic.in_annotation()
+                            && self.semantic.in_typing_only_annotation()
+                        {
                            if self.is_rule_enabled(Rule::QuotedAnnotation) {
                                pyupgrade::rules::quoted_annotation(self, annotation, range);
                            }
@@ -2810,7 +2808,6 @@ impl<'a> Checker<'a> {
                    Err(parse_error) => {
                        self.semantic.restore(snapshot);

-                        // F722
                        if self.is_rule_enabled(Rule::ForwardAnnotationSyntaxError) {
                            self.report_type_diagnostic(
                                pyflakes::rules::ForwardAnnotationSyntaxError {
@@ -2958,7 +2955,6 @@ impl<'a> Checker<'a> {
                    self.semantic.flags -= SemanticModelFlags::DUNDER_ALL_DEFINITION;
                } else {
                    if self.semantic.global_scope().uses_star_imports() {
-                        // F405
                        if self.is_rule_enabled(Rule::UndefinedLocalWithImportStarUsage) {
                            self.report_diagnostic(
                                pyflakes::rules::UndefinedLocalWithImportStarUsage {
@@ -2969,7 +2965,6 @@ impl<'a> Checker<'a> {
                            .set_parent(definition.start());
                        }
                    } else {
-                        // F822
                        if self.is_rule_enabled(Rule::UndefinedExport) {
                            if is_undefined_export_in_dunder_init_enabled(self.settings())
                                || !self.path.ends_with("__init__.py")
@@ -3118,9 +3113,9 @@ pub(crate) fn check_ast(
 /// A type for collecting diagnostics in a given file.
 ///
 /// [`LintContext::report_diagnostic`] can be used to obtain a [`DiagnosticGuard`], which will push
-/// a [`Violation`] to the contained [`Diagnostic`] collection on `Drop`.
+/// a [`Violation`] to the contained [`OldDiagnostic`] collection on `Drop`.
 pub(crate) struct LintContext<'a> {
-    diagnostics: RefCell<Vec<Diagnostic>>,
+    diagnostics: RefCell<Vec<OldDiagnostic>>,
    source_file: SourceFile,
    rules: RuleTable,
    settings: &'a LinterSettings,
@@ -3128,7 +3123,7 @@ pub(crate) struct LintContext<'a> {

 impl<'a> LintContext<'a> {
    /// Create a new collector with the given `source_file` and an empty collection of
-    /// `Diagnostic`s.
+    /// `OldDiagnostic`s.
    pub(crate) fn new(path: &Path, contents: &str, settings: &'a LinterSettings) -> Self {
        let source_file =
            SourceFileBuilder::new(path.to_string_lossy().as_ref(), contents).finish();
@@ -3149,8 +3144,8 @@ impl<'a> LintContext<'a> {

    /// Return a [`DiagnosticGuard`] for reporting a diagnostic.
    ///
-    /// The guard derefs to a [`Diagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the context on `Drop`.
+    /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
+    /// before it is added to the collection in the collector on `Drop`.
    pub(crate) fn report_diagnostic<'chk, T: Violation>(
        &'chk self,
        kind: T,
@@ -3158,27 +3153,24 @@ impl<'a> LintContext<'a> {
    ) -> DiagnosticGuard<'chk, 'a> {
        DiagnosticGuard {
            context: self,
-            diagnostic: Some(diagnostic_from_violation(kind, range, &self.source_file)),
-            rule: T::rule(),
+            diagnostic: Some(OldDiagnostic::new(kind, range, &self.source_file)),
        }
    }

    /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
    /// enabled.
    ///
-    /// The guard derefs to a [`Diagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the context on `Drop`.
+    /// Prefer [`DiagnosticsCollector::report_diagnostic`] in general because the conversion from an
+    /// `OldDiagnostic` to a `Rule` is somewhat expensive.
    pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
        &'chk self,
        kind: T,
        range: TextRange,
    ) -> Option<DiagnosticGuard<'chk, 'a>> {
-        let rule = T::rule();
-        if self.is_rule_enabled(rule) {
+        if self.is_rule_enabled(T::rule()) {
            Some(DiagnosticGuard {
                context: self,
-                diagnostic: Some(diagnostic_from_violation(kind, range, &self.source_file)),
-                rule,
+                diagnostic: Some(OldDiagnostic::new(kind, range, &self.source_file)),
            })
        } else {
            None
@@ -3201,17 +3193,17 @@ impl<'a> LintContext<'a> {
    }

    #[inline]
-    pub(crate) fn into_parts(self) -> (Vec<Diagnostic>, SourceFile) {
+    pub(crate) fn into_parts(self) -> (Vec<OldDiagnostic>, SourceFile) {
        (self.diagnostics.into_inner(), self.source_file)
    }

    #[inline]
-    pub(crate) fn as_mut_vec(&mut self) -> &mut Vec<Diagnostic> {
+    pub(crate) fn as_mut_vec(&mut self) -> &mut Vec<OldDiagnostic> {
        self.diagnostics.get_mut()
    }

    #[inline]
-    pub(crate) fn iter(&mut self) -> impl Iterator<Item = &Diagnostic> {
+    pub(crate) fn iter(&mut self) -> impl Iterator<Item = &OldDiagnostic> {
        self.diagnostics.get_mut().iter()
    }
 }
@@ -3229,8 +3221,7 @@ pub(crate) struct DiagnosticGuard<'a, 'b> {
    /// The diagnostic that we want to report.
    ///
    /// This is always `Some` until the `Drop` (or `defuse`) call.
-    diagnostic: Option<Diagnostic>,
-    rule: Rule,
+    diagnostic: Option<OldDiagnostic>,
 }

 impl DiagnosticGuard<'_, '_> {
@@ -3243,57 +3234,10 @@ impl DiagnosticGuard<'_, '_> {
    }
 }

-impl DiagnosticGuard<'_, '_> {
-    fn resolve_applicability(&self, fix: &Fix) -> Applicability {
-        self.context
-            .settings
-            .fix_safety
-            .resolve_applicability(self.rule, fix.applicability())
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic.
-    #[inline]
-    pub(crate) fn set_fix(&mut self, fix: Fix) {
-        if !self.context.rules.should_fix(self.rule) {
-            self.diagnostic.as_mut().unwrap().remove_fix();
-            return;
-        }
-        let applicability = self.resolve_applicability(&fix);
-        self.diagnostic
-            .as_mut()
-            .unwrap()
-            .set_fix(fix.with_applicability(applicability));
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic, if the provided function returns `Ok`.
-    /// Otherwise, log the error.
-    #[inline]
-    pub(crate) fn try_set_fix(&mut self, func: impl FnOnce() -> anyhow::Result<Fix>) {
-        match func() {
-            Ok(fix) => self.set_fix(fix),
-            Err(err) => log::debug!("Failed to create fix for {}: {}", self.name(), err),
-        }
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic, if the provided function returns `Ok`.
-    /// Otherwise, log the error.
-    #[inline]
-    pub(crate) fn try_set_optional_fix(
-        &mut self,
-        func: impl FnOnce() -> anyhow::Result<Option<Fix>>,
-    ) {
-        match func() {
-            Ok(None) => {}
-            Ok(Some(fix)) => self.set_fix(fix),
-            Err(err) => log::debug!("Failed to create fix for {}: {}", self.name(), err),
-        }
-    }
-}
-
 impl std::ops::Deref for DiagnosticGuard<'_, '_> {
-    type Target = Diagnostic;
+    type Target = OldDiagnostic;

-    fn deref(&self) -> &Diagnostic {
+    fn deref(&self) -> &OldDiagnostic {
        // OK because `self.diagnostic` is only `None` within `Drop`.
        self.diagnostic.as_ref().unwrap()
    }
@@ -3301,7 +3245,7 @@ impl std::ops::Deref for DiagnosticGuard<'_, '_> {

 /// Return a mutable borrow of the diagnostic in this guard.
 impl std::ops::DerefMut for DiagnosticGuard<'_, '_> {
-    fn deref_mut(&mut self) -> &mut Diagnostic {
+    fn deref_mut(&mut self) -> &mut OldDiagnostic {
        // OK because `self.diagnostic` is only `None` within `Drop`.
        self.diagnostic.as_mut().unwrap()
    }
--- a/crates/ruff_linter/src/checkers/noqa.rs
+++ b/crates/ruff_linter/src/checkers/noqa.rs
@@ -22,7 +22,6 @@ use crate::{Edit, Fix, Locator};

 use super::ast::LintContext;

-/// RUF100
 pub(crate) fn check_noqa(
    context: &mut LintContext,
    path: &Path,
@@ -35,40 +34,45 @@ pub(crate) fn check_noqa(
    // Identify any codes that are globally exempted (within the current file).
    let file_noqa_directives =
        FileNoqaDirectives::extract(locator, comment_ranges, &settings.external, path);
+    let exemption = FileExemption::from(&file_noqa_directives);

    // Extract all `noqa` directives.
    let mut noqa_directives =
        NoqaDirectives::from_commented_ranges(comment_ranges, &settings.external, path, locator);

-    if file_noqa_directives.is_empty() && noqa_directives.is_empty() {
-        return Vec::new();
-    }
-
-    let exemption = FileExemption::from(&file_noqa_directives);
-
    // Indices of diagnostics that were ignored by a `noqa` directive.
    let mut ignored_diagnostics = vec![];

    // Remove any ignored diagnostics.
    'outer: for (index, diagnostic) in context.iter().enumerate() {
        // Can't ignore syntax errors.
-        let Some(code) = diagnostic.secondary_code() else {
+        let Some(code) = diagnostic.noqa_code() else {
            continue;
        };

-        if *code == Rule::BlanketNOQA.noqa_code() {
+        if code == Rule::BlanketNOQA.noqa_code() {
            continue;
        }

-        if exemption.contains_secondary_code(code) {
-            ignored_diagnostics.push(index);
-            continue;
+        match &exemption {
+            FileExemption::All(_) => {
+                // If the file is exempted, ignore all diagnostics.
+                ignored_diagnostics.push(index);
+                continue;
+            }
+            FileExemption::Codes(codes) => {
+                // If the diagnostic is ignored by a global exemption, ignore it.
+                if codes.contains(&&code) {
+                    ignored_diagnostics.push(index);
+                    continue;
+                }
+            }
        }

        let noqa_offsets = diagnostic
-            .parent()
+            .parent
            .into_iter()
-            .chain(std::iter::once(diagnostic.expect_range().start()))
+            .chain(std::iter::once(diagnostic.start()))
            .map(|position| noqa_line_for.resolve(position))
            .unique();

@@ -77,21 +81,13 @@ pub(crate) fn check_noqa(
            {
                let suppressed = match &directive_line.directive {
                    Directive::All(_) => {
-                        let Ok(rule) = Rule::from_code(code) else {
-                            debug_assert!(false, "Invalid secondary code `{code}`");
-                            continue;
-                        };
-                        directive_line.matches.push(rule);
+                        directive_line.matches.push(code);
                        ignored_diagnostics.push(index);
                        true
                    }
                    Directive::Codes(directive) => {
                        if directive.includes(code) {
-                            let Ok(rule) = Rule::from_code(code) else {
-                                debug_assert!(false, "Invalid secondary code `{code}`");
-                                continue;
-                            };
-                            directive_line.matches.push(rule);
+                            directive_line.matches.push(code);
                            ignored_diagnostics.push(index);
                            true
                        } else {
@@ -150,11 +146,11 @@ pub(crate) fn check_noqa(

                        if seen_codes.insert(original_code) {
                            let is_code_used = if is_file_level {
-                                context.iter().any(|diag| {
-                                    diag.secondary_code().is_some_and(|noqa| *noqa == code)
-                                })
+                                context
+                                    .iter()
+                                    .any(|diag| diag.noqa_code().is_some_and(|noqa| noqa == code))
                            } else {
-                                matches.iter().any(|match_| match_.noqa_code() == code)
+                                matches.iter().any(|match_| *match_ == code)
                            } || settings
                                .external
                                .iter()
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -4,7 +4,6 @@
 /// `--select`. For pylint this is e.g. C0414 and E0118 but also C and E01.
 use std::fmt::Formatter;

-use ruff_db::diagnostic::SecondaryCode;
 use strum_macros::EnumIter;

 use crate::registry::Linter;
@@ -47,24 +46,6 @@ impl PartialEq<&str> for NoqaCode {
    }
 }

-impl PartialEq<NoqaCode> for &str {
-    fn eq(&self, other: &NoqaCode) -> bool {
-        other.eq(self)
-    }
-}
-
-impl PartialEq<NoqaCode> for SecondaryCode {
-    fn eq(&self, other: &NoqaCode) -> bool {
-        &self.as_str() == other
-    }
-}
-
-impl PartialEq<SecondaryCode> for NoqaCode {
-    fn eq(&self, other: &SecondaryCode) -> bool {
-        other.eq(self)
-    }
-}
-
 impl serde::Serialize for NoqaCode {
    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
    where
--- a/crates/ruff_linter/src/cst/matchers.rs
+++ b/crates/ruff_linter/src/cst/matchers.rs
@@ -3,8 +3,8 @@ use anyhow::{Result, bail};
 use libcst_native::{
    Arg, Attribute, Call, Comparison, CompoundStatement, Dict, Expression, FormattedString,
    FormattedStringContent, FormattedStringExpression, FunctionDef, GeneratorExp, If, Import,
-    ImportAlias, ImportFrom, ImportNames, IndentedBlock, Lambda, ListComp, Module, SmallStatement,
-    Statement, Suite, Tuple, With,
+    ImportAlias, ImportFrom, ImportNames, IndentedBlock, Lambda, ListComp, Module, Name,
+    SmallStatement, Statement, Suite, Tuple, With,
 };
 use ruff_python_codegen::Stylist;

@@ -104,6 +104,14 @@ pub(crate) fn match_attribute<'a, 'b>(
    }
 }

+pub(crate) fn match_name<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Name<'b>> {
+    if let Expression::Name(name) = expression {
+        Ok(name)
+    } else {
+        bail!("Expected Expression::Name")
+    }
+}
+
 pub(crate) fn match_arg<'a, 'b>(call: &'a Call<'b>) -> Result<&'a Arg<'b>> {
    if let Some(arg) = call.args.first() {
        Ok(arg)
--- a/crates/ruff_linter/src/fix/edits.rs
+++ b/crates/ruff_linter/src/fix/edits.rs
@@ -618,8 +618,7 @@ mod tests {
    use crate::fix::edits::{
        add_to_dunder_all, make_redundant_alias, next_stmt_break, trailing_semicolon,
    };
-    use crate::message::diagnostic_from_violation;
-    use crate::{Edit, Fix, Locator};
+    use crate::{Edit, Fix, Locator, OldDiagnostic};

    /// Parse the given source using [`Mode::Module`] and return the first statement.
    fn parse_first_stmt(source: &str) -> Result<Stmt> {
@@ -750,16 +749,15 @@ x = 1 \
        let diag = {
            use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
            let mut iter = edits.into_iter();
-            let mut diagnostic = diagnostic_from_violation(
+            OldDiagnostic::new(
                MissingNewlineAtEndOfFile, // The choice of rule here is arbitrary.
                TextRange::default(),
                &SourceFileBuilder::new("<filename>", "<code>").finish(),
-            );
-            diagnostic.set_fix(Fix::safe_edits(
+            )
+            .with_fix(Fix::safe_edits(
                iter.next().ok_or(anyhow!("expected edits nonempty"))?,
                iter,
-            ));
-            diagnostic
+            ))
        };
        assert_eq!(apply_fixes([diag].iter(), &locator).code, expect);
        Ok(())
--- a/crates/ruff_linter/src/fix/mod.rs
+++ b/crates/ruff_linter/src/fix/mod.rs
@@ -3,12 +3,12 @@ use std::collections::BTreeSet;
 use itertools::Itertools;
 use rustc_hash::FxHashSet;

-use ruff_db::diagnostic::Diagnostic;
 use ruff_diagnostics::{IsolationLevel, SourceMap};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};

 use crate::Locator;
 use crate::linter::FixTable;
+use crate::message::OldDiagnostic;
 use crate::registry::Rule;
 use crate::settings::types::UnsafeFixes;
 use crate::{Edit, Fix};
@@ -28,7 +28,7 @@ pub(crate) struct FixResult {

 /// Fix errors in a file, and write the fixed source code to disk.
 pub(crate) fn fix_file(
-    diagnostics: &[Diagnostic],
+    diagnostics: &[OldDiagnostic],
    locator: &Locator,
    unsafe_fixes: UnsafeFixes,
 ) -> Option<FixResult> {
@@ -52,7 +52,7 @@ pub(crate) fn fix_file(

 /// Apply a series of fixes.
 fn apply_fixes<'a>(
-    diagnostics: impl Iterator<Item = &'a Diagnostic>,
+    diagnostics: impl Iterator<Item = &'a OldDiagnostic>,
    locator: &'a Locator<'a>,
 ) -> FixResult {
    let mut output = String::with_capacity(locator.len());
@@ -63,7 +63,7 @@ fn apply_fixes<'a>(
    let mut source_map = SourceMap::default();

    for (code, name, fix) in diagnostics
-        .filter_map(|msg| msg.secondary_code().map(|code| (code, msg.name(), msg)))
+        .filter_map(|msg| msg.noqa_code().map(|code| (code, msg.name(), msg)))
        .filter_map(|(code, name, diagnostic)| diagnostic.fix().map(|fix| (code, name, fix)))
        .sorted_by(|(_, name1, fix1), (_, name2, fix2)| cmp_fix(name1, name2, fix1, fix2))
    {
@@ -173,27 +173,25 @@ mod tests {
    use ruff_text_size::{Ranged, TextSize};

    use crate::Locator;
+    use crate::OldDiagnostic;
    use crate::fix::{FixResult, apply_fixes};
-    use crate::message::diagnostic_from_violation;
    use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
    use crate::{Edit, Fix};
-    use ruff_db::diagnostic::Diagnostic;

    fn create_diagnostics(
        filename: &str,
        source: &str,
        edit: impl IntoIterator<Item = Edit>,
-    ) -> Vec<Diagnostic> {
+    ) -> Vec<OldDiagnostic> {
        edit.into_iter()
            .map(|edit| {
                // The choice of rule here is arbitrary.
-                let mut diagnostic = diagnostic_from_violation(
+                let diagnostic = OldDiagnostic::new(
                    MissingNewlineAtEndOfFile,
                    edit.range(),
                    &SourceFileBuilder::new(filename, source).finish(),
                );
-                diagnostic.set_fix(Fix::safe_edit(edit));
-                diagnostic
+                diagnostic.with_fix(Fix::safe_edit(edit))
            })
            .collect()
    }
--- a/crates/ruff_linter/src/lib.rs
+++ b/crates/ruff_linter/src/lib.rs
@@ -14,6 +14,7 @@ pub use rule_selector::RuleSelector;
 pub use rule_selector::clap_completion::RuleSelectorParser;
 pub use rules::pycodestyle::rules::IOError;

+pub use message::OldDiagnostic;
 pub(crate) use ruff_diagnostics::{Applicability, Edit, Fix};
 pub use violation::{AlwaysFixableViolation, FixAvailability, Violation, ViolationMetadata};

--- a/Show More
+++ b/Show More