convert to structs

Move SARIF rendering to ruff_db Summary -- This is another mostly-straightforward JSON-based output format. In the first commit, I converted to using actual structs. I made a couple of tweaks to the format: - The `text` field of `SarifRule::full_description` was implicitly an `Option` before, but serializing this as `null` is invalid based on the [validator]. I made this an `Option<MessageString>` (`MessageString` is a shortened form of `multiformatMessageString`, which is what the schema calls this type) and skip serializing it if it's `None`, which validates against the schema. - `SarifResult::code` was explicitly an `Option<&'a SecondaryCode>`, which was also invalid according to the schema. I made it a required field and fell back on the lint name as in some of the other recent formats. This currently only affects syntax errors in Ruff. In the second commit I moved the code to `ruff_db` and updated the Ruff-specific `expect` calls. Test Plan -- Existing tests ported to `ruff_db` [validator]: https://www.jsonschemavalidator.net/s/GlhhhHQ7
2025-07-15 22:00:19 -04:00
3703 changed files with 82808 additions and 152343 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,10 +19,6 @@

 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ruff_db/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -49,7 +49,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build sdist"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          command: sdist
          args: --out dist
@@ -79,7 +79,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: x86_64
          args: --release --locked --out dist
@@ -121,7 +121,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: aarch64
          args: --release --locked --out dist
@@ -177,7 +177,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          args: --release --locked --out dist
@@ -230,7 +230,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -292,8 +292,6 @@ jobs:
            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
          - target: arm-unknown-linux-musleabihf
            arch: arm
-          - target: riscv64gc-unknown-linux-gnu
-            arch: riscv64

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -306,7 +304,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          manylinux: auto
@@ -321,7 +319,7 @@ jobs:
          githubToken: ${{ github.token }}
          install: |
            apt-get update
-            apt-get install -y --no-install-recommends python3 python3-pip libatomic1
+            apt-get install -y --no-install-recommends python3 python3-pip
            pip3 install -U pip
          run: |
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
@@ -372,7 +370,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
@@ -437,7 +435,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -40,7 +40,7 @@ jobs:

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

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -63,7 +63,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: ${{ env.RUFF_BASE_IMG }}
          # Defining this makes sure the org.opencontainers.image.version OCI label becomes the actual release version and not the branch name
@@ -123,7 +123,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
          images: ${{ env.RUFF_BASE_IMG }}
          # Order is on purpose such that the label org.opencontainers.image.version has the first pattern with the full version
@@ -131,7 +131,7 @@ jobs:
            type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
            type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
    steps:
      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -219,7 +219,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        # ghcr.io prefers index level annotations
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -266,7 +266,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
        with:
@@ -276,7 +276,7 @@ jobs:
            type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
            type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,8 +38,7 @@ jobs:
      fuzz: ${{ steps.check_fuzzer.outputs.changed }}
      # Flag that is set to "true" when code related to ty changes.
      ty: ${{ steps.check_ty.outputs.changed }}
-      # Flag that is set to "true" when code related to the py-fuzzer folder changes.
-      py-fuzzer: ${{ steps.check_py_fuzzer.outputs.changed }}
+
      # Flag that is set to "true" when code related to the playground changes.
      playground: ${{ steps.check_playground.outputs.changed }}
    steps:
@@ -69,6 +68,7 @@ jobs:
            ':crates/ruff_text_size/**' \
            ':crates/ruff_python_ast/**' \
            ':crates/ruff_python_parser/**' \
+            ':python/py-fuzzer/**' \
            ':.github/workflows/ci.yaml' \
          ; then
              echo "changed=false" >> "$GITHUB_OUTPUT"
@@ -138,29 +138,17 @@ jobs:
              echo "changed=true" >> "$GITHUB_OUTPUT"
          fi

-      - name: Check if the py-fuzzer code changed
-        id: check_py_fuzzer
-        env:
-          MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
-        run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py_fuzzer/**' \
-          ; then
-              echo "changed=false" >> "$GITHUB_OUTPUT"
-          else
-              echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
      - name: Check if there was any code related change
        id: check_code
        env:
          MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
        run: |
-          # NOTE: Do not exclude all Markdown files here, but rather use
-          # specific exclude patterns like 'docs/**'), because tests for
-          # 'ty' are written in Markdown.
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- \
+          if git diff --quiet "${MERGE_BASE}...HEAD" -- ':**' \
+            ':!**/*.md' \
+            ':crates/ty_python_semantic/resources/mdtest/**/*.md' \
            ':!docs/**' \
            ':!assets/**' \
+            ':.github/workflows/ci.yaml' \
          ; then
              echo "changed=false" >> "$GITHUB_OUTPUT"
          else
@@ -250,13 +238,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -308,13 +296,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -337,7 +325,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -393,7 +381,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -418,7 +406,7 @@ jobs:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Build tests"
        shell: bash
        env:
@@ -441,7 +429,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
+        uses: cargo-bins/cargo-binstall@8aac5aa2bf0dfaa2863eccad9f43c68fe40e5ec8 # v1.14.1
        with:
          tool: cargo-fuzz@0.11.2
      - name: "Install cargo-fuzz"
@@ -455,7 +443,7 @@ jobs:
    needs:
      - cargo-test-linux
      - determine_changes
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.parser == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && needs.determine_changes.outputs.parser == 'true' }}
    timeout-minutes: 20
    env:
      FORCE_COLOR: 1
@@ -463,7 +451,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -645,7 +633,7 @@ jobs:
      - cargo-test-linux
      - determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.ty == 'true' }}
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -664,7 +652,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -694,7 +682,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
+      - uses: cargo-bins/cargo-binstall@8aac5aa2bf0dfaa2863eccad9f43c68fe40e5ec8 # v1.14.1
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -715,7 +703,7 @@ jobs:
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
        with:
          args: --out dist
      - name: "Test wheel"
@@ -734,13 +722,13 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
      - name: "Cache pre-commit"
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
        with:
          path: ~/.cache/pre-commit
          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -777,7 +765,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -909,13 +897,13 @@ jobs:
          persist-credentials: false

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

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-codspeed

@@ -923,7 +911,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
+        uses: CodSpeedHQ/action@c28fe9fbe7d57a3da1b7834ae3761c1d8217612d # v3.7.0
        with:
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
@@ -942,13 +930,13 @@ jobs:
          persist-credentials: false

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

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-codspeed

@@ -956,7 +944,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
+        uses: CodSpeedHQ/action@c28fe9fbe7d57a3da1b7834ae3761c1d8217612d # v3.7.0
        with:
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,11 +34,11 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -11,7 +11,6 @@ on:
      - "crates/ruff_python_parser"
      - ".github/workflows/mypy_primer.yaml"
      - ".github/workflows/mypy_primer_comment.yaml"
-      - "scripts/mypy_primer.sh"
      - "Cargo.lock"
      - "!**.md"

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

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

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

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

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

--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels-*
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
@@ -124,19 +124,19 @@ jobs:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/
      - run: chmod +x ~/.cargo/bin/dist
      # Get all the local artifacts for the global tasks to use (for e.g. checksums)
      - name: Fetch local artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -175,19 +175,19 @@ jobs:
    outputs:
      val: ${{ steps.host.outputs.manifest }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/
      - run: chmod +x ~/.cargo/bin/dist
      # Fetch artifacts from scratch-storage
      - name: Fetch artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -251,13 +251,13 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
        with:
          persist-credentials: false
          submodules: recursive
      # Create a GitHub Release while uploading all files to it
      - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          pattern: artifacts-*
          path: artifacts
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -34,10 +34,6 @@ env:
  # and which all three workers push to.
  UPSTREAM_BRANCH: typeshedbot/sync-typeshed

-  # The path to the directory that contains the vendored typeshed stubs,
-  # relative to the root of the Ruff repository.
-  VENDORED_TYPESHED: crates/ty_vendored/vendor/typeshed
-
 jobs:
  # Sync typeshed stubs, and sync all docstrings available on Linux.
  # Push the changes to a new branch on the upstream repository.
@@ -65,23 +61,23 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: Sync typeshed stubs
        run: |
-          rm -rf "ruff/${VENDORED_TYPESHED}"
-          mkdir "ruff/${VENDORED_TYPESHED}"
-          cp typeshed/README.md "ruff/${VENDORED_TYPESHED}"
-          cp typeshed/LICENSE "ruff/${VENDORED_TYPESHED}"
+          rm -rf ruff/crates/ty_vendored/vendor/typeshed
+          mkdir ruff/crates/ty_vendored/vendor/typeshed
+          cp typeshed/README.md ruff/crates/ty_vendored/vendor/typeshed
+          cp typeshed/LICENSE ruff/crates/ty_vendored/vendor/typeshed

          # The pyproject.toml file is needed by a later job for the black configuration.
          # It's deleted before creating the PR.
-          cp typeshed/pyproject.toml "ruff/${VENDORED_TYPESHED}"
+          cp typeshed/pyproject.toml ruff/crates/ty_vendored/vendor/typeshed

-          cp -r typeshed/stdlib "ruff/${VENDORED_TYPESHED}/stdlib"
-          rm -rf "ruff/${VENDORED_TYPESHED}/stdlib/@tests"
-          git -C typeshed rev-parse HEAD > "ruff/${VENDORED_TYPESHED}/source_commit.txt"
+          cp -r typeshed/stdlib ruff/crates/ty_vendored/vendor/typeshed/stdlib
+          rm -rf ruff/crates/ty_vendored/vendor/typeshed/stdlib/@tests
+          git -C typeshed rev-parse HEAD > ruff/crates/ty_vendored/vendor/typeshed/source_commit.txt
          cd ruff
-          git checkout -b "${UPSTREAM_BRANCH}"
+          git checkout -b typeshedbot/sync-typeshed
          git add .
          git commit -m "Sync typeshed. Source commit: https://github.com/python/typeshed/commit/$(git -C ../typeshed rev-parse HEAD)" --allow-empty
      - name: Sync Linux docstrings
@@ -117,7 +113,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -155,7 +151,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -171,17 +167,17 @@ jobs:
          # consistent with the other typeshed stubs around them.
          # Typeshed formats code using black in their CI, so we just invoke
          # black on the stubs the same way that typeshed does.
-          uvx black "${VENDORED_TYPESHED}/stdlib" --config "${VENDORED_TYPESHED}/pyproject.toml" || true
+          uvx black crates/ty_vendored/vendor/typeshed/stdlib --config crates/ty_vendored/vendor/typeshed/pyproject.toml || true
          git commit -am "Format codemodded docstrings" --allow-empty

-          rm "${VENDORED_TYPESHED}/pyproject.toml"
+          rm crates/ty_vendored/vendor/typeshed/pyproject.toml
          git commit -am "Remove pyproject.toml file"

          git push
      - name: Create a PR
        if: ${{ success() }}
        run: |
-          gh pr list --repo "${GITHUB_REPOSITORY}" --head "${UPSTREAM_BRANCH}" --json id --jq length | grep 1 && exit 0 # exit if there is existing pr
+          gh pr list --repo "$GITHUB_REPOSITORY" --head typeshedbot/sync-typeshed --json id --jq length | grep 1 && exit 0 # exit if there is existing pr
          gh pr create --title "[ty] Sync vendored typeshed stubs" --body "Close and reopen this PR to trigger CI" --label "ty"

  create-issue-on-failure:
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -33,7 +33,7 @@ jobs:
          persist-credentials: false

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

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
@@ -64,7 +64,7 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@f0eec0e549684d8e1d7b8bc3e351202124b63bda"

          ecosystem-analyzer \
            --repository ruff \
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -29,7 +29,7 @@ jobs:
          persist-credentials: false

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

      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
@@ -49,7 +49,7 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@f0eec0e549684d8e1d7b8bc3e351202124b63bda"

          ecosystem-analyzer \
            --verbose \
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -1,116 +0,0 @@
-name: Run typing conformance
-
-permissions: {}
-
-on:
-  pull_request:
-    paths:
-      - "crates/ty*/**"
-      - "crates/ruff_db"
-      - "crates/ruff_python_ast"
-      - "crates/ruff_python_parser"
-      - ".github/workflows/typing_conformance.yaml"
-      - ".github/workflows/typing_conformance_comment.yaml"
-      - "Cargo.lock"
-      - "!**.md"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-  RUST_BACKTRACE: 1
-  CONFORMANCE_SUITE_COMMIT: d4f39b27a4a47aac8b6d4019e1b0b5b3156fabdc
-
-jobs:
-  typing_conformance:
-    name: Compute diagnostic diff
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: python/typing
-          ref: ${{ env.CONFORMANCE_SUITE_COMMIT }}
-          path: typing
-          persist-credentials: false
-
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Compute diagnostic diff
-        shell: bash
-        env:
-          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
-          TY_MAX_PARALLELISM: 1
-        run: |
-          RUFF_DIR="$GITHUB_WORKSPACE/ruff"
-
-          # Build the executable for the old and new commit
-          (
-            cd ruff
-
-            echo "new commit"
-            git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
-            cargo build --bin ty
-            mv target/debug/ty ty-new
-
-            MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
-            git checkout -b old_commit "$MERGE_BASE"
-            echo "old commit (merge base)"
-            git rev-list --format=%s --max-count=1 old_commit
-            cargo build --bin ty
-            mv target/debug/ty ty-old
-          )
-
-          (
-            cd typing/conformance/tests
-
-            echo "Running ty on old commit (merge base)"
-            "$RUFF_DIR/ty-old" check --color=never --output-format=concise . > "$GITHUB_WORKSPACE/old-output.txt" 2>&1 || true
-
-            echo "Running ty on new commit"
-            "$RUFF_DIR/ty-new" check --color=never --output-format=concise . > "$GITHUB_WORKSPACE/new-output.txt" 2>&1 || true
-          )
-
-          if ! diff -u old-output.txt new-output.txt > typing_conformance_diagnostics.diff; then
-            echo "Differences found between base and PR"
-          else
-            echo "No differences found"
-            touch typing_conformance_diagnostics.diff
-          fi
-
-          echo ${{ github.event.number }} > pr-number
-          echo "${CONFORMANCE_SUITE_COMMIT}" > conformance-suite-commit
-
-      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: typing_conformance_diagnostics_diff
-          path: typing_conformance_diagnostics.diff
-
-      - name: Upload pr-number
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: pr-number
-          path: pr-number
-
-      - name: Upload conformance suite commit
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: conformance-suite-commit
-          path: conformance-suite-commit
--- a/.github/workflows/typing_conformance_comment.yaml
+++ b/.github/workflows/typing_conformance_comment.yaml
@@ -1,112 +0,0 @@
-name: PR comment (typing_conformance)
-
-on: # zizmor: ignore[dangerous-triggers]
-  workflow_run:
-    workflows: [Run typing conformance]
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      workflow_run_id:
-        description: The typing_conformance workflow that triggers the workflow run
-        required: true
-
-jobs:
-  comment:
-    runs-on: ubuntu-24.04
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: Download PR number
-        with:
-          name: pr-number
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - name: Parse pull request number
-        id: pr-number
-        run: |
-          if [[ -f pr-number ]]
-          then
-            echo "pr-number=$(<pr-number)" >> "$GITHUB_OUTPUT"
-          fi
-
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: Download typing conformance suite commit
-        with:
-          name: conformance-suite-commit
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: "Download typing_conformance results"
-        id: download-typing_conformance_diff
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: typing_conformance_diagnostics_diff
-          workflow: typing_conformance.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/typing_conformance_diagnostics_diff
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - name: Generate comment content
-        id: generate-comment
-        if: ${{ steps.download-typing_conformance_diff.outputs.found_artifact == 'true' }}
-        run: |
-          # Guard against malicious typing_conformance results that symlink to a secret
-          # file on this runner
-          if [[ -L pr/typing_conformance_diagnostics_diff/typing_conformance_diagnostics.diff ]]
-          then
-              echo "Error: typing_conformance_diagnostics.diff cannot be a symlink"
-              exit 1
-          fi
-
-          # Note this identifier is used to find the comment to update on
-          # subsequent runs
-          echo '<!-- generated-comment typing_conformance_diagnostics_diff -->' >> comment.txt
-
-          if [[ -f conformance-suite-commit ]]
-          then
-            echo "## Diagnostic diff on [typing conformance tests](https://github.com/python/typing/tree/$(<conformance-suite-commit)/conformance)" >> comment.txt
-          else
-            echo "conformance-suite-commit file not found"
-            echo "## Diagnostic diff on typing conformance tests" >> comment.txt
-          fi
-
-          if [ -s "pr/typing_conformance_diagnostics_diff/typing_conformance_diagnostics.diff" ]; then
-            echo '<details>' >> comment.txt
-            echo '<summary>Changes were detected when running ty on typing conformance tests</summary>' >> comment.txt
-            echo '' >> comment.txt
-            echo '```diff' >> comment.txt
-            cat pr/typing_conformance_diagnostics_diff/typing_conformance_diagnostics.diff >> comment.txt
-            echo '```' >> comment.txt
-            echo '</details>' >> comment.txt
-          else
-            echo 'No changes detected when running ty on typing conformance tests ✅' >> comment.txt
-          fi
-
-          echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
-          cat comment.txt >> "$GITHUB_OUTPUT"
-          echo 'EOF' >> "$GITHUB_OUTPUT"
-
-      - name: Find existing comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
-        if: steps.generate-comment.outcome == 'success'
-        id: find-comment
-        with:
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          comment-author: "github-actions[bot]"
-          body-includes: "<!-- generated-comment typing_conformance_diagnostics_diff -->"
-
-      - name: Create or update comment
-        if: steps.find-comment.outcome == 'success'
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
-        with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          body-path: comment.txt
-          edit-mode: replace
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -81,10 +81,10 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.3
    hooks:
      - id: ruff-format
-      - id: ruff-check
+      - id: ruff
        args: [--fix, --exit-non-zero-on-fix]
        types_or: [python, pyi]
        require_serial: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,191 +1,5 @@
 # Changelog

-## 0.12.10
-
-### Preview features
-
- \[`flake8-simplify`\] Implement fix for `maxsplit` without separator (`SIM905`) ([#19851](https://github.com/astral-sh/ruff/pull/19851))
- \[`flake8-use-pathlib`\] Add fixes for `PTH102` and `PTH103` ([#19514](https://github.com/astral-sh/ruff/pull/19514))
-
-### Bug fixes
-
- \[`isort`\] Handle multiple continuation lines after module docstring (`I002`) ([#19818](https://github.com/astral-sh/ruff/pull/19818))
- \[`pyupgrade`\] Avoid reporting `__future__` features as unnecessary when they are used (`UP010`) ([#19769](https://github.com/astral-sh/ruff/pull/19769))
- \[`pyupgrade`\] Handle nested `Optional`s (`UP045`) ([#19770](https://github.com/astral-sh/ruff/pull/19770))
-
-### Rule changes
-
- \[`pycodestyle`\] Make `E731` fix unsafe instead of display-only for class assignments ([#19700](https://github.com/astral-sh/ruff/pull/19700))
- \[`pyflakes`\] Add secondary annotation showing previous definition (`F811`) ([#19900](https://github.com/astral-sh/ruff/pull/19900))
-
-### Documentation
-
- Fix description of global config file discovery strategy ([#19188](https://github.com/astral-sh/ruff/pull/19188))
- Update outdated links to <https://typing.python.org/en/latest/source/stubs.html> ([#19992](https://github.com/astral-sh/ruff/pull/19992))
- \[`flake8-annotations`\] Remove unused import in example (`ANN401`) ([#20000](https://github.com/astral-sh/ruff/pull/20000))
-
-## 0.12.9
-
-### Preview features
-
- \[`airflow`\] Add check for `airflow.secrets.cache.SecretCache` (`AIR301`) ([#17707](https://github.com/astral-sh/ruff/pull/17707))
- \[`ruff`\] Offer a safe fix for multi-digit zeros (`RUF064`) ([#19847](https://github.com/astral-sh/ruff/pull/19847))
-
-### Bug fixes
-
- \[`flake8-blind-except`\] Fix `BLE001` false-positive on `raise ... from None` ([#19755](https://github.com/astral-sh/ruff/pull/19755))
- \[`flake8-comprehensions`\] Fix false positive for `C420` with attribute, subscript, or slice assignment targets ([#19513](https://github.com/astral-sh/ruff/pull/19513))
- \[`flake8-simplify`\] Fix handling of U+001C..U+001F whitespace (`SIM905`) ([#19849](https://github.com/astral-sh/ruff/pull/19849))
-
-### Rule changes
-
- \[`pylint`\] Use lowercase hex characters to match the formatter (`PLE2513`) ([#19808](https://github.com/astral-sh/ruff/pull/19808))
-
-### Documentation
-
- Fix `lint.future-annotations` link ([#19876](https://github.com/astral-sh/ruff/pull/19876))
-
-### Other changes
-
- Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))
-
- Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))
-
- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))
-
-    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):
-
-    ```diff
-    -unused.py:8:19: F401 [*] `pathlib` imported but unused
-    +F401 [*] `pathlib` imported but unused
-    +  --> unused.py:8:19
-        |
-      7 | # Unused, _not_ marked as required (due to the alias).
-      8 | import pathlib as non_alias
-    -   |                   ^^^^^^^^^ F401
-    +   |                   ^^^^^^^^^
-      9 |
-     10 | # Unused, marked as required.
-        |
-    -   = help: Remove unused import: `pathlib`
-    +help: Remove unused import: `pathlib`
-    ```
-
-    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
-
-## 0.12.8
-
-### Preview features
-
- \[`flake8-use-pathlib`\] Expand `PTH201` to check all `PurePath` subclasses ([#19440](https://github.com/astral-sh/ruff/pull/19440))
-
-### Bug fixes
-
- \[`flake8-blind-except`\] Change `BLE001` to correctly parse exception tuples ([#19747](https://github.com/astral-sh/ruff/pull/19747))
- \[`flake8-errmsg`\] Exclude `typing.cast` from `EM101` ([#19656](https://github.com/astral-sh/ruff/pull/19656))
- \[`flake8-simplify`\] Fix raw string handling in `SIM905` for embedded quotes ([#19591](https://github.com/astral-sh/ruff/pull/19591))
- \[`flake8-import-conventions`\] Avoid false positives for NFKC-normalized `__debug__` import aliases in `ICN001` ([#19411](https://github.com/astral-sh/ruff/pull/19411))
- \[`isort`\] Fix syntax error after docstring ending with backslash (`I002`) ([#19505](https://github.com/astral-sh/ruff/pull/19505))
- \[`pylint`\] Mark `PLC0207` fixes as unsafe when `*args` unpacking is present ([#19679](https://github.com/astral-sh/ruff/pull/19679))
- \[`pyupgrade`\] Prevent infinite loop with `I002` (`UP010`, `UP035`) ([#19413](https://github.com/astral-sh/ruff/pull/19413))
- \[`ruff`\] Parenthesize generator expressions in f-strings (`RUF010`) ([#19434](https://github.com/astral-sh/ruff/pull/19434))
-
-### Rule changes
-
- \[`eradicate`\] Don't flag `pyrefly` pragmas as unused code (`ERA001`) ([#19731](https://github.com/astral-sh/ruff/pull/19731))
-
-### Documentation
-
- Replace "associative" with "commutative" in docs for `RUF036` ([#19706](https://github.com/astral-sh/ruff/pull/19706))
- Fix copy and line separator colors in dark mode ([#19630](https://github.com/astral-sh/ruff/pull/19630))
- Fix link to `typing` documentation ([#19648](https://github.com/astral-sh/ruff/pull/19648))
- \[`refurb`\] Make more examples error out-of-the-box ([#19695](https://github.com/astral-sh/ruff/pull/19695),[#19673](https://github.com/astral-sh/ruff/pull/19673),[#19672](https://github.com/astral-sh/ruff/pull/19672))
-
-### Other changes
-
- Include column numbers in GitLab output format ([#19708](https://github.com/astral-sh/ruff/pull/19708))
- Always expand tabs to four spaces in diagnostics ([#19618](https://github.com/astral-sh/ruff/pull/19618))
- Update pre-commit's `ruff` id ([#19654](https://github.com/astral-sh/ruff/pull/19654))
-
-## 0.12.7
-
-This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
-
-## 0.12.6
-
-### Preview features
-
- \[`flake8-commas`\] Add support for trailing comma checks in type parameter lists (`COM812`, `COM819`) ([#19390](https://github.com/astral-sh/ruff/pull/19390))
- \[`pylint`\] Implement auto-fix for `missing-maxsplit-arg` (`PLC0207`) ([#19387](https://github.com/astral-sh/ruff/pull/19387))
- \[`ruff`\] Offer fixes for `RUF039` in more cases ([#19065](https://github.com/astral-sh/ruff/pull/19065))
-
-### Bug fixes
-
- Support `.pyi` files in ruff analyze graph ([#19611](https://github.com/astral-sh/ruff/pull/19611))
- \[`flake8-pyi`\] Preserve inline comment in ellipsis removal (`PYI013`) ([#19399](https://github.com/astral-sh/ruff/pull/19399))
- \[`perflint`\] Ignore rule if target is `global` or `nonlocal` (`PERF401`) ([#19539](https://github.com/astral-sh/ruff/pull/19539))
- \[`pyupgrade`\] Fix `UP030` to avoid modifying double curly braces in format strings ([#19378](https://github.com/astral-sh/ruff/pull/19378))
- \[`refurb`\] Ignore decorated functions for `FURB118` ([#19339](https://github.com/astral-sh/ruff/pull/19339))
- \[`refurb`\] Mark `int` and `bool` cases for `Decimal.from_float` as safe fixes (`FURB164`) ([#19468](https://github.com/astral-sh/ruff/pull/19468))
- \[`ruff`\] Fix `RUF033` for named default expressions ([#19115](https://github.com/astral-sh/ruff/pull/19115))
-
-### Rule changes
-
- \[`flake8-blind-except`\] Change `BLE001` to permit `logging.critical(..., exc_info=True)` ([#19520](https://github.com/astral-sh/ruff/pull/19520))
-
-### Performance
-
- Add support for specifying minimum dots in detected string imports ([#19538](https://github.com/astral-sh/ruff/pull/19538))
-
-## 0.12.5
-
-### Preview features
-
- \[`flake8-use-pathlib`\] Add autofix for `PTH101`, `PTH104`, `PTH105`, `PTH121` ([#19404](https://github.com/astral-sh/ruff/pull/19404))
- \[`ruff`\] Support byte strings (`RUF055`) ([#18926](https://github.com/astral-sh/ruff/pull/18926))
-
-### Bug fixes
-
- Fix `unreachable` panic in parser ([#19183](https://github.com/astral-sh/ruff/pull/19183))
- \[`flake8-pyi`\] Skip fix if all `Union` members are `None` (`PYI016`) ([#19416](https://github.com/astral-sh/ruff/pull/19416))
- \[`perflint`\] Parenthesize generator expressions (`PERF401`) ([#19325](https://github.com/astral-sh/ruff/pull/19325))
- \[`pylint`\] Handle empty comments after line continuation (`PLR2044`) ([#19405](https://github.com/astral-sh/ruff/pull/19405))
-
-### Rule changes
-
- \[`pep8-naming`\] Fix `N802` false positives for `CGIHTTPRequestHandler` and `SimpleHTTPRequestHandler` ([#19432](https://github.com/astral-sh/ruff/pull/19432))
-
-## 0.12.4
-
-### Preview features
-
- \[`flake8-type-checking`, `pyupgrade`, `ruff`\] Add `from __future__ import annotations` when it would allow new fixes (`TC001`, `TC002`, `TC003`, `UP037`, `RUF013`) ([#19100](https://github.com/astral-sh/ruff/pull/19100))
- \[`flake8-use-pathlib`\] Add autofix for `PTH109` ([#19245](https://github.com/astral-sh/ruff/pull/19245))
- \[`pylint`\] Detect indirect `pathlib.Path` usages for `unspecified-encoding` (`PLW1514`) ([#19304](https://github.com/astral-sh/ruff/pull/19304))
-
-### Bug fixes
-
- \[`flake8-bugbear`\] Fix `B017` false negatives for keyword exception arguments ([#19217](https://github.com/astral-sh/ruff/pull/19217))
- \[`flake8-use-pathlib`\] Fix false negative on direct `Path()` instantiation (`PTH210`) ([#19388](https://github.com/astral-sh/ruff/pull/19388))
- \[`flake8-django`\] Fix `DJ008` false positive for abstract models with type-annotated `abstract` field ([#19221](https://github.com/astral-sh/ruff/pull/19221))
- \[`isort`\] Fix `I002` import insertion after docstring with multiple string statements ([#19222](https://github.com/astral-sh/ruff/pull/19222))
- \[`isort`\] Treat form feed as valid whitespace before a semicolon ([#19343](https://github.com/astral-sh/ruff/pull/19343))
- \[`pydoclint`\] Fix `SyntaxError` from fixes with line continuations (`D201`, `D202`) ([#19246](https://github.com/astral-sh/ruff/pull/19246))
- \[`refurb`\] `FURB164` fix should validate arguments and should usually be marked unsafe ([#19136](https://github.com/astral-sh/ruff/pull/19136))
-
-### Rule changes
-
- \[`flake8-use-pathlib`\] Skip single dots for `invalid-pathlib-with-suffix` (`PTH210`) on versions >= 3.14 ([#19331](https://github.com/astral-sh/ruff/pull/19331))
- \[`pep8_naming`\] Avoid false positives on standard library functions with uppercase names (`N802`) ([#18907](https://github.com/astral-sh/ruff/pull/18907))
- \[`pycodestyle`\] Handle brace escapes for t-strings in logical lines ([#19358](https://github.com/astral-sh/ruff/pull/19358))
- \[`pylint`\] Extend invalid string character rules to include t-strings ([#19355](https://github.com/astral-sh/ruff/pull/19355))
- \[`ruff`\] Allow `strict` kwarg when checking for `starmap-zip` (`RUF058`) in Python 3.14+ ([#19333](https://github.com/astral-sh/ruff/pull/19333))
-
-### Documentation
-
- \[`flake8-type-checking`\] Make `TC010` docs example more realistic ([#19356](https://github.com/astral-sh/ruff/pull/19356))
- Make more documentation examples error out-of-the-box ([#19288](https://github.com/astral-sh/ruff/pull/19288),[#19272](https://github.com/astral-sh/ruff/pull/19272),[#19291](https://github.com/astral-sh/ruff/pull/19291),[#19296](https://github.com/astral-sh/ruff/pull/19296),[#19292](https://github.com/astral-sh/ruff/pull/19292),[#19295](https://github.com/astral-sh/ruff/pull/19295),[#19297](https://github.com/astral-sh/ruff/pull/19297),[#19309](https://github.com/astral-sh/ruff/pull/19309))
-
 ## 0.12.3

 ### Preview features
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -266,13 +266,6 @@ Finally, regenerate the documentation and generated code with `cargo dev generat

 ## MkDocs

-> [!NOTE]
->
-> The documentation uses Material for MkDocs Insiders, which is closed-source software.
-> This means only members of the Astral organization can preview the documentation exactly as it
-> will appear in production.
-> Outside contributors can still preview the documentation, but there will be some differences. Consult [the Material for MkDocs documentation](https://squidfunk.github.io/mkdocs-material/insiders/benefits/#features) for which features are exclusively available in the insiders version.
-
 To preview any changes to the documentation locally:

 1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.86"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -23,7 +23,6 @@ ruff_graph = { path = "crates/ruff_graph" }
 ruff_index = { path = "crates/ruff_index" }
 ruff_linter = { path = "crates/ruff_linter" }
 ruff_macros = { path = "crates/ruff_macros" }
-ruff_memory_usage = { path = "crates/ruff_memory_usage" }
 ruff_notebook = { path = "crates/ruff_notebook" }
 ruff_options_metadata = { path = "crates/ruff_options_metadata" }
 ruff_python_ast = { path = "crates/ruff_python_ast" }
@@ -41,7 +40,6 @@ ruff_text_size = { path = "crates/ruff_text_size" }
 ruff_workspace = { path = "crates/ruff_workspace" }

 ty = { path = "crates/ty" }
-ty_combine = { path = "crates/ty_combine" }
 ty_ide = { path = "crates/ty_ide" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
@@ -59,9 +57,6 @@ assert_fs = { version = "1.1.0" }
 argfile = { version = "0.2.0" }
 bincode = { version = "2.0.0" }
 bitflags = { version = "2.5.0" }
-bitvec = { version = "1.0.1", default-features = false, features = [
-    "alloc",
-] }
 bstr = { version = "1.9.1" }
 cachedir = { version = "0.3.1" }
 camino = { version = "1.1.7" }
@@ -75,7 +70,7 @@ console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
 compact_str = "0.9.0"
-criterion = { version = "0.7.0", default-features = false }
+criterion = { version = "0.6.0", default-features = false }
 crossbeam = { version = "0.8.4" }
 dashmap = { version = "6.0.1" }
 dir-test = { version = "0.4.0" }
@@ -85,7 +80,7 @@ etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.6.2", features = [
+get-size2 = { version = "0.5.0", features = [
    "derive",
    "smallvec",
    "hashbrown",
@@ -143,12 +138,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
-    "compact_str",
-    "macros",
-    "salsa_unstable",
-    "inventory",
-] }
+salsa = { git = "https://github.com/salsa-rs/salsa", rev = "fc00eba89e5dcaa5edba51c41aa5f309b5cb126b" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
@@ -160,7 +150,7 @@ serde_with = { version = "3.6.0", default-features = false, features = [
 ] }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.4.0", features = ["inline"] }
-smallvec = { version = "1.13.2", features = ["union", "const_generics", "const_new"] }
+smallvec = { version = "1.13.2" }
 snapbox = { version = "0.6.0", features = [
    "diff",
    "term-svg",
@@ -215,8 +205,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [

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

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

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

 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.10
+  rev: v0.12.3
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/clippy.toml
+++ b/clippy.toml
@@ -24,20 +24,3 @@ ignore-interior-mutability = [
    # The expression is read-only.
    "ruff_python_ast::hashable::HashableExpr",
 ]
-
-disallowed-methods = [
-    { path = "std::env::var", reason = "Use System::env_var instead in ty crates" },
-    { path = "std::env::current_dir", reason = "Use System::current_directory instead in ty crates" },
-    { path = "std::fs::read_to_string", reason = "Use System::read_to_string instead in ty crates" },
-    { path = "std::fs::metadata", reason = "Use System::path_metadata instead in ty crates" },
-    { path = "std::fs::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "dunce::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "std::fs::read_dir", reason = "Use System::read_directory instead in ty crates" },
-    { path = "std::fs::write", reason = "Use WritableSystem::write_file instead in ty crates" },
-    { path = "std::fs::create_dir_all", reason = "Use WritableSystem::create_directory_all instead in ty crates" },
-    { path = "std::fs::File::create_new", reason = "Use WritableSystem::create_new_file instead in ty crates" },
-    # Path methods that have System trait equivalents
-    { path = "std::path::Path::exists", reason = "Use System::path_exists instead in ty crates" },
-    { path = "std::path::Path::is_dir", reason = "Use System::is_directory instead in ty crates" },
-    { path = "std::path::Path::is_file", reason = "Use System::is_file instead in ty crates" },
-]
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.10"
+version = "0.12.3"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -85,7 +85,7 @@ dist = true
 [target.'cfg(target_os = "windows")'.dependencies]
 mimalloc = { workspace = true }

-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
 tikv-jemallocator = { workspace = true }

 [lints]
--- a/crates/ruff/src/args.rs
+++ b/crates/ruff/src/args.rs
@@ -169,9 +169,6 @@ pub struct AnalyzeGraphCommand {
    /// Attempt to detect imports from string literals.
    #[clap(long)]
    detect_string_imports: bool,
-    /// The minimum number of dots in a string import to consider it a valid import.
-    #[clap(long)]
-    min_dots: Option<usize>,
    /// Enable preview mode. Use `--no-preview` to disable.
    #[arg(long, overrides_with("no_preview"))]
    preview: bool,
@@ -811,7 +808,6 @@ impl AnalyzeGraphCommand {
            } else {
                None
            },
-            string_imports_min_dots: self.min_dots,
            preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
            target_version: self.target_version.map(ast::PythonVersion::from),
            ..ExplicitConfigOverrides::default()
@@ -1309,7 +1305,6 @@ struct ExplicitConfigOverrides {
    show_fixes: Option<bool>,
    extension: Option<Vec<ExtensionPair>>,
    detect_string_imports: Option<bool>,
-    string_imports_min_dots: Option<usize>,
 }

 impl ConfigurationTransformer for ExplicitConfigOverrides {
@@ -1397,9 +1392,6 @@ impl ConfigurationTransformer for ExplicitConfigOverrides {
        if let Some(detect_string_imports) = &self.detect_string_imports {
            config.analyze.detect_string_imports = Some(*detect_string_imports);
        }
-        if let Some(string_imports_min_dots) = &self.string_imports_min_dots {
-            config.analyze.string_imports_min_dots = Some(*string_imports_min_dots);
-        }

        config
    }
--- a/crates/ruff/src/cache.rs
+++ b/crates/ruff/src/cache.rs
@@ -13,16 +13,25 @@ use itertools::Itertools;
 use log::{debug, error};
 use rayon::iter::ParallelIterator;
 use rayon::iter::{IntoParallelIterator, ParallelBridge};
+use ruff_linter::codes::Rule;
 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::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_workspace::Settings;
 use ruff_workspace::resolver::Resolver;

+use crate::diagnostics::Diagnostics;
+
 /// [`Path`] that is relative to the package root in [`PackageCache`].
 pub(crate) type RelativePath = Path;
 /// [`PathBuf`] that is relative to the package root in [`PackageCache`].
@@ -289,8 +298,13 @@ impl Cache {
        });
    }

-    pub(crate) fn set_linted(&self, path: RelativePathBuf, key: &FileCacheKey, yes: bool) {
-        self.update(path, key, ChangeData::Linted(yes));
+    pub(crate) fn update_lint(
+        &self,
+        path: RelativePathBuf,
+        key: &FileCacheKey,
+        data: LintCacheData,
+    ) {
+        self.update(path, key, ChangeData::Lint(data));
    }

    pub(crate) fn set_formatted(&self, path: RelativePathBuf, key: &FileCacheKey) {
@@ -325,15 +339,42 @@ pub(crate) struct FileCache {
 }

 impl FileCache {
-    /// Return whether or not the file in the cache was linted and found to have no diagnostics.
-    pub(crate) fn linted(&self) -> bool {
-        self.data.linted
+    /// Convert the file cache into `Diagnostics`, using `path` as file name.
+    pub(crate) fn to_diagnostics(&self, path: &Path) -> Option<Diagnostics> {
+        self.data.lint.as_ref().map(|lint| {
+            let diagnostics = if lint.messages.is_empty() {
+                Vec::new()
+            } else {
+                let file = SourceFileBuilder::new(path.to_string_lossy(), &*lint.source).finish();
+                lint.messages
+                    .iter()
+                    .map(|msg| {
+                        create_lint_diagnostic(
+                            &msg.body,
+                            msg.suggestion.as_ref(),
+                            msg.range,
+                            msg.fix.clone(),
+                            msg.parent,
+                            file.clone(),
+                            msg.noqa_offset,
+                            msg.rule,
+                        )
+                    })
+                    .collect()
+            };
+            let notebook_indexes = if let Some(notebook_index) = lint.notebook_index.as_ref() {
+                FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook_index.clone())])
+            } else {
+                FxHashMap::default()
+            };
+            Diagnostics::new(diagnostics, notebook_indexes)
+        })
    }
 }

 #[derive(Debug, Default, bincode::Decode, bincode::Encode)]
 struct FileCacheData {
-    linted: bool,
+    lint: Option<LintCacheData>,
    formatted: bool,
 }

@@ -369,6 +410,88 @@ pub(crate) fn init(path: &Path) -> Result<()> {
    Ok(())
 }

+#[derive(bincode::Decode, Debug, bincode::Encode, PartialEq)]
+pub(crate) struct LintCacheData {
+    /// Imports made.
+    // pub(super) imports: ImportMap,
+    /// Diagnostic messages.
+    pub(super) messages: Vec<CacheMessage>,
+    /// Source code of the file.
+    ///
+    /// # Notes
+    ///
+    /// This will be empty if `messages` is empty.
+    pub(super) source: String,
+    /// Notebook index if this file is a Jupyter Notebook.
+    #[bincode(with_serde)]
+    pub(super) notebook_index: Option<NotebookIndex>,
+}
+
+impl LintCacheData {
+    pub(crate) fn from_diagnostics(
+        diagnostics: &[Diagnostic],
+        notebook_index: Option<NotebookIndex>,
+    ) -> Self {
+        let source = if let Some(msg) = diagnostics.first() {
+            msg.expect_ruff_source_file().source_text().to_owned()
+        } else {
+            String::new() // No messages, no need to keep the source!
+        };
+
+        let messages = diagnostics
+            .iter()
+            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
+            // this also serves to filter them out, but we shouldn't be caching files with syntax
+            // errors anyway.
+            .filter_map(|msg| Some((msg.name().parse().ok()?, 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(),
+                    "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(),
+                    fix: msg.fix().cloned(),
+                    noqa_offset: msg.noqa_offset(),
+                }
+            })
+            .collect();
+
+        Self {
+            messages,
+            source,
+            notebook_index,
+        }
+    }
+}
+
+/// On disk representation of a diagnostic message.
+#[derive(bincode::Decode, Debug, bincode::Encode, PartialEq)]
+pub(super) struct CacheMessage {
+    /// The rule for the cached diagnostic.
+    #[bincode(with_serde)]
+    rule: Rule,
+    /// The message body to display to the user, to explain the diagnostic.
+    body: String,
+    /// The message to display to the user, to explain the suggested fix.
+    suggestion: Option<String>,
+    /// Range into the message's [`FileCache::source`].
+    #[bincode(with_serde)]
+    range: TextRange,
+    #[bincode(with_serde)]
+    parent: Option<TextSize>,
+    #[bincode(with_serde)]
+    fix: Option<Fix>,
+    #[bincode(with_serde)]
+    noqa_offset: Option<TextSize>,
+}
+
 pub(crate) trait PackageCaches {
    fn get(&self, package_root: &Path) -> Option<&Cache>;

@@ -456,15 +579,15 @@ struct Change {

 #[derive(Debug)]
 enum ChangeData {
-    Linted(bool),
+    Lint(LintCacheData),
    Formatted,
 }

 impl ChangeData {
    fn apply(self, data: &mut FileCacheData) {
        match self {
-            ChangeData::Linted(yes) => {
-                data.linted = yes;
+            ChangeData::Lint(new_lint) => {
+                data.lint = Some(new_lint);
            }
            ChangeData::Formatted => {
                data.formatted = true;
@@ -489,6 +612,7 @@ mod tests {
    use test_case::test_case;

    use ruff_cache::CACHE_DIR_NAME;
+    use ruff_db::diagnostic::Diagnostic;
    use ruff_linter::package::PackageRoot;
    use ruff_linter::settings::LinterSettings;
    use ruff_linter::settings::flags;
@@ -496,7 +620,7 @@ mod tests {
    use ruff_python_ast::{PySourceType, PythonVersion};
    use ruff_workspace::Settings;

-    use crate::cache::{self, ChangeData, FileCache, FileCacheData, FileCacheKey};
+    use crate::cache::{self, FileCache, FileCacheData, FileCacheKey};
    use crate::cache::{Cache, RelativePathBuf};
    use crate::commands::format::{FormatCommandError, FormatMode, FormatResult, format_path};
    use crate::diagnostics::{Diagnostics, lint_path};
@@ -523,7 +647,7 @@ mod tests {
        assert_eq!(cache.changes.lock().unwrap().len(), 0);

        let mut paths = Vec::new();
-        let mut paths_with_diagnostics = Vec::new();
+        let mut parse_errors = Vec::new();
        let mut expected_diagnostics = Diagnostics::default();
        for entry in fs::read_dir(&package_root).unwrap() {
            let entry = entry.unwrap();
@@ -547,7 +671,7 @@ mod tests {
                    continue;
                }

-                let mut diagnostics = lint_path(
+                let diagnostics = lint_path(
                    &path,
                    Some(PackageRoot::root(&package_root)),
                    &settings.linter,
@@ -557,15 +681,8 @@ mod tests {
                    UnsafeFixes::Enabled,
                )
                .unwrap();
-                if diagnostics.inner.is_empty() {
-                    // We won't load a notebook index from the cache for files without diagnostics,
-                    // so remove them from `expected_diagnostics` too. This allows us to keep the
-                    // full equality assertion below.
-                    diagnostics
-                        .notebook_indexes
-                        .remove(&path.to_string_lossy().to_string());
-                } else {
-                    paths_with_diagnostics.push(path.clone());
+                if diagnostics.inner.iter().any(Diagnostic::is_invalid_syntax) {
+                    parse_errors.push(path.clone());
                }
                paths.push(path);
                expected_diagnostics += diagnostics;
@@ -578,11 +695,11 @@ mod tests {
        let cache = Cache::open(package_root.clone(), &settings);
        assert_ne!(cache.package.files.len(), 0);

-        paths_with_diagnostics.sort();
+        parse_errors.sort();

        for path in &paths {
-            if paths_with_diagnostics.binary_search(path).is_ok() {
-                continue; // We don't cache files with diagnostics.
+            if parse_errors.binary_search(path).is_ok() {
+                continue; // We don't cache parsing errors.
            }

            let relative_path = cache.relative_path(path).unwrap();
@@ -616,7 +733,7 @@ mod tests {

    #[test]
    fn cache_adds_file_on_lint() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";

        let test_cache = TestCache::new("cache_adds_file_on_lint");
        let cache = test_cache.open();
@@ -640,7 +757,7 @@ mod tests {

    #[test]
    fn cache_adds_files_on_lint() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";

        let test_cache = TestCache::new("cache_adds_files_on_lint");
        let cache = test_cache.open();
@@ -665,40 +782,6 @@ mod tests {
        cache.persist().unwrap();
    }

-    #[test]
-    fn cache_does_not_add_file_on_lint_with_diagnostic() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
-
-        let test_cache = TestCache::new("cache_does_not_add_file_on_lint_with_diagnostic");
-        let cache = test_cache.open();
-        test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
-
-        cache.persist().unwrap();
-        let cache = test_cache.open();
-
-        let results = test_cache
-            .lint_file_with_cache("source.py", &cache)
-            .expect("Failed to lint test file");
-        assert_eq!(results.inner.len(), 1, "Expected one F822 diagnostic");
-        assert_eq!(
-            cache.changes.lock().unwrap().len(),
-            1,
-            "Files with diagnostics still trigger change events"
-        );
-        assert!(
-            cache
-                .changes
-                .lock()
-                .unwrap()
-                .last()
-                .is_some_and(|change| matches!(change.new_data, ChangeData::Linted(false))),
-            "Files with diagnostics are marked as unlinted"
-        );
-
-        cache.persist().unwrap();
-    }
-
    #[test]
    fn cache_adds_files_on_format() {
        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
@@ -729,7 +812,7 @@ mod tests {

    #[test]
    fn cache_invalidated_on_file_modified_time() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";

        let test_cache = TestCache::new("cache_invalidated_on_file_modified_time");
        let cache = test_cache.open();
@@ -786,7 +869,7 @@ mod tests {
            file.set_permissions(perms)
        }

-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";

        let test_cache = TestCache::new("cache_invalidated_on_permission_change");
        let cache = test_cache.open();
@@ -839,7 +922,7 @@ mod tests {
        );

        // Now actually lint a file.
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
        test_cache.write_source_file("new.py", source);
        let new_path_key = RelativePathBuf::from("new.py");
        assert_eq!(cache.changes.lock().unwrap().len(), 0);
@@ -862,7 +945,7 @@ mod tests {

    #[test]
    fn format_updates_cache_entry() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";

        let test_cache = TestCache::new("format_updates_cache_entry");
        let cache = test_cache.open();
@@ -896,7 +979,7 @@ mod tests {
            panic!("Cache entry for `source.py` is missing.");
        };

-        assert!(file_cache.data.linted);
+        assert!(file_cache.data.lint.is_some());
        assert!(file_cache.data.formatted);
    }

@@ -946,7 +1029,7 @@ mod tests {
            panic!("Cache entry for `source.py` is missing.");
        };

-        assert!(!file_cache.data.linted);
+        assert_eq!(file_cache.data.lint, None);
        assert!(file_cache.data.formatted);
    }

--- a/crates/ruff/src/commands/analyze_graph.rs
+++ b/crates/ruff/src/commands/analyze_graph.rs
@@ -102,7 +102,7 @@ pub(crate) fn analyze_graph(

                // Resolve the per-file settings.
                let settings = resolver.resolve(path);
-                let string_imports = settings.analyze.string_imports;
+                let string_imports = settings.analyze.detect_string_imports;
                let include_dependencies = settings.analyze.include_dependencies.get(path).cloned();

                // Skip excluded files.
--- a/crates/ruff/src/commands/check.rs
+++ b/crates/ruff/src/commands/check.rs
@@ -279,7 +279,6 @@ mod test {

        TextEmitter::default()
            .with_show_fix_status(true)
-            .with_color(false)
            .emit(
                &mut output,
                &diagnostics.inner,
--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -20,21 +20,15 @@ use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
 use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::{IOError, Violation, fs};
-use ruff_notebook::{NotebookError, NotebookIndex};
+use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
 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, FileCache, FileCacheKey};
+use crate::cache::{Cache, FileCacheKey, LintCacheData};

-/// A collection of [`Diagnostic`]s and additional information needed to render them.
-///
-/// Note that `notebook_indexes` may be empty if there are no diagnostics because the
-/// `NotebookIndex` isn't cached in this case. This isn't a problem for any current uses as of
-/// 2025-08-12, which are all related to diagnostic rendering, but could be surprising if used
-/// differently in the future.
 #[derive(Debug, Default, PartialEq)]
 pub(crate) struct Diagnostics {
    pub(crate) inner: Vec<Diagnostic>,
@@ -199,9 +193,19 @@ pub(crate) fn lint_path(
            let cache_key = FileCacheKey::from_path(path).context("Failed to create cache key")?;
            let cached_diagnostics = cache
                .get(relative_path, &cache_key)
-                .is_some_and(FileCache::linted);
-            if cached_diagnostics {
-                return Ok(Diagnostics::default());
+                .and_then(|entry| entry.to_diagnostics(path));
+            if let Some(diagnostics) = cached_diagnostics {
+                // `FixMode::Generate` and `FixMode::Diff` rely on side-effects (writing to disk,
+                // and writing the diff to stdout, respectively). If a file has diagnostics, we
+                // need to avoid reading from and writing to the cache in these modes.
+                if match fix_mode {
+                    flags::FixMode::Generate => true,
+                    flags::FixMode::Apply | flags::FixMode::Diff => {
+                        diagnostics.inner.is_empty() && diagnostics.fixed.is_empty()
+                    }
+                } {
+                    return Ok(diagnostics);
+                }
            }

            // Stash the file metadata for later so when we update the cache it reflects the prerun
@@ -318,21 +322,31 @@ pub(crate) fn lint_path(
            (result, transformed, fixed)
        };

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

    if let Some((cache, relative_path, key)) = caching {
-        // `FixMode::Apply` and `FixMode::Diff` rely on side-effects (writing to disk,
-        // and writing the diff to stdout, respectively). If a file has diagnostics
-        // with fixes, we need to avoid reading from and writing to the cache in these
-        // modes.
-        let use_fixes = match fix_mode {
-            flags::FixMode::Generate => true,
-            flags::FixMode::Apply | flags::FixMode::Diff => fixed.is_empty(),
-        };
-
-        // We don't cache files with diagnostics.
-        let linted = diagnostics.is_empty() && use_fixes;
-        cache.set_linted(relative_path.to_owned(), &key, linted);
+        // We don't cache parsing errors.
+        if !has_error {
+            // `FixMode::Apply` and `FixMode::Diff` rely on side-effects (writing to disk,
+            // and writing the diff to stdout, respectively). If a file has diagnostics, we
+            // need to avoid reading from and writing to the cache in these modes.
+            if match fix_mode {
+                flags::FixMode::Generate => true,
+                flags::FixMode::Apply | flags::FixMode::Diff => {
+                    diagnostics.is_empty() && fixed.is_empty()
+                }
+            } {
+                cache.update_lint(
+                    relative_path.to_owned(),
+                    &key,
+                    LintCacheData::from_diagnostics(
+                        &diagnostics,
+                        transformed.as_ipy_notebook().map(Notebook::index).cloned(),
+                    ),
+                );
+            }
+        }
    }

    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {
--- a/crates/ruff/src/main.rs
+++ b/crates/ruff/src/main.rs
@@ -19,8 +19,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -15,8 +15,8 @@ use ruff_db::diagnostic::{
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
-    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, SarifEmitter,
-    TextEmitter,
+    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, JunitEmitter,
+    SarifEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -252,11 +252,7 @@ impl Printer {
                write!(writer, "{value}")?;
            }
            OutputFormat::Junit => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Junit)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                JunitEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
            OutputFormat::Concise | OutputFormat::Full => {
                TextEmitter::default()
@@ -264,7 +260,6 @@ impl Printer {
                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                    .with_show_source(self.format == OutputFormat::Full)
                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .with_preview(preview)
                    .emit(writer, &diagnostics.inner, &context)?;

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -57,40 +57,33 @@ fn dependencies() -> Result<()> {
        .write_str(indoc::indoc! {r#"
        def f(): pass
    "#})?;
-    root.child("ruff")
-        .child("e.pyi")
-        .write_str(indoc::indoc! {r#"
-        def f() -> None: ...
-    "#})?;

    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        {
-          "ruff/__init__.py": [],
-          "ruff/a.py": [
-            "ruff/b.py"
-          ],
-          "ruff/b.py": [
-            "ruff/c.py"
-          ],
-          "ruff/c.py": [
-            "ruff/d.py"
-          ],
-          "ruff/d.py": [
-            "ruff/e.py",
-            "ruff/e.pyi"
-          ],
-          "ruff/e.py": [],
-          "ruff/e.pyi": []
-        }
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+            success: true
+            exit_code: 0
+            ----- stdout -----
+            {
+              "ruff/__init__.py": [],
+              "ruff/a.py": [
+                "ruff/b.py"
+              ],
+              "ruff/b.py": [
+                "ruff/c.py"
+              ],
+              "ruff/c.py": [
+                "ruff/d.py"
+              ],
+              "ruff/d.py": [
+                "ruff/e.py"
+              ],
+              "ruff/e.py": []
+            }

-        ----- stderr -----
-        "#);
+            ----- stderr -----
+            "###);
    });

    Ok(())
@@ -204,43 +197,23 @@ fn string_detection() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().arg("--detect-string-imports").current_dir(&root), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        {
-          "ruff/__init__.py": [],
-          "ruff/a.py": [
-            "ruff/b.py"
-          ],
-          "ruff/b.py": [],
-          "ruff/c.py": []
-        }
+        assert_cmd_snapshot!(command().arg("--detect-string-imports").current_dir(&root), @r###"
+            success: true
+            exit_code: 0
+            ----- stdout -----
+            {
+              "ruff/__init__.py": [],
+              "ruff/a.py": [
+                "ruff/b.py"
+              ],
+              "ruff/b.py": [
+                "ruff/c.py"
+              ],
+              "ruff/c.py": []
+            }

-        ----- stderr -----
-        "#);
-    });
-
-    insta::with_settings!({
-        filters => INSTA_FILTERS.to_vec(),
-    }, {
-        assert_cmd_snapshot!(command().arg("--detect-string-imports").arg("--min-dots").arg("1").current_dir(&root), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        {
-          "ruff/__init__.py": [],
-          "ruff/a.py": [
-            "ruff/b.py"
-          ],
-          "ruff/b.py": [
-            "ruff/c.py"
-          ],
-          "ruff/c.py": []
-        }
-
-        ----- stderr -----
-        "#);
+            ----- stderr -----
+            "###);
    });

    Ok(())
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -115,13 +115,12 @@ fn stdin_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> -:1:8
+    -:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

    Found 1 error.
    [*] 1 fixable with the `--fix` option.
@@ -140,13 +139,12 @@ fn stdin_filename() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.py:1:8
+    F401.py:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

    Found 1 error.
    [*] 1 fixable with the `--fix` option.
@@ -176,21 +174,19 @@ import bar   # unused import
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `bar` imported but unused
-     --> bar.py:2:8
+    bar.py:2:8: F401 [*] `bar` imported but unused
      |
    2 | import bar   # unused import
-      |        ^^^
+      |        ^^^ F401
      |
-    help: Remove unused import: `bar`
+      = help: Remove unused import: `bar`

-    F401 [*] `foo` imported but unused
-     --> foo.py:2:8
+    foo.py:2:8: F401 [*] `foo` imported but unused
      |
    2 | import foo   # unused import
-      |        ^^^
+      |        ^^^ F401
      |
-    help: Remove unused import: `foo`
+      = help: Remove unused import: `foo`

    Found 2 errors.
    [*] 2 fixable with the `--fix` option.
@@ -212,13 +208,12 @@ fn check_warn_stdin_filename_with_files() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.py:1:8
+    F401.py:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

    Found 1 error.
    [*] 1 fixable with the `--fix` option.
@@ -239,13 +234,12 @@ fn stdin_source_type_py() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> TCH.py:1:8
+    TCH.py:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

    Found 1 error.
    [*] 1 fixable with the `--fix` option.
@@ -477,11 +471,10 @@ fn stdin_fix_jupyter() {
     "nbformat_minor": 5
    }
    ----- stderr -----
-    F821 Undefined name `x`
-     --> Jupyter.ipynb:cell 3:1:7
+    Jupyter.ipynb:cell 3:1:7: F821 Undefined name `x`
      |
    1 | print(x)
-      |       ^
+      |       ^ F821
      |

    Found 3 errors (2 fixed, 1 remaining).
@@ -576,21 +569,19 @@ fn stdin_override_parser_ipynb() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> Jupyter.py:cell 1:1:8
+    Jupyter.py:cell 1:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

-    F401 [*] `sys` imported but unused
-     --> Jupyter.py:cell 3:1:8
+    Jupyter.py:cell 3:1:8: F401 [*] `sys` imported but unused
      |
    1 | import sys
-      |        ^^^
+      |        ^^^ F401
      |
-    help: Remove unused import: `sys`
+      = help: Remove unused import: `sys`

    Found 2 errors.
    [*] 2 fixable with the `--fix` option.
@@ -614,13 +605,12 @@ fn stdin_override_parser_py() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.ipynb:1:8
+    F401.ipynb:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

    Found 1 error.
    [*] 1 fixable with the `--fix` option.
@@ -643,13 +633,12 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
         print(sys.version)

    ----- stderr -----
-    F634 If test is a tuple, which is always `True`
-     --> -:3:4
+    -:3:4: F634 If test is a tuple, which is always `True`
      |
    1 | import sys
    2 |
    3 | if (1, 2):
-      |    ^^^^^^
+      |    ^^^^^^ F634
    4 |      print(sys.version)
      |

@@ -809,8 +798,7 @@ fn stdin_parse_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    invalid-syntax: Expected one or more symbol names after import
-     --> -:1:16
+    -:1:16: SyntaxError: Expected one or more symbol names after import
      |
    1 | from foo import
      |                ^
@@ -830,16 +818,14 @@ fn stdin_multiple_parse_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    invalid-syntax: Expected one or more symbol names after import
-     --> -:1:16
+    -:1:16: SyntaxError: Expected one or more symbol names after import
      |
    1 | from foo import
      |                ^
    2 | bar =
      |

-    invalid-syntax: Expected an expression
-     --> -:2:6
+    -:2:6: SyntaxError: Expected an expression
      |
    1 | from foo import
    2 | bar =
@@ -861,8 +847,7 @@ fn parse_error_not_included() {
    success: false
    exit_code: 1
    ----- stdout -----
-    invalid-syntax: Expected an expression
-     --> -:1:6
+    -:1:6: SyntaxError: Expected an expression
      |
    1 | foo =
      |      ^
@@ -882,11 +867,10 @@ fn full_output_preview() {
    success: false
    exit_code: 1
    ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
      |
    1 | l = 1
-      | ^
+      | ^ E741
      |

    Found 1 error.
@@ -911,11 +895,10 @@ preview = true
    success: false
    exit_code: 1
    ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
      |
    1 | l = 1
-      | ^
+      | ^ E741
      |

    Found 1 error.
@@ -933,11 +916,10 @@ fn full_output_format() {
    success: false
    exit_code: 1
    ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
      |
    1 | l = 1
-      | ^
+      | ^ E741
      |

    Found 1 error.
@@ -1424,9 +1406,7 @@ fn redirect_direct() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
    Found 1 error.

    ----- stderr -----
@@ -1458,9 +1438,7 @@ fn redirect_prefix() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
    Found 1 error.

    ----- stderr -----
@@ -1477,9 +1455,7 @@ fn deprecated_direct() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
+    -:1:1: RUF920 Hey this is a deprecated test rule.
    Found 1 error.

    ----- stderr -----
@@ -1496,12 +1472,8 @@ fn deprecated_multiple_direct() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
    Found 2 errors.

    ----- stderr -----
@@ -1519,12 +1491,8 @@ fn deprecated_indirect() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
    Found 2 errors.

    ----- stderr -----
@@ -1670,23 +1638,22 @@ fn check_input_from_argfile() -> Result<()> {
        (file_a_path.display().to_string().as_str(), "/path/to/a.py"),
    ]}, {
        assert_cmd_snapshot!(cmd
-            .pass_stdin(""), @r"
+            .pass_stdin(""), @r###"
        success: false
        exit_code: 1
        ----- stdout -----
-        F401 [*] `os` imported but unused
-         --> /path/to/a.py:1:8
+        /path/to/a.py:1:8: F401 [*] `os` imported but unused
          |
        1 | import os
-          |        ^^
+          |        ^^ F401
          |
-        help: Remove unused import: `os`
+          = help: Remove unused import: `os`

        Found 1 error.
        [*] 1 fixable with the `--fix` option.

        ----- stderr -----
-        ");
+        "###);
    });

    Ok(())
@@ -1702,12 +1669,8 @@ fn check_hints_hidden_unsafe_fixes() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).

@@ -1724,9 +1687,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 1 error.
    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).

@@ -1744,12 +1705,8 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    [*] 1 fixable with the --fix option.

@@ -1768,9 +1725,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 1 error.

    ----- stderr -----
@@ -1787,12 +1742,8 @@ fn check_shows_unsafe_fixes_with_opt_in() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    [*] 2 fixable with the --fix option.

@@ -1813,9 +1764,7 @@ fn fix_applies_safe_fixes_by_default() {
    # fix from stable-test-rule-safe-fix

    ----- stderr -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 2 errors (1 fixed, 1 remaining).
    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
    ");
@@ -1852,9 +1801,7 @@ fn fix_does_not_apply_display_only_fixes() {
    ----- stdout -----
    def add_to_list(item, some_list=[]): ...
    ----- stderr -----
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
    Found 1 error.
    ");
 }
@@ -1872,9 +1819,7 @@ fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
    ----- stdout -----
    def add_to_list(item, some_list=[]): ...
    ----- stderr -----
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
    Found 1 error.
    ");
 }
@@ -1891,9 +1836,7 @@ fn fix_only_unsafe_fixes_available() {
    ----- stdout -----

    ----- stderr -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 1 error.
    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
    ");
@@ -2029,12 +1972,8 @@ extend-unsafe-fixes = ["RUF901"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).

@@ -2065,12 +2004,8 @@ extend-safe-fixes = ["RUF902"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    [*] 2 fixable with the `--fix` option.

@@ -2103,12 +2038,8 @@ extend-safe-fixes = ["RUF902"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
    Found 2 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).

@@ -2143,27 +2074,13 @@ extend-safe-fixes = ["RUF9"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF900 Hey this is a stable test rule.
-    --> -:1:1
-
-    RUF901 Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
+    -:1:1: RUF900 Hey this is a stable test rule.
+    -:1:1: RUF901 Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
    Found 7 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).

@@ -2224,11 +2141,10 @@ def log(x, base) -> float:
    success: false
    exit_code: 1
    ----- stdout -----
-    D417 Missing argument description in the docstring for `log`: `base`
-     --> -:2:5
+    -:2:5: D417 Missing argument description in the docstring for `log`: `base`
      |
    2 | def log(x, base) -> float:
-      |     ^^^
+      |     ^^^ D417
    3 |     """Calculate natural log of a value
      |

@@ -2261,15 +2177,14 @@ select = ["RUF017"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF017 Avoid quadratic list summation
-     --> -:3:1
+    -:3:1: RUF017 Avoid quadratic list summation
      |
    1 | x = [1, 2, 3]
    2 | y = [4, 5, 6]
    3 | sum([x, y], [])
-      | ^^^^^^^^^^^^^^^
+      | ^^^^^^^^^^^^^^^ RUF017
      |
-    help: Replace with `functools.reduce`
+      = help: Replace with `functools.reduce`

    Found 1 error.
    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
@@ -2302,15 +2217,14 @@ unfixable = ["RUF"]
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF017 Avoid quadratic list summation
-     --> -:3:1
+    -:3:1: RUF017 Avoid quadratic list summation
      |
    1 | x = [1, 2, 3]
    2 | y = [4, 5, 6]
    3 | sum([x, y], [])
-      | ^^^^^^^^^^^^^^^
+      | ^^^^^^^^^^^^^^^ RUF017
      |
-    help: Replace with `functools.reduce`
+      = help: Replace with `functools.reduce`

    Found 1 error.

@@ -2332,11 +2246,10 @@ fn pyproject_toml_stdin_syntax_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF200 Failed to parse pyproject.toml: unclosed table, expected `]`
-     --> pyproject.toml:1:9
+    pyproject.toml:1:9: RUF200 Failed to parse pyproject.toml: unclosed table, expected `]`
      |
    1 | [project
-      |         ^
+      |         ^ RUF200
      |

    Found 1 error.
@@ -2358,12 +2271,11 @@ fn pyproject_toml_stdin_schema_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
-     --> pyproject.toml:2:8
+    pyproject.toml:2:8: RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
      |
    1 | [project]
    2 | name = 1
-      |        ^
+      |        ^ RUF200
      |

    Found 1 error.
@@ -2451,12 +2363,11 @@ fn pyproject_toml_stdin_schema_error_fix() {
    [project]
    name = 1
    ----- stderr -----
-    RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
-     --> pyproject.toml:2:8
+    pyproject.toml:2:8: RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
      |
    1 | [project]
    2 | name = 1
-      |        ^
+      |        ^ RUF200
      |

    Found 1 error.
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -993,7 +993,6 @@ fn value_given_to_table_key_is_not_inline_table_2() {
    - `lint.exclude`
    - `lint.preview`
    - `lint.typing-extensions`
-    - `lint.future-annotations`

    For more information, try '--help'.
    ");
@@ -2422,7 +2421,7 @@ requires-python = ">= 3.11"
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.11
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -2734,7 +2733,7 @@ requires-python = ">= 3.11"
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.10
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -3098,7 +3097,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.11
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -3478,7 +3477,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.11
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -3806,7 +3805,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.10
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -4134,7 +4133,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.9
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -4419,7 +4418,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.9
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -4757,7 +4756,7 @@ from typing import Union;foo: Union[int, str] = 1
        analyze.exclude = []
        analyze.preview = disabled
        analyze.target_version = 3.10
-        analyze.string_imports = disabled
+        analyze.detect_string_imports = false
        analyze.extension = ExtensionMapping({})
        analyze.include_dependencies = {}

@@ -4996,37 +4995,6 @@ fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
    Ok(())
 }

-#[test]
-fn flake8_import_convention_nfkc_normalization() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.aliases]
-"test.module" = "_﹏𝘥𝘦𝘣𝘶𝘨﹏﹏"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
-        ");});
-    Ok(())
-}
-
 #[test]
 fn flake8_import_convention_unused_aliased_import() {
    assert_cmd_snapshot!(
@@ -5420,7 +5388,7 @@ fn walrus_before_py38() {
    success: false
    exit_code: 1
    ----- stdout -----
-    test.py:1:2: invalid-syntax: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
+    test.py:1:2: SyntaxError: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
    Found 1 error.

    ----- stderr -----
@@ -5466,15 +5434,15 @@ match 2:
        print("it's one")
 "#
        ),
-        @r"
+        @r###"
    success: false
    exit_code: 1
    ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
    Found 1 error.

    ----- stderr -----
-    "
+    "###
    );

    // syntax error on 3.9 with preview
@@ -5495,7 +5463,7 @@ match 2:
    success: false
    exit_code: 1
    ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
    Found 1 error.

    ----- stderr -----
@@ -5523,7 +5491,7 @@ fn cache_syntax_errors() -> Result<()> {
    success: false
    exit_code: 1
    ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    main.py:1:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

    ----- stderr -----
    "
@@ -5536,7 +5504,7 @@ fn cache_syntax_errors() -> Result<()> {
    success: false
    exit_code: 1
    ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    main.py:1:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

    ----- stderr -----
    "
@@ -5588,15 +5556,15 @@ fn cookiecutter_globbing() -> Result<()> {
                .args(STDIN_BASE_OPTIONS)
                .arg("--select=F811")
                .current_dir(tempdir.path()), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        {{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1: `foo` redefined here
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
+			success: false
+			exit_code: 1
+			----- stdout -----
+			{{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1
+			Found 1 error.
+			[*] 1 fixable with the `--fix` option.

-        ----- stderr -----
-        ");
+			----- stderr -----
+		");
    });

    Ok(())
@@ -5649,7 +5617,7 @@ fn semantic_syntax_errors() -> Result<()> {
    success: false
    exit_code: 1
    ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
    main.py:1:20: F821 Undefined name `foo`

    ----- stderr -----
@@ -5663,7 +5631,7 @@ fn semantic_syntax_errors() -> Result<()> {
    success: false
    exit_code: 1
    ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
    main.py:1:20: F821 Undefined name `foo`

    ----- stderr -----
@@ -5682,7 +5650,7 @@ fn semantic_syntax_errors() -> Result<()> {
    success: false
    exit_code: 1
    ----- stdout -----
-    -:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    -:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
    Found 1 error.

    ----- stderr -----
@@ -5749,11 +5717,8 @@ match 42:  # invalid-syntax

    let snapshot = format!("output_format_{output_format}");

-    let project_dir = dunce::canonicalize(tempdir.path())?;
-
    insta::with_settings!({
        filters => vec![
-            (tempdir_filter(&project_dir).as_str(), "[TMP]/"),
            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
            (r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#),
            (ruff_linter::VERSION, "[VERSION]"),
@@ -5779,54 +5744,3 @@ match 42:  # invalid-syntax

    Ok(())
 }
-
-#[test]
-fn future_annotations_preview_warning() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--config", "lint.future-annotations = true"])
-            .args(["--select", "F"])
-            .arg("--no-preview")
-            .arg("-")
-            .pass_stdin("1"),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    warning: The `lint.future-annotations` setting will have no effect because `preview` is disabled
-    ",
-    );
-}
-
-#[test]
-fn up045_nested_optional_flatten_all() {
-    let contents = "\
-from typing import Optional
-nested_optional: Optional[Optional[Optional[str]]] = None
-";
-
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
-            .arg("-")
-            .pass_stdin(contents),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    @@ -1,2 +1,2 @@
-     from typing import Optional
-    -nested_optional: Optional[Optional[Optional[str]]] = None
-    +nested_optional: str | None = None
-
-
-    ----- stderr -----
-    Would fix 1 error.
-    ",
-    );
-}
--- a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
@@ -95,6 +95,6 @@ is stricter, which could affect the suggested fix. See [this FAQ section](https:
 ## References
 - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
+- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)

 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_azure.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_azure.snap
@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 ##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
 ##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=2;columnnumber=5;code=F821;]Undefined name `y`
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=3;columnnumber=1;code=invalid-syntax;]Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=3;columnnumber=1;]SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_concise.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_concise.snap
@@ -18,7 +18,7 @@ exit_code: 1
 ----- stdout -----
 input.py:1:8: F401 [*] `os` imported but unused
 input.py:2:5: F821 Undefined name `y`
-input.py:3:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
 Found 3 errors.
 [*] 1 fixable with the `--fix` option.

--- a/crates/ruff/tests/snapshots/lint__output_format_full.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_full.snap
@@ -16,28 +16,25 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-F401 [*] `os` imported but unused
- --> input.py:1:8
+input.py:1:8: F401 [*] `os` imported but unused
  |
 1 | import os  # F401
-  |        ^^
+  |        ^^ F401
 2 | x = y      # F821
 3 | match 42:  # invalid-syntax
  |
-help: Remove unused import: `os`
+  = help: Remove unused import: `os`

-F821 Undefined name `y`
- --> input.py:2:5
+input.py:2:5: F821 Undefined name `y`
  |
 1 | import os  # F401
 2 | x = y      # F821
-  |     ^
+  |     ^ F821
 3 | match 42:  # invalid-syntax
 4 |     case _: ...
  |

-invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
- --> input.py:3:1
+input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
  |
 1 | import os  # F401
 2 | x = y      # F821
--- a/crates/ruff/tests/snapshots/lint__output_format_github.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_github.snap
@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 ::error title=Ruff (F401),file=[TMP]/input.py,line=1,col=8,endLine=1,endColumn=10::input.py:1:8: F401 `os` imported but unused
 ::error title=Ruff (F821),file=[TMP]/input.py,line=2,col=5,endLine=2,endColumn=6::input.py:2:5: F821 Undefined name `y`
-::error title=Ruff (invalid-syntax),file=[TMP]/input.py,line=3,col=1,endLine=3,endColumn=6::input.py:3:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+::error title=Ruff,file=[TMP]/input.py,line=3,col=1,endLine=3,endColumn=6::input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
@@ -19,58 +19,40 @@ exit_code: 1
 [
  {
    "check_name": "F401",
-    "description": "F401: `os` imported but unused",
+    "description": "`os` imported but unused",
    "fingerprint": "4dbad37161e65c72",
    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "column": 8,
-          "line": 1
-        },
-        "end": {
-          "column": 10,
-          "line": 1
-        }
-      }
+      "lines": {
+        "begin": 1,
+        "end": 1
+      },
+      "path": "input.py"
    },
    "severity": "major"
  },
  {
    "check_name": "F821",
-    "description": "F821: Undefined name `y`",
+    "description": "Undefined name `y`",
    "fingerprint": "7af59862a085230",
    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "column": 5,
-          "line": 2
-        },
-        "end": {
-          "column": 6,
-          "line": 2
-        }
-      }
+      "lines": {
+        "begin": 2,
+        "end": 2
+      },
+      "path": "input.py"
    },
    "severity": "major"
  },
  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
+    "check_name": "syntax-error",
+    "description": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
    "fingerprint": "e558cec859bb66e8",
    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "column": 1,
-          "line": 3
-        },
-        "end": {
-          "column": 6,
-          "line": 3
-        }
-      }
+      "lines": {
+        "begin": 3,
+        "end": 3
+      },
+      "path": "input.py"
    },
    "severity": "major"
  }
--- a/crates/ruff/tests/snapshots/lint__output_format_grouped.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_grouped.snap
@@ -19,7 +19,7 @@ exit_code: 1
 input.py:
  1:8 F401 [*] `os` imported but unused
  2:5 F821 Undefined name `y`
-  3:1 invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+  3:1 SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

 Found 3 errors.
 [*] 1 fixable with the `--fix` option.
--- a/crates/ruff/tests/snapshots/lint__output_format_json-lines.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_json-lines.snap
@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 {"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"[TMP]/input.py","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
 {"cell":null,"code":"F821","end_location":{"column":6,"row":2},"filename":"[TMP]/input.py","fix":null,"location":{"column":5,"row":2},"message":"Undefined name `y`","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":6,"row":3},"filename":"[TMP]/input.py","fix":null,"location":{"column":1,"row":3},"message":"Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)","noqa_row":null,"url":null}
+{"cell":null,"code":null,"end_location":{"column":6,"row":3},"filename":"[TMP]/input.py","fix":null,"location":{"column":1,"row":3},"message":"SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)","noqa_row":null,"url":null}

 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_json.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_json.snap
@@ -69,7 +69,7 @@ exit_code: 1
  },
  {
    "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
    "end_location": {
      "column": 6,
      "row": 3
@@ -80,7 +80,7 @@ exit_code: 1
      "column": 1,
      "row": 3
    },
-    "message": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
+    "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
    "noqa_row": null,
    "url": null
  }
--- a/crates/ruff/tests/snapshots/lint__output_format_junit.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_junit.snap
@@ -25,8 +25,8 @@ exit_code: 1
        <testcase name="org.ruff.F821" classname="[TMP]/input" line="2" column="5">
            <failure message="Undefined name `y`">line 2, col 5, Undefined name `y`</failure>
        </testcase>
-        <testcase name="org.ruff.invalid-syntax" classname="[TMP]/input" line="3" column="1">
-            <failure message="Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)">line 3, col 1, Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)</failure>
+        <testcase name="org.ruff" classname="[TMP]/input" line="3" column="1">
+            <failure message="SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)">line 3, col 1, SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)</failure>
        </testcase>
    </testsuite>
 </testsuites>
--- a/crates/ruff/tests/snapshots/lint__output_format_pylint.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_pylint.snap
@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 input.py:1: [F401] `os` imported but unused
 input.py:2: [F821] Undefined name `y`
-input.py:3: [invalid-syntax] Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+input.py:3: [invalid-syntax] SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_rdjson.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_rdjson.snap
@@ -90,7 +90,7 @@ exit_code: 1
          }
        }
      },
-      "message": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
+      "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
    }
  ],
  "severity": "WARNING",
--- a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
@@ -83,7 +83,7 @@ exit_code: 1
            }
          ],
          "message": {
-            "text": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
+            "text": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
          },
          "ruleId": "invalid-syntax"
        }
@@ -95,7 +95,7 @@ exit_code: 1
          "rules": [
            {
              "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)\n"
              },
              "help": {
                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -392,7 +392,7 @@ formatter.docstring_code_line_width = dynamic
 analyze.exclude = []
 analyze.preview = disabled
 analyze.target_version = 3.7
-analyze.string_imports = disabled
+analyze.detect_string_imports = false
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}

--- a/crates/ruff_annotate_snippets/src/lib.rs
+++ b/crates/ruff_annotate_snippets/src/lib.rs
@@ -1,5 +1,3 @@
-#![expect(clippy::needless_doctest_main)]
-
 //! A library for formatting of text or programming code snippets.
 //!
 //! It's primary purpose is to build an ASCII-graphical representation of the snippet
--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -193,14 +193,9 @@ impl DisplaySet<'_> {
        stylesheet: &Stylesheet,
        buffer: &mut StyledBuffer,
    ) -> fmt::Result {
-        let hide_severity = annotation.annotation_type.is_none();
        let color = get_annotation_style(&annotation.annotation_type, stylesheet);
        let formatted_len = if let Some(id) = &annotation.id {
-            if hide_severity {
-                id.len()
-            } else {
-                2 + id.len() + annotation_type_len(&annotation.annotation_type)
-            }
+            2 + id.len() + annotation_type_len(&annotation.annotation_type)
        } else {
            annotation_type_len(&annotation.annotation_type)
        };
@@ -214,66 +209,18 @@ impl DisplaySet<'_> {
        if formatted_len == 0 {
            self.format_label(line_offset, &annotation.label, stylesheet, buffer)
        } else {
-            // TODO(brent) All of this complicated checking of `hide_severity` should be reverted
-            // once we have real severities in Ruff. This code is trying to account for two
-            // different cases:
-            //
-            // - main diagnostic message
-            // - subdiagnostic message
-            //
-            // In the first case, signaled by `hide_severity = true`, we want to print the ID (the
-            // noqa code for a ruff lint diagnostic, e.g. `F401`, or `invalid-syntax` for a syntax
-            // error) without brackets. Instead, for subdiagnostics, we actually want to print the
-            // severity (usually `help`) regardless of the `hide_severity` setting. This is signaled
-            // by an ID of `None`.
-            //
-            // With real severities these should be reported more like in ty:
-            //
-            // ```
-            // error[F401]: `math` imported but unused
-            // error[invalid-syntax]: Cannot use `match` statement on Python 3.9...
-            // ```
-            //
-            // instead of the current versions intended to mimic the old Ruff output format:
-            //
-            // ```
-            // F401 `math` imported but unused
-            // invalid-syntax: Cannot use `match` statement on Python 3.9...
-            // ```
-            //
-            // Note that the `invalid-syntax` colon is added manually in `ruff_db`, not here. We
-            // could eventually add a colon to Ruff lint diagnostics (`F401:`) and then make the
-            // colon below unconditional again.
-            //
-            // This also applies to the hard-coded `stylesheet.error()` styling of the
-            // hidden-severity `id`. This should just be `*color` again later, but for now we don't
-            // want an unformatted `id`, which is what `get_annotation_style` returns for
-            // `DisplayAnnotationType::None`.
-            let annotation_type = annotation_type_str(&annotation.annotation_type);
-            if let Some(id) = annotation.id {
-                if hide_severity {
-                    buffer.append(line_offset, &format!("{id} "), *stylesheet.error());
-                } else {
-                    buffer.append(line_offset, &format!("{annotation_type}[{id}]"), *color);
-                }
-            } else {
-                buffer.append(line_offset, annotation_type, *color);
-            }
-
-            if annotation.is_fixable {
-                buffer.append(line_offset, "[", stylesheet.none);
-                buffer.append(line_offset, "*", stylesheet.help);
-                buffer.append(line_offset, "]", stylesheet.none);
-                // In the hide-severity case, we need a space instead of the colon and space below.
-                if hide_severity {
-                    buffer.append(line_offset, " ", stylesheet.none);
-                }
-            }
+            let id = match &annotation.id {
+                Some(id) => format!("[{id}]"),
+                None => String::new(),
+            };
+            buffer.append(
+                line_offset,
+                &format!("{}{}", annotation_type_str(&annotation.annotation_type), id),
+                *color,
+            );

            if !is_annotation_empty(annotation) {
-                if annotation.id.is_none() || !hide_severity {
-                    buffer.append(line_offset, ": ", stylesheet.none);
-                }
+                buffer.append(line_offset, ": ", stylesheet.none);
                self.format_label(line_offset, &annotation.label, stylesheet, buffer)?;
            }
            Ok(())
@@ -302,15 +249,11 @@ impl DisplaySet<'_> {
                let lineno_color = stylesheet.line_no();
                buffer.puts(line_offset, lineno_width, header_sigil, *lineno_color);
                buffer.puts(line_offset, lineno_width + 4, path, stylesheet.none);
-                if let Some(Position { row, col, cell }) = pos {
-                    if let Some(cell) = cell {
-                        buffer.append(line_offset, ":", stylesheet.none);
-                        buffer.append(line_offset, &format!("cell {cell}"), stylesheet.none);
-                    }
-                    buffer.append(line_offset, ":", stylesheet.none);
-                    buffer.append(line_offset, row.to_string().as_str(), stylesheet.none);
+                if let Some((col, row)) = pos {
                    buffer.append(line_offset, ":", stylesheet.none);
                    buffer.append(line_offset, col.to_string().as_str(), stylesheet.none);
+                    buffer.append(line_offset, ":", stylesheet.none);
+                    buffer.append(line_offset, row.to_string().as_str(), stylesheet.none);
                }
                Ok(())
            }
@@ -825,7 +768,6 @@ pub(crate) struct Annotation<'a> {
    pub(crate) annotation_type: DisplayAnnotationType,
    pub(crate) id: Option<&'a str>,
    pub(crate) label: Vec<DisplayTextFragment<'a>>,
-    pub(crate) is_fixable: bool,
 }

 /// A single line used in `DisplayList`.
@@ -891,13 +833,6 @@ impl DisplaySourceAnnotation<'_> {
    }
 }

-#[derive(Debug, PartialEq)]
-pub(crate) struct Position {
-    row: usize,
-    col: usize,
-    cell: Option<usize>,
-}
-
 /// Raw line - a line which does not have the `lineno` part and is not considered
 /// a part of the snippet.
 #[derive(Debug, PartialEq)]
@@ -906,7 +841,7 @@ pub(crate) enum DisplayRawLine<'a> {
    /// slice in the project structure.
    Origin {
        path: &'a str,
-        pos: Option<Position>,
+        pos: Option<(usize, usize)>,
        header_type: DisplayHeaderType,
    },

@@ -985,13 +920,6 @@ pub(crate) enum DisplayAnnotationType {
    Help,
 }

-impl DisplayAnnotationType {
-    #[inline]
-    const fn is_none(&self) -> bool {
-        matches!(self, Self::None)
-    }
-}
-
 impl From<snippet::Level> for DisplayAnnotationType {
    fn from(at: snippet::Level) -> Self {
        match at {
@@ -1087,12 +1015,11 @@ fn format_message<'m>(
        title,
        footer,
        snippets,
-        is_fixable,
    } = message;

    let mut sets = vec![];
    let body = if !snippets.is_empty() || primary {
-        vec![format_title(level, id, title, is_fixable)]
+        vec![format_title(level, id, title)]
    } else {
        format_footer(level, id, title)
    };
@@ -1133,18 +1060,12 @@ fn format_message<'m>(
    sets
 }

-fn format_title<'a>(
-    level: crate::Level,
-    id: Option<&'a str>,
-    label: &'a str,
-    is_fixable: bool,
-) -> DisplayLine<'a> {
+fn format_title<'a>(level: crate::Level, id: Option<&'a str>, label: &'a str) -> DisplayLine<'a> {
    DisplayLine::Raw(DisplayRawLine::Annotation {
        annotation: Annotation {
            annotation_type: DisplayAnnotationType::from(level),
            id,
            label: format_label(Some(label), Some(DisplayTextStyle::Emphasis)),
-            is_fixable,
        },
        source_aligned: false,
        continuation: false,
@@ -1163,7 +1084,6 @@ fn format_footer<'a>(
                annotation_type: DisplayAnnotationType::from(level),
                id,
                label: format_label(Some(line), None),
-                is_fixable: false,
            },
            source_aligned: true,
            continuation: i != 0,
@@ -1198,28 +1118,6 @@ fn format_snippet<'m>(
    let main_range = snippet.annotations.first().map(|x| x.range.start);
    let origin = snippet.origin;
    let need_empty_header = origin.is_some() || is_first;
-
-    let is_file_level = snippet.annotations.iter().any(|ann| ann.is_file_level);
-    if is_file_level {
-        // TODO(brent) enable this assertion again once we set `is_file_level` for individual rules.
-        // It's causing too many false positives currently when the default is to make any
-        // annotation with a default range file-level. See
-        // https://github.com/astral-sh/ruff/issues/19688.
-        //
-        // assert!(
-        //     snippet.source.is_empty(),
-        //     "Non-empty file-level snippet that won't be rendered: {:?}",
-        //     snippet.source
-        // );
-        let header = format_header(origin, main_range, &[], is_first, snippet.cell_index);
-        return DisplaySet {
-            display_lines: header.map_or_else(Vec::new, |header| vec![header]),
-            margin: Margin::new(0, 0, 0, 0, term_width, 0),
-        };
-    }
-
-    let cell_index = snippet.cell_index;
-
    let mut body = format_body(
        snippet,
        need_empty_header,
@@ -1228,13 +1126,7 @@ fn format_snippet<'m>(
        anonymized_line_numbers,
        cut_indicator,
    );
-    let header = format_header(
-        origin,
-        main_range,
-        &body.display_lines,
-        is_first,
-        cell_index,
-    );
+    let header = format_header(origin, main_range, &body.display_lines, is_first);

    if let Some(header) = header {
        body.display_lines.insert(0, header);
@@ -1254,7 +1146,6 @@ fn format_header<'a>(
    main_range: Option<usize>,
    body: &[DisplayLine<'_>],
    is_first: bool,
-    cell_index: Option<usize>,
 ) -> Option<DisplayLine<'a>> {
    let display_header = if is_first {
        DisplayHeaderType::Initial
@@ -1278,31 +1169,20 @@ fn format_header<'a>(
                ..
            } = item
            {
-                // At the very end of the `main_range`, report the location as the first character
-                // in the next line instead of falling back to the default location of `1:1`. This
-                // is another divergence from upstream.
-                let end_of_range = range.1 + max(*end_line as usize, 1);
-                if main_range >= range.0 && main_range < end_of_range {
+                if main_range >= range.0 && main_range < range.1 + max(*end_line as usize, 1) {
                    let char_column = text[0..(main_range - range.0).min(text.len())]
                        .chars()
                        .count();
                    col = char_column + 1;
                    line_offset = lineno.unwrap_or(1);
                    break;
-                } else if main_range == end_of_range {
-                    line_offset = lineno.map_or(1, |line| line + 1);
-                    break;
                }
            }
        }

        return Some(DisplayLine::Raw(DisplayRawLine::Origin {
            path,
-            pos: Some(Position {
-                row: line_offset,
-                col,
-                cell: cell_index,
-            }),
+            pos: Some((line_offset, col)),
            header_type: display_header,
        }));
    }
@@ -1592,7 +1472,6 @@ fn format_body<'m>(
                                annotation_type,
                                id: None,
                                label: format_label(annotation.label, None),
-                                is_fixable: false,
                            },
                            range,
                            annotation_type: DisplayAnnotationType::from(annotation.level),
@@ -1632,7 +1511,6 @@ fn format_body<'m>(
                                annotation_type,
                                id: None,
                                label: vec![],
-                                is_fixable: false,
                            },
                            range,
                            annotation_type: DisplayAnnotationType::from(annotation.level),
@@ -1702,7 +1580,6 @@ fn format_body<'m>(
                                annotation_type,
                                id: None,
                                label: format_label(annotation.label, None),
-                                is_fixable: false,
                            },
                            range,
                            annotation_type: DisplayAnnotationType::from(annotation.level),
--- a/crates/ruff_annotate_snippets/src/snippet.rs
+++ b/crates/ruff_annotate_snippets/src/snippet.rs
@@ -22,7 +22,6 @@ pub struct Message<'a> {
    pub(crate) title: &'a str,
    pub(crate) snippets: Vec<Snippet<'a>>,
    pub(crate) footer: Vec<Message<'a>>,
-    pub(crate) is_fixable: bool,
 }

 impl<'a> Message<'a> {
@@ -50,15 +49,6 @@ impl<'a> Message<'a> {
        self.footer.extend(footer);
        self
    }
-
-    /// Whether or not the diagnostic for this message is fixable.
-    ///
-    /// This is rendered as a `[*]` indicator after the `id` in an annotation header, if the
-    /// annotation also has `Level::None`.
-    pub fn is_fixable(mut self, yes: bool) -> Self {
-        self.is_fixable = yes;
-        self
-    }
 }

 /// Structure containing the slice of text to be annotated and
@@ -75,10 +65,6 @@ pub struct Snippet<'a> {
    pub(crate) annotations: Vec<Annotation<'a>>,

    pub(crate) fold: bool,
-
-    /// The optional cell index in a Jupyter notebook, used for reporting source locations along
-    /// with the ranges on `annotations`.
-    pub(crate) cell_index: Option<usize>,
 }

 impl<'a> Snippet<'a> {
@@ -89,7 +75,6 @@ impl<'a> Snippet<'a> {
            source,
            annotations: vec![],
            fold: false,
-            cell_index: None,
        }
    }

@@ -118,12 +103,6 @@ impl<'a> Snippet<'a> {
        self.fold = fold;
        self
    }
-
-    /// Attach a Jupyter notebook cell index.
-    pub fn cell_index(mut self, index: Option<usize>) -> Self {
-        self.cell_index = index;
-        self
-    }
 }

 /// An annotation for a [`Snippet`].
@@ -135,7 +114,6 @@ pub struct Annotation<'a> {
    pub(crate) range: Range<usize>,
    pub(crate) label: Option<&'a str>,
    pub(crate) level: Level,
-    pub(crate) is_file_level: bool,
 }

 impl<'a> Annotation<'a> {
@@ -143,11 +121,6 @@ impl<'a> Annotation<'a> {
        self.label = Some(label);
        self
    }
-
-    pub fn is_file_level(mut self, yes: bool) -> Self {
-        self.is_file_level = yes;
-        self
-    }
 }

 /// Types of annotations.
@@ -172,7 +145,6 @@ impl Level {
            title,
            snippets: vec![],
            footer: vec![],
-            is_fixable: false,
        }
    }

@@ -182,7 +154,6 @@ impl Level {
            range: span,
            label: None,
            level: self,
-            is_file_level: false,
        }
    }
 }
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -86,5 +86,5 @@ walltime = ["ruff_db/os", "ty_project", "divan"]
 [target.'cfg(target_os = "windows")'.dev-dependencies]
 mimalloc = { workspace = true }

-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dev-dependencies]
 tikv-jemallocator = { workspace = true }
--- a/crates/ruff_benchmark/benches/formatter.rs
+++ b/crates/ruff_benchmark/benches/formatter.rs
@@ -21,8 +21,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/lexer.rs
+++ b/crates/ruff_benchmark/benches/lexer.rs
@@ -18,8 +18,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/linter.rs
+++ b/crates/ruff_benchmark/benches/linter.rs
@@ -26,8 +26,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
@@ -43,8 +42,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[unsafe(export_name = "_rjem_malloc_conf")]
@@ -79,11 +77,8 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                b.iter_batched(
                    || parsed.clone(),
                    |parsed| {
-                        // Assert that file contains no parse errors
-                        assert!(parsed.has_valid_syntax());
-
                        let path = case.path();
-                        lint_only(
+                        let result = lint_only(
                            &path,
                            None,
                            settings,
@@ -91,7 +86,10 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                            &SourceKind::Python(case.code().to_string()),
                            PySourceType::from(path.as_path()),
                            ParseSource::Precomputed(parsed),
-                        )
+                        );
+
+                        // Assert that file contains no parse errors
+                        assert!(!result.has_syntax_errors());
                    },
                    criterion::BatchSize::SmallInput,
                );
--- a/crates/ruff_benchmark/benches/parser.rs
+++ b/crates/ruff_benchmark/benches/parser.rs
@@ -20,8 +20,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -18,7 +18,7 @@ use ruff_python_ast::PythonVersion;
 use ty_project::metadata::options::{EnvironmentOptions, Options};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ChangedKind};
-use ty_project::{CheckMode, Db, ProjectDatabase, ProjectMetadata};
+use ty_project::{Db, ProjectDatabase, ProjectMetadata};

 struct Case {
    db: ProjectDatabase,
@@ -102,7 +102,6 @@ fn setup_tomllib_case() -> Case {

    let re = re.unwrap();

-    db.set_check_mode(CheckMode::OpenFiles);
    db.project().set_open_files(&mut db, tomllib_files);

    let re_path = re.path(&db).as_system_path().unwrap().to_owned();
@@ -238,7 +237,6 @@ fn setup_micro_case(code: &str) -> Case {
    let mut db = ProjectDatabase::new(metadata, system).unwrap();
    let file = system_path_to_file(&db, SystemPathBuf::from(file_path)).unwrap();

-    db.set_check_mode(CheckMode::OpenFiles);
    db.project()
        .set_open_files(&mut db, FxHashSet::from_iter([file]));

@@ -351,41 +349,6 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
    });
 }

-fn benchmark_tuple_implicit_instance_attributes(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[many_tuple_assignments]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression benchmark for a case that used to hang:
-                // https://github.com/astral-sh/ty/issues/765
-                setup_micro_case(
-                    r#"
-                    from typing import Any
-
-                    class A:
-                        foo: tuple[Any, ...]
-
-                    class B(A):
-                        def __init__(self, parent: "C", x: tuple[Any]):
-                            self.foo = parent.foo + x
-
-                    class C(A):
-                        def __init__(self, parent: B, x: tuple[Any]):
-                            self.foo = parent.foo + x
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 fn benchmark_complex_constrained_attributes_1(criterion: &mut Criterion) {
    setup_rayon();

@@ -562,21 +525,14 @@ impl<'a> ProjectBenchmark<'a> {

 #[track_caller]
 fn bench_project(benchmark: &ProjectBenchmark, criterion: &mut Criterion) {
-    fn check_project(db: &mut ProjectDatabase, project_name: &str, max_diagnostics: usize) {
+    fn check_project(db: &mut ProjectDatabase, max_diagnostics: usize) {
        let result = db.check();
        let diagnostics = result.len();

-        if diagnostics > max_diagnostics {
-            let details = result
-                .into_iter()
-                .map(|diagnostic| diagnostic.concise_message().to_string())
-                .collect::<Vec<_>>()
-                .join("\n  ");
-            assert!(
-                diagnostics <= max_diagnostics,
-                "{project_name}: Expected <={max_diagnostics} diagnostics but got {diagnostics}:\n  {details}",
-            );
-        }
+        assert!(
+            diagnostics <= max_diagnostics,
+            "Expected <={max_diagnostics} diagnostics but got {diagnostics}"
+        );
    }

    setup_rayon();
@@ -586,7 +542,7 @@ fn bench_project(benchmark: &ProjectBenchmark, criterion: &mut Criterion) {
    group.bench_function(benchmark.project.config.name, |b| {
        b.iter_batched_ref(
            || benchmark.setup_iteration(),
-            |db| check_project(db, benchmark.project.config.name, benchmark.max_diagnostics),
+            |db| check_project(db, benchmark.max_diagnostics),
            BatchSize::SmallInput,
        );
    });
@@ -654,7 +610,7 @@ fn datetype(criterion: &mut Criterion) {
            max_dep_date: "2025-07-04",
            python_version: PythonVersion::PY313,
        },
-        2,
+        0,
    );

    bench_project(&benchmark, criterion);
@@ -665,7 +621,6 @@ criterion_group!(
    micro,
    benchmark_many_string_assignments,
    benchmark_many_tuple_assignments,
-    benchmark_tuple_implicit_instance_attributes,
    benchmark_complex_constrained_attributes_1,
    benchmark_complex_constrained_attributes_2,
    benchmark_many_enum_members,
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -218,24 +218,6 @@ static TANJUN: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::ne
    )
 });

-static STATIC_FRAME: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
-    Benchmark::new(
-        RealWorldProject {
-            name: "static-frame",
-            repository: "https://github.com/static-frame/static-frame",
-            commit: "34962b41baca5e7f98f5a758d530bff02748a421",
-            paths: vec![SystemPath::new("static_frame")],
-            // N.B. `arraykit` is installed as a dependency during mypy_primer runs,
-            // but it takes much longer to be installed in a Codspeed run than it does in a mypy_primer run
-            // (seems to be built from source on the Codspeed CI runners for some reason).
-            dependencies: vec!["numpy"],
-            max_dep_date: "2025-08-09",
-            python_version: PythonVersion::PY311,
-        },
-        500,
-    )
-});
-
 #[track_caller]
 fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
    bencher
@@ -250,7 +232,7 @@ fn small(bencher: Bencher, benchmark: &Benchmark) {
    run_single_threaded(bencher, benchmark);
 }

-#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS, &*STATIC_FRAME], sample_size=1, sample_count=3)]
+#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS], sample_size=1, sample_count=3)]
 fn medium(bencher: Bencher, benchmark: &Benchmark) {
    run_single_threaded(bencher, benchmark);
 }
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -14,7 +14,6 @@ license = { workspace = true }
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true, optional = true }
 ruff_diagnostics = { workspace = true }
-ruff_memory_usage = { workspace = true }
 ruff_notebook = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["get-size"] }
 ruff_python_parser = { workspace = true }
@@ -26,6 +25,7 @@ ty_static = { workspace = true }
 anstyle = { workspace = true }
 arc-swap = { workspace = true }
 camino = { workspace = true }
+countme = { workspace = true }
 dashmap = { workspace = true }
 dunce = { workspace = true }
 filetime = { workspace = true }
@@ -34,13 +34,11 @@ glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
 path-slash = { workspace = true }
-quick-junit = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-similar = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
@@ -58,13 +56,7 @@ tempfile = { workspace = true }

 [features]
 cache = ["ruff_cache"]
-junit = ["dep:quick-junit"]
 os = ["ignore", "dep:etcetera"]
-serde = [
-    "camino/serde1",
-    "dep:serde",
-    "dep:serde_json",
-    "ruff_diagnostics/serde",
-]
+serde = ["camino/serde1", "dep:serde", "dep:serde_json", "ruff_diagnostics/serde"]
 # Exposes testing utilities.
 testing = ["tracing-subscriber"]
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,14 +1,12 @@
 use std::{fmt::Formatter, path::Path, sync::Arc};

-use ruff_diagnostics::{Applicability, Fix};
+use ruff_diagnostics::Fix;
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};

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

-pub use self::render::{
-    DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input, ceil_char_boundary,
-};
+pub use self::render::{DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input};
 use crate::{Db, files::File};

 mod render;
@@ -21,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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct Diagnostic {
    /// The actual diagnostic.
    ///
@@ -124,14 +122,7 @@ impl Diagnostic {
    /// directly. If callers want or need to avoid cloning the diagnostic
    /// message, then they can also pass a `DiagnosticMessage` directly.
    pub fn info<'a>(&mut self, message: impl IntoDiagnosticMessage + 'a) {
-        self.sub(SubDiagnostic::new(SubDiagnosticSeverity::Info, message));
-    }
-
-    /// Adds a "help" sub-diagnostic with the given message.
-    ///
-    /// See the closely related [`Diagnostic::info`] method for more details.
-    pub fn help<'a>(&mut self, message: impl IntoDiagnosticMessage + 'a) {
-        self.sub(SubDiagnostic::new(SubDiagnosticSeverity::Help, message));
+        self.sub(SubDiagnostic::new(Severity::Info, message));
    }

    /// Adds a "sub" diagnostic to this diagnostic.
@@ -212,7 +203,7 @@ impl Diagnostic {
    /// The type returned implements the `std::fmt::Display` trait. In most
    /// cases, just converting it to a string (or printing it) will do what
    /// you want.
-    pub fn concise_message(&self) -> ConciseMessage<'_> {
+    pub fn concise_message(&self) -> ConciseMessage {
        let main = self.inner.message.as_str();
        let annotation = self
            .primary_annotation()
@@ -254,11 +245,6 @@ impl Diagnostic {
            .find(|ann| ann.is_primary)
    }

-    /// Returns a mutable borrow of all annotations of this diagnostic.
-    pub fn annotations_mut(&mut self) -> impl Iterator<Item = &mut Annotation> {
-        Arc::make_mut(&mut self.inner).annotations.iter_mut()
-    }
-
    /// Returns the "primary" span of this diagnostic if one exists.
    ///
    /// When there are multiple primary spans, then the first one that was
@@ -315,21 +301,11 @@ impl Diagnostic {
        &self.inner.subs
    }

-    /// Returns a mutable borrow of the sub-diagnostics of this diagnostic.
-    pub fn sub_diagnostics_mut(&mut self) -> impl Iterator<Item = &mut SubDiagnostic> {
-        Arc::make_mut(&mut self.inner).subs.iter_mut()
-    }
-
    /// Returns the fix for this diagnostic if it exists.
    pub fn fix(&self) -> Option<&Fix> {
        self.inner.fix.as_ref()
    }

-    #[cfg(test)]
-    pub(crate) fn fix_mut(&mut self) -> Option<&mut Fix> {
-        Arc::make_mut(&mut self.inner).fix.as_mut()
-    }
-
    /// Set the fix for this diagnostic.
    pub fn set_fix(&mut self, fix: Fix) {
        debug_assert!(
@@ -381,16 +357,6 @@ impl Diagnostic {
        self.inner.secondary_code.as_ref()
    }

-    /// Returns the secondary code for the diagnostic if it exists, or the lint name otherwise.
-    ///
-    /// This is a common pattern for Ruff diagnostics, which want to use the noqa code in general,
-    /// but fall back on the `invalid-syntax` identifier for syntax errors, which don't have
-    /// secondary codes.
-    pub fn secondary_code_or_id(&self) -> &str {
-        self.secondary_code()
-            .map_or_else(|| self.inner.id.as_str(), SecondaryCode::as_str)
-    }
-
    /// 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);
@@ -411,15 +377,9 @@ impl Diagnostic {
        self.primary_message()
    }

-    /// Returns the message of the first sub-diagnostic with a `Help` severity.
-    ///
-    /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
-    /// general this is not the guaranteed meaning of such a message.
-    pub fn first_help_text(&self) -> Option<&str> {
-        self.sub_diagnostics()
-            .iter()
-            .find(|sub| matches!(sub.inner.severity, SubDiagnosticSeverity::Help))
-            .map(|sub| sub.inner.message.as_str())
+    /// 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.
@@ -504,7 +464,7 @@ impl Diagnostic {
    }
 }

-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 struct DiagnosticInner {
    id: DiagnosticId,
    severity: Severity,
@@ -580,7 +540,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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct SubDiagnostic {
    /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
    /// pointer-sized.
@@ -605,10 +565,7 @@ impl SubDiagnostic {
    /// Callers can pass anything that implements `std::fmt::Display`
    /// directly. If callers want or need to avoid cloning the diagnostic
    /// message, then they can also pass a `DiagnosticMessage` directly.
-    pub fn new<'a>(
-        severity: SubDiagnosticSeverity,
-        message: impl IntoDiagnosticMessage + 'a,
-    ) -> SubDiagnostic {
+    pub fn new<'a>(severity: Severity, message: impl IntoDiagnosticMessage + 'a) -> SubDiagnostic {
        let inner = Box::new(SubDiagnosticInner {
            severity,
            message: message.into_diagnostic_message(),
@@ -636,11 +593,6 @@ impl SubDiagnostic {
        &self.inner.annotations
    }

-    /// Returns a mutable borrow of the annotations of this sub-diagnostic.
-    pub fn annotations_mut(&mut self) -> impl Iterator<Item = &mut Annotation> {
-        self.inner.annotations.iter_mut()
-    }
-
    /// Returns a shared borrow of the "primary" annotation of this diagnostic
    /// if one exists.
    ///
@@ -674,7 +626,7 @@ impl SubDiagnostic {
    /// The type returned implements the `std::fmt::Display` trait. In most
    /// cases, just converting it to a string (or printing it) will do what
    /// you want.
-    pub fn concise_message(&self) -> ConciseMessage<'_> {
+    pub fn concise_message(&self) -> ConciseMessage {
        let main = self.inner.message.as_str();
        let annotation = self
            .primary_annotation()
@@ -689,9 +641,9 @@ impl SubDiagnostic {
    }
 }

-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 struct SubDiagnosticInner {
-    severity: SubDiagnosticSeverity,
+    severity: Severity,
    message: DiagnosticMessage,
    annotations: Vec<Annotation>,
 }
@@ -717,7 +669,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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct Annotation {
    /// The span of this annotation, corresponding to some subsequence of the
    /// user's input that we want to highlight.
@@ -732,11 +684,6 @@ pub struct Annotation {
    is_primary: bool,
    /// The diagnostic tags associated with this annotation.
    tags: Vec<DiagnosticTag>,
-    /// Whether this annotation is a file-level or full-file annotation.
-    ///
-    /// When set, rendering will only include the file's name and (optional) range. Everything else
-    /// is omitted, including any file snippet or message.
-    is_file_level: bool,
 }

 impl Annotation {
@@ -755,7 +702,6 @@ impl Annotation {
            message: None,
            is_primary: true,
            tags: Vec::new(),
-            is_file_level: false,
        }
    }

@@ -772,7 +718,6 @@ impl Annotation {
            message: None,
            is_primary: false,
            tags: Vec::new(),
-            is_file_level: false,
        }
    }

@@ -838,28 +783,13 @@ impl Annotation {
    pub fn push_tag(&mut self, tag: DiagnosticTag) {
        self.tags.push(tag);
    }
-
-    /// Set whether or not this annotation is file-level.
-    ///
-    /// File-level annotations are only rendered with their file name and range, if available. This
-    /// is intended for backwards compatibility with Ruff diagnostics, which historically used
-    /// `TextRange::default` to indicate a file-level diagnostic. In the new diagnostic model, a
-    /// [`Span`] with a range of `None` should be used instead, as mentioned in the `Span`
-    /// documentation.
-    ///
-    /// TODO(brent) update this usage in Ruff and remove `is_file_level` entirely. See
-    /// <https://github.com/astral-sh/ruff/issues/19688>, especially my first comment, for more
-    /// details.
-    pub fn set_file_level(&mut self, yes: bool) {
-        self.is_file_level = yes;
-    }
 }

 /// Tags that can be associated with an 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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub enum DiagnosticTag {
    /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
    Unnecessary,
@@ -1068,7 +998,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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub enum UnifiedFile {
    Ty(File),
    Ruff(SourceFile),
@@ -1119,7 +1049,7 @@ enum DiagnosticSource {

 impl DiagnosticSource {
    /// Returns this input as a `SourceCode` for convenient querying.
-    fn as_source_code(&self) -> SourceCode<'_, '_> {
+    fn as_source_code(&self) -> SourceCode {
        match self {
            DiagnosticSource::Ty(input) => SourceCode::new(input.text.as_str(), &input.line_index),
            DiagnosticSource::Ruff(source) => SourceCode::new(source.source_text(), source.index()),
@@ -1132,7 +1062,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, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub struct Span {
    file: UnifiedFile,
    range: Option<TextRange>,
@@ -1210,7 +1140,7 @@ impl From<crate::files::FileRange> for Span {
    }
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
 pub enum Severity {
    Info,
    Warning,
@@ -1240,32 +1170,6 @@ impl Severity {
    }
 }

-/// Like [`Severity`] but exclusively for sub-diagnostics.
-///
-/// This type only exists to add an additional `Help` severity that isn't present in `Severity` or
-/// used for main diagnostics. If we want to add `Severity::Help` in the future, this type could be
-/// deleted and the two combined again.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
-pub enum SubDiagnosticSeverity {
-    Help,
-    Info,
-    Warning,
-    Error,
-    Fatal,
-}
-
-impl SubDiagnosticSeverity {
-    fn to_annotate(self) -> AnnotateLevel {
-        match self {
-            SubDiagnosticSeverity::Help => AnnotateLevel::Help,
-            SubDiagnosticSeverity::Info => AnnotateLevel::Info,
-            SubDiagnosticSeverity::Warning => AnnotateLevel::Warning,
-            SubDiagnosticSeverity::Error => AnnotateLevel::Error,
-            SubDiagnosticSeverity::Fatal => AnnotateLevel::Error,
-        }
-    }
-}
-
 /// Configuration for rendering diagnostics.
 #[derive(Clone, Debug)]
 pub struct DisplayDiagnosticConfig {
@@ -1292,19 +1196,6 @@ pub struct DisplayDiagnosticConfig {
        reason = "This is currently only used for JSON but will be needed soon for other formats"
    )]
    preview: bool,
-    /// Whether to hide the real `Severity` of diagnostics.
-    ///
-    /// This is intended for temporary use by Ruff, which only has a single `error` severity at the
-    /// moment. We should be able to remove this option when Ruff gets more severities.
-    hide_severity: bool,
-    /// Whether to show the availability of a fix in a diagnostic.
-    show_fix_status: bool,
-    /// Whether to show the diff for an available fix after the main diagnostic.
-    ///
-    /// This currently only applies to `DiagnosticFormat::Full`.
-    show_fix_diff: bool,
-    /// The lowest applicability that should be shown when reporting diagnostics.
-    fix_applicability: Applicability,
 }

 impl DisplayDiagnosticConfig {
@@ -1333,43 +1224,6 @@ impl DisplayDiagnosticConfig {
            ..self
        }
    }
-
-    /// Whether to hide a diagnostic's severity or not.
-    pub fn hide_severity(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            hide_severity: yes,
-            ..self
-        }
-    }
-
-    /// Whether to show a fix's availability or not.
-    pub fn show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            show_fix_status: yes,
-            ..self
-        }
-    }
-
-    /// Whether to show a diff for an available fix after the main diagnostic.
-    pub fn show_fix_diff(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            show_fix_diff: yes,
-            ..self
-        }
-    }
-
-    /// Set the lowest fix applicability that should be shown.
-    ///
-    /// In other words, an applicability of `Safe` (the default) would suppress showing fixes or fix
-    /// availability for unsafe or display-only fixes.
-    ///
-    /// Note that this option is currently ignored when `hide_severity` is false.
-    pub fn fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            fix_applicability: applicability,
-            ..self
-        }
-    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1379,10 +1233,6 @@ impl Default for DisplayDiagnosticConfig {
            color: false,
            context: 2,
            preview: false,
-            hide_severity: false,
-            show_fix_status: false,
-            show_fix_diff: false,
-            fix_applicability: Applicability::Safe,
        }
    }
 }
@@ -1432,9 +1282,6 @@ pub enum DiagnosticFormat {
    Rdjson,
    /// Print diagnostics in the format emitted by Pylint.
    Pylint,
-    /// Print diagnostics in the format expected by JUnit.
-    #[cfg(feature = "junit")]
-    Junit,
 }

 /// A representation of the kinds of messages inside a diagnostic.
@@ -1493,7 +1340,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, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
 pub struct DiagnosticMessage(Box<str>);

 impl DiagnosticMessage {
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -50,8 +50,10 @@ impl AzureRenderer<'_> {
            }
            writeln!(
                f,
-                "code={code};]{body}",
-                code = diag.secondary_code_or_id(),
+                "{code}]{body}",
+                code = diag
+                    .secondary_code()
+                    .map_or_else(String::new, |code| format!("code={code};")),
                body = diag.body(),
            )?;
        }
--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -1,201 +0,0 @@
-use crate::diagnostic::{
-    Diagnostic, DisplayDiagnosticConfig, Severity,
-    stylesheet::{DiagnosticStylesheet, fmt_styled},
-};
-
-use super::FileResolver;
-
-pub(super) struct ConciseRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-    config: &'a DisplayDiagnosticConfig,
-}
-
-impl<'a> ConciseRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
-        Self { resolver, config }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        let stylesheet = if self.config.color {
-            DiagnosticStylesheet::styled()
-        } else {
-            DiagnosticStylesheet::plain()
-        };
-
-        let sep = fmt_styled(":", stylesheet.separator);
-        for diag in diagnostics {
-            if let Some(span) = diag.primary_span() {
-                write!(
-                    f,
-                    "{path}",
-                    path = fmt_styled(
-                        span.file().relative_path(self.resolver).to_string_lossy(),
-                        stylesheet.emphasis
-                    )
-                )?;
-                if let Some(range) = span.range() {
-                    let diagnostic_source = span.file().diagnostic_source(self.resolver);
-                    let start = diagnostic_source
-                        .as_source_code()
-                        .line_column(range.start());
-
-                    if let Some(notebook_index) = self.resolver.notebook_index(span.file()) {
-                        write!(
-                            f,
-                            "{sep}cell {cell}{sep}{line}{sep}{col}",
-                            cell = notebook_index.cell(start.line).unwrap_or_default(),
-                            line = notebook_index.cell_row(start.line).unwrap_or_default(),
-                            col = start.column,
-                        )?;
-                    } else {
-                        write!(
-                            f,
-                            "{sep}{line}{sep}{col}",
-                            line = start.line,
-                            col = start.column,
-                        )?;
-                    }
-                }
-                write!(f, "{sep} ")?;
-            }
-            if self.config.hide_severity {
-                if let Some(code) = diag.secondary_code() {
-                    write!(
-                        f,
-                        "{code} ",
-                        code = fmt_styled(code, stylesheet.secondary_code)
-                    )?;
-                } else {
-                    write!(
-                        f,
-                        "{id}: ",
-                        id = fmt_styled(diag.inner.id.as_str(), stylesheet.secondary_code)
-                    )?;
-                }
-                if self.config.show_fix_status {
-                    if let Some(fix) = diag.fix() {
-                        // Do not display an indicator for inapplicable fixes
-                        if fix.applies(self.config.fix_applicability) {
-                            write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
-                        }
-                    }
-                }
-            } else {
-                let (severity, severity_style) = match diag.severity() {
-                    Severity::Info => ("info", stylesheet.info),
-                    Severity::Warning => ("warning", stylesheet.warning),
-                    Severity::Error => ("error", stylesheet.error),
-                    Severity::Fatal => ("fatal", stylesheet.error),
-                };
-                write!(
-                    f,
-                    "{severity}[{id}] ",
-                    severity = fmt_styled(severity, severity_style),
-                    id = fmt_styled(diag.id(), stylesheet.emphasis)
-                )?;
-            }
-
-            writeln!(f, "{message}", message = diag.concise_message())?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ruff_diagnostics::Applicability;
-
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{
-            TestEnvironment, create_diagnostics, create_notebook_diagnostics,
-            create_syntax_error_diagnostics,
-        },
-    };
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        fib.py:1:8: error[unused-import] `os` imported but unused
-        fib.py:6:5: error[unused-variable] Local variable `x` is assigned to but never used
-        undef.py:1:4: error[undefined-name] Undefined name `a`
-        ");
-    }
-
-    #[test]
-    fn show_fixes() {
-        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        env.hide_severity(true);
-        env.show_fix_status(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        fib.py:1:8: F401 [*] `os` imported but unused
-        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
-        undef.py:1:4: F821 Undefined name `a`
-        ");
-    }
-
-    #[test]
-    fn show_fixes_preview() {
-        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        env.hide_severity(true);
-        env.show_fix_status(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-        env.preview(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        fib.py:1:8: F401 [*] `os` imported but unused
-        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
-        undef.py:1:4: F821 Undefined name `a`
-        ");
-    }
-
-    #[test]
-    fn show_fixes_syntax_errors() {
-        let (mut env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
-        env.hide_severity(true);
-        env.show_fix_status(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-        syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
-        ");
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        syntax_errors.py:1:15: error[invalid-syntax] Expected one or more symbol names after import
-        syntax_errors.py:3:12: error[invalid-syntax] Expected ')', found newline
-        ");
-    }
-
-    #[test]
-    fn notebook_output() {
-        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        notebook.ipynb:cell 1:2:8: error[unused-import] `os` imported but unused
-        notebook.ipynb:cell 2:2:8: error[unused-import] `math` imported but unused
-        notebook.ipynb:cell 3:4:5: error[unused-variable] Local variable `x` is assigned to but never used
-        ");
-    }
-
-    #[test]
-    fn missing_file() {
-        let mut env = TestEnvironment::new();
-        env.format(DiagnosticFormat::Concise);
-
-        let diag = env.err().build();
-
-        insta::assert_snapshot!(
-            env.render(&diag),
-            @"error[test-diagnostic] main diagnostic message",
-        );
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -1,904 +0,0 @@
-use std::borrow::Cow;
-use std::num::NonZeroUsize;
-
-use anstyle::Style;
-use ruff_notebook::NotebookIndex;
-use similar::{ChangeTag, TextDiff};
-
-use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-use ruff_diagnostics::{Applicability, Fix};
-use ruff_source_file::OneIndexed;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
-
-use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
-
-pub(super) struct FullRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-    config: &'a DisplayDiagnosticConfig,
-}
-
-impl<'a> FullRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
-        Self { resolver, config }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        let stylesheet = if self.config.color {
-            DiagnosticStylesheet::styled()
-        } else {
-            DiagnosticStylesheet::plain()
-        };
-
-        let mut renderer = if self.config.color {
-            AnnotateRenderer::styled()
-        } else {
-            AnnotateRenderer::plain()
-        }
-        .cut_indicator("…");
-
-        renderer = renderer
-            .error(stylesheet.error)
-            .warning(stylesheet.warning)
-            .info(stylesheet.info)
-            .note(stylesheet.note)
-            .help(stylesheet.help)
-            .line_no(stylesheet.line_no)
-            .emphasis(stylesheet.emphasis)
-            .none(stylesheet.none);
-
-        for diag in diagnostics {
-            let resolved = Resolved::new(self.resolver, diag, self.config);
-            let renderable = resolved.to_renderable(self.config.context);
-            for diag in renderable.diagnostics.iter() {
-                writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
-            }
-            writeln!(f)?;
-
-            if self.config.show_fix_diff {
-                if let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver) {
-                    writeln!(f, "{diff}")?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the `Edit` because diff calculation is expensive.
-struct Diff<'a> {
-    fix: &'a Fix,
-    diagnostic_source: DiagnosticSource,
-    notebook_index: Option<NotebookIndex>,
-    stylesheet: &'a DiagnosticStylesheet,
-}
-
-impl<'a> Diff<'a> {
-    fn from_diagnostic(
-        diagnostic: &'a Diagnostic,
-        stylesheet: &'a DiagnosticStylesheet,
-        resolver: &'a dyn FileResolver,
-    ) -> Option<Diff<'a>> {
-        let file = &diagnostic.primary_span_ref()?.file;
-        Some(Diff {
-            fix: diagnostic.fix()?,
-            diagnostic_source: file.diagnostic_source(resolver),
-            notebook_index: resolver.notebook_index(file),
-            stylesheet,
-        })
-    }
-}
-
-impl std::fmt::Display for Diff<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let source_code = self.diagnostic_source.as_source_code();
-        let source_text = source_code.text();
-
-        // Partition the source code into end offsets for each cell. If `self.notebook_index` is
-        // `None`, indicating a regular script file, all the lines will be in one "cell" under the
-        // `None` key.
-        let cells = if let Some(notebook_index) = &self.notebook_index {
-            let mut last_cell = OneIndexed::MIN;
-            let mut cells: Vec<(Option<OneIndexed>, TextSize)> = Vec::new();
-            for (row, cell) in notebook_index.iter() {
-                if cell != last_cell {
-                    let offset = source_code.line_start(row);
-                    cells.push((Some(last_cell), offset));
-                    last_cell = cell;
-                }
-            }
-            cells.push((Some(last_cell), source_text.text_len()));
-            cells
-        } else {
-            vec![(None, source_text.text_len())]
-        };
-
-        let message = match self.fix.applicability() {
-            // TODO(zanieb): Adjust this messaging once it's user-facing
-            Applicability::Safe => "Safe fix",
-            Applicability::Unsafe => "Unsafe fix",
-            Applicability::DisplayOnly => "Display-only fix",
-        };
-
-        // TODO(brent) `stylesheet.separator` is cyan rather than blue, as we had before. I think
-        // we're getting rid of this soon anyway, so I didn't think it was worth adding another
-        // style to the stylesheet temporarily. The color doesn't appear at all in the snapshot
-        // tests, which is the only place these are currently used.
-        writeln!(f, "ℹ {}", fmt_styled(message, self.stylesheet.separator))?;
-
-        let mut last_end = TextSize::ZERO;
-        for (cell, offset) in cells {
-            let range = TextRange::new(last_end, offset);
-            last_end = offset;
-            let input = source_code.slice(range);
-
-            let mut output = String::with_capacity(input.len());
-            let mut last_end = range.start();
-
-            let mut applied = 0;
-            for edit in self.fix.edits() {
-                if range.contains_range(edit.range()) {
-                    output.push_str(source_code.slice(TextRange::new(last_end, edit.start())));
-                    output.push_str(edit.content().unwrap_or_default());
-                    last_end = edit.end();
-                    applied += 1;
-                }
-            }
-
-            // No edits were applied, so there's no need to diff.
-            if applied == 0 {
-                continue;
-            }
-
-            output.push_str(&source_text[usize::from(last_end)..usize::from(range.end())]);
-
-            let diff = TextDiff::from_lines(input, &output);
-
-            let (largest_old, largest_new) = diff
-                .ops()
-                .last()
-                .map(|op| (op.old_range().start, op.new_range().start))
-                .unwrap_or_default();
-
-            let digit_with = OneIndexed::from_zero_indexed(largest_new.max(largest_old)).digits();
-
-            if let Some(cell) = cell {
-                // Room for 2 digits, 2 x 1 space before each digit, 1 space, and 1 `|`. This
-                // centers the three colons on the pipe.
-                writeln!(f, "{:>1$} cell {cell}", ":::", 2 * digit_with.get() + 4)?;
-            }
-
-            for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
-                if idx > 0 {
-                    writeln!(f, "{:-^1$}", "-", 80)?;
-                }
-                for op in group {
-                    for change in diff.iter_inline_changes(op) {
-                        let sign = match change.tag() {
-                            ChangeTag::Delete => "-",
-                            ChangeTag::Insert => "+",
-                            ChangeTag::Equal => " ",
-                        };
-
-                        let line_style = LineStyle::from(change.tag(), self.stylesheet);
-
-                        let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
-                        let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
-
-                        write!(
-                            f,
-                            "{} {} |{}",
-                            Line {
-                                index: old_index,
-                                width: digit_with,
-                            },
-                            Line {
-                                index: new_index,
-                                width: digit_with,
-                            },
-                            fmt_styled(line_style.apply_to(sign), self.stylesheet.emphasis),
-                        )?;
-
-                        for (emphasized, value) in change.iter_strings_lossy() {
-                            let value = show_nonprinting(&value);
-                            if emphasized {
-                                write!(
-                                    f,
-                                    "{}",
-                                    fmt_styled(
-                                        line_style.apply_to(&value),
-                                        self.stylesheet.underline
-                                    )
-                                )?;
-                            } else {
-                                write!(f, "{}", line_style.apply_to(&value))?;
-                            }
-                        }
-                        if change.missing_newline() {
-                            writeln!(f)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct LineStyle {
-    style: Style,
-}
-
-impl LineStyle {
-    fn apply_to(&self, input: &str) -> impl std::fmt::Display {
-        fmt_styled(input, self.style)
-    }
-
-    fn from(value: ChangeTag, stylesheet: &DiagnosticStylesheet) -> LineStyle {
-        match value {
-            ChangeTag::Equal => LineStyle {
-                style: stylesheet.none,
-            },
-            ChangeTag::Delete => LineStyle {
-                style: stylesheet.deletion,
-            },
-            ChangeTag::Insert => LineStyle {
-                style: stylesheet.insertion,
-            },
-        }
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl std::fmt::Display for Line {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-fn show_nonprinting(s: &str) -> Cow<'_, str> {
-    if s.find(['\x07', '\x08', '\x1b', '\x7f']).is_some() {
-        Cow::Owned(
-            s.replace('\x07', "␇")
-                .replace('\x08', "␈")
-                .replace('\x1b', "␛")
-                .replace('\x7f', "␡"),
-        )
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ruff_diagnostics::{Applicability, Fix};
-    use ruff_text_size::{TextLen, TextRange, TextSize};
-
-    use crate::diagnostic::{
-        Annotation, DiagnosticFormat, Severity,
-        render::tests::{
-            NOTEBOOK, TestEnvironment, create_diagnostics, create_notebook_diagnostics,
-            create_syntax_error_diagnostics,
-        },
-    };
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
-        error[unused-import]: `os` imported but unused
-         --> fib.py:1:8
-          |
-        1 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        error[unused-variable]: Local variable `x` is assigned to but never used
-         --> fib.py:6:5
-          |
-        4 | def fibonacci(n):
-        5 |     """Compute the nth number in the Fibonacci sequence."""
-        6 |     x = 1
-          |     ^
-        7 |     if n == 0:
-        8 |         return 0
-          |
-        help: Remove assignment to unused variable `x`
-
-        error[undefined-name]: Undefined name `a`
-         --> undef.py:1:4
-          |
-        1 | if a == 1: pass
-          |    ^
-          |
-        "#);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Full);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[invalid-syntax]: Expected one or more symbol names after import
-         --> syntax_errors.py:1:15
-          |
-        1 | from os import
-          |               ^
-        2 |
-        3 | if call(foo
-          |
-
-        error[invalid-syntax]: Expected ')', found newline
-         --> syntax_errors.py:3:12
-          |
-        1 | from os import
-        2 |
-        3 | if call(foo
-          |            ^
-        4 |     def bar():
-        5 |         pass
-          |
-        ");
-    }
-
-    #[test]
-    fn hide_severity_output() {
-        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
-        env.hide_severity(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
-        F401 [*] `os` imported but unused
-         --> fib.py:1:8
-          |
-        1 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        F841 [*] Local variable `x` is assigned to but never used
-         --> fib.py:6:5
-          |
-        4 | def fibonacci(n):
-        5 |     """Compute the nth number in the Fibonacci sequence."""
-        6 |     x = 1
-          |     ^
-        7 |     if n == 0:
-        8 |         return 0
-          |
-        help: Remove assignment to unused variable `x`
-
-        F821 Undefined name `a`
-         --> undef.py:1:4
-          |
-        1 | if a == 1: pass
-          |    ^
-          |
-        "#);
-    }
-
-    #[test]
-    fn hide_severity_syntax_errors() {
-        let (mut env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Full);
-        env.hide_severity(true);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        invalid-syntax: Expected one or more symbol names after import
-         --> syntax_errors.py:1:15
-          |
-        1 | from os import
-          |               ^
-        2 |
-        3 | if call(foo
-          |
-
-        invalid-syntax: Expected ')', found newline
-         --> syntax_errors.py:3:12
-          |
-        1 | from os import
-        2 |
-        3 | if call(foo
-          |            ^
-        4 |     def bar():
-        5 |         pass
-          |
-        ");
-    }
-
-    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit c9b99e4.
-    ///
-    /// For example, without the fix, we get diagnostics like this:
-    ///
-    /// ```
-    /// error[no-indented-block]: Expected an indented block
-    ///  --> example.py:3:1
-    ///   |
-    /// 2 | if False:
-    ///   |          ^
-    /// 3 | print()
-    ///   |
-    ///  ```
-    ///
-    /// where the caret points to the end of the previous line instead of the start of the next.
-    #[test]
-    fn empty_span_after_line_terminator() {
-        let mut env = TestEnvironment::new();
-        env.add(
-            "example.py",
-            r#"
-if False:
-print()
-"#,
-        );
-        env.format(DiagnosticFormat::Full);
-
-        let diagnostic = env
-            .builder(
-                "no-indented-block",
-                Severity::Error,
-                "Expected an indented block",
-            )
-            .primary("example.py", "3:0", "3:0", "")
-            .build();
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[no-indented-block]: Expected an indented block
-         --> example.py:3:1
-          |
-        2 | if False:
-        3 | print()
-          | ^
-          |
-        ");
-    }
-
-    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit 2922490.
-    ///
-    /// For example, without the fix, we get diagnostics like this:
-    ///
-    /// ```
-    /// error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
-    ///  --> example.py:1:25
-    ///   |
-    /// 1 | nested_fstrings = f'␈{f'{f'␛'}'}'
-    ///   |                       ^
-    ///   |
-    ///  ```
-    ///
-    /// where the caret points to the `f` in the f-string instead of the start of the invalid
-    /// character (`^Z`).
-    #[test]
-    fn unprintable_characters() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "nested_fstrings = f'{f'{f''}'}'");
-        env.format(DiagnosticFormat::Full);
-
-        let diagnostic = env
-            .builder(
-                "invalid-character-sub",
-                Severity::Error,
-                r#"Invalid unescaped character SUB, use "\x1a" instead"#,
-            )
-            .primary("example.py", "1:24", "1:24", "")
-            .build();
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r#"
-        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
-         --> example.py:1:25
-          |
-        1 | nested_fstrings = f'␈{f'{f'␛'}'}'
-          |                         ^
-          |
-        "#);
-    }
-
-    #[test]
-    fn multiple_unprintable_characters() -> std::io::Result<()> {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "");
-        env.format(DiagnosticFormat::Full);
-
-        let diagnostic = env
-            .builder(
-                "invalid-character-sub",
-                Severity::Error,
-                r#"Invalid unescaped character SUB, use "\x1a" instead"#,
-            )
-            .primary("example.py", "1:1", "1:1", "")
-            .build();
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r#"
-        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
-         --> example.py:1:2
-          |
-        1 | ␈␛
-          |  ^
-          |
-        "#);
-
-        Ok(())
-    }
-
-    /// Ensure that the header column matches the column in the user's input, even if we've replaced
-    /// tabs with spaces for rendering purposes.
-    #[test]
-    fn tab_replacement() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "def foo():\n\treturn 1");
-        env.format(DiagnosticFormat::Full);
-
-        let diagnostic = env.err().primary("example.py", "2:1", "2:9", "").build();
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:2
-          |
-        1 | def foo():
-        2 |     return 1
-          |     ^^^^^^^^
-          |
-        ");
-    }
-
-    /// For file-level diagnostics, we expect to see the header line with the diagnostic information
-    /// and the `-->` line with the file information but no lines of source code.
-    #[test]
-    fn file_level() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env.path("example.py").with_range(TextRange::default());
-        let mut annotation = Annotation::primary(span);
-        annotation.set_file_level(true);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-        --> example.py:1:1
-        ");
-    }
-
-    /// Check that ranges in notebooks are remapped relative to the cells.
-    #[test]
-    fn notebook_output() {
-        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-
-        error[unused-variable]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-        ");
-    }
-
-    /// Check notebook handling for multiple annotations in a single diagnostic that span cells.
-    #[test]
-    fn notebook_output_multiple_annotations() {
-        let mut env = TestEnvironment::new();
-        env.add("notebook.ipynb", NOTEBOOK);
-
-        let diagnostics = vec![
-            // adjacent context windows
-            env.builder("unused-import", Severity::Error, "`os` imported but unused")
-                .primary("notebook.ipynb", "2:7", "2:9", "")
-                .secondary("notebook.ipynb", "4:7", "4:11", "second cell")
-                .help("Remove unused import: `os`")
-                .build(),
-            // non-adjacent context windows
-            env.builder("unused-import", Severity::Error, "`os` imported but unused")
-                .primary("notebook.ipynb", "2:7", "2:9", "")
-                .secondary("notebook.ipynb", "10:4", "10:5", "second cell")
-                .help("Remove unused import: `os`")
-                .build(),
-            // adjacent context windows in the same cell
-            env.err()
-                .primary("notebook.ipynb", "4:7", "4:11", "second cell")
-                .secondary("notebook.ipynb", "6:0", "6:5", "print statement")
-                .help("Remove `print` statement")
-                .build(),
-        ];
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-         ::: notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ---- second cell
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `os`
-
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-         ::: notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     - second cell
-          |
-        help: Remove unused import: `os`
-
-        error[test-diagnostic]: main diagnostic message
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^ second cell
-        3 |
-        4 | print('hello world')
-          | ----- print statement
-          |
-        help: Remove `print` statement
-        ");
-    }
-
-    /// Test that we remap notebook cell line numbers in the diff as well as the main diagnostic.
-    #[test]
-    fn notebook_output_with_diff() {
-        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        ℹ Safe fix
-           ::: cell 1
-        1 1 | # cell 1
-        2   |-import os
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-
-        ℹ Safe fix
-           ::: cell 2
-        1 1 | # cell 2
-        2   |-import math
-        3 2 | 
-        4 3 | print('hello world')
-
-        error[unused-variable]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-
-        ℹ Unsafe fix
-           ::: cell 3
-        1 1 | # cell 3
-        2 2 | def foo():
-        3 3 |     print()
-        4   |-    x = 1
-        5 4 |
-        ");
-    }
-
-    #[test]
-    fn notebook_output_with_diff_spanning_cells() {
-        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-
-        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
-        // single diagnostic with edits in different cells.
-        let mut diagnostic = diagnostics.swap_remove(0);
-        let fix = diagnostic.fix_mut().unwrap();
-        let mut edits = fix.edits().to_vec();
-        for diag in diagnostics {
-            edits.extend_from_slice(diag.fix().unwrap().edits());
-        }
-        *fix = Fix::unsafe_edits(edits.remove(0), edits);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        ℹ Unsafe fix
-           ::: cell 1
-        1 1 | # cell 1
-        2   |-import os
-           ::: cell 2
-        1 1 | # cell 2
-        2   |-import math
-        3 2 | 
-        4 3 | print('hello world')
-           ::: cell 3
-        1 1 | # cell 3
-        2 2 | def foo():
-        3 3 |     print()
-        4   |-    x = 1
-        5 4 |
-        ");
-    }
-
-    /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
-    /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
-    #[test]
-    fn normalize_carriage_return() {
-        let mut env = TestEnvironment::new();
-        env.add(
-            "example.py",
-            "# Keep parenthesis around preserved CR\rint(-\r    1)\rint(+\r    1)",
-        );
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(39), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | # Keep parenthesis around preserved CR
-        2 | int(-
-          | ^
-        3 |     1)
-        4 | int(+
-          |
-        ");
-    }
-
-    /// Without stripping the BOM, we report an error in column 2, unlike Ruff.
-    #[test]
-    fn strip_bom() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(3), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    #[test]
-    fn bom_with_default_range() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env.path("example.py").with_range(TextRange::default());
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    /// We previously rendered this correctly, but the header was falling back to 1:1 for ranges
-    /// pointing to the final newline in a file. Like Ruff, we now use the offset of the first
-    /// character in the nonexistent final line in the header.
-    #[test]
-    fn end_of_file() {
-        let mut env = TestEnvironment::new();
-        let contents = "unexpected eof\n";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(contents.text_len(), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | unexpected eof
-          |               ^
-          |
-        ");
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;

-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig, SecondaryCode};

 use super::FileResolver;

@@ -87,7 +87,7 @@ pub(super) fn diagnostic_to_json<'a>(

    let fix = diagnostic.fix().map(|fix| JsonFix {
        applicability: fix.applicability(),
-        message: diagnostic.first_help_text(),
+        message: diagnostic.suggestion(),
        edits: ExpandedEdits {
            edits: fix.edits(),
            notebook_index,
@@ -99,7 +99,7 @@ pub(super) fn diagnostic_to_json<'a>(
    // In preview, the locations and filename can be optional.
    if config.preview {
        JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
@@ -111,7 +111,7 @@ pub(super) fn diagnostic_to_json<'a>(
        }
    } else {
        JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
@@ -221,7 +221,7 @@ impl Serialize for ExpandedEdits<'_> {
 #[derive(Serialize)]
 pub(crate) struct JsonDiagnostic<'a> {
    cell: Option<OneIndexed>,
-    code: &'a str,
+    code: Option<&'a SecondaryCode>,
    end_location: Option<JsonLocation>,
    filename: Option<&'a str>,
    fix: Option<JsonFix<'a>>,
@@ -302,7 +302,7 @@ mod tests {
        [
          {
            "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
            "end_location": {
              "column": 1,
              "row": 1
@@ -336,7 +336,7 @@ mod tests {
        [
          {
            "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
            "end_location": null,
            "filename": null,
            "fix": null,
--- a/crates/ruff_db/src/diagnostic/render/junit.rs
+++ b/crates/ruff_db/src/diagnostic/render/junit.rs
@@ -1,195 +0,0 @@
-use std::{collections::BTreeMap, ops::Deref, path::Path};
-
-use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestSuite, XmlString};
-
-use ruff_source_file::LineColumn;
-
-use crate::diagnostic::{Diagnostic, SecondaryCode, render::FileResolver};
-
-/// A renderer for diagnostics in the [JUnit] format.
-///
-/// See [`junit.xsd`] for the specification in the JUnit repository and an annotated [version]
-/// linked from the [`quick_junit`] docs.
-///
-/// [JUnit]: https://junit.org/
-/// [`junit.xsd`]: https://github.com/junit-team/junit-framework/blob/2870b7d8fd5bf7c1efe489d3991d3ed3900e82bb/platform-tests/src/test/resources/jenkins-junit.xsd
-/// [version]: https://llg.cubic.org/docs/junit/
-/// [`quick_junit`]: https://docs.rs/quick-junit/latest/quick_junit/
-pub struct JunitRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-}
-
-impl<'a> JunitRenderer<'a> {
-    pub fn new(resolver: &'a dyn FileResolver) -> Self {
-        Self { resolver }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        let mut report = Report::new("ruff");
-
-        if diagnostics.is_empty() {
-            let mut test_suite = TestSuite::new("ruff");
-            test_suite
-                .extra
-                .insert(XmlString::new("package"), XmlString::new("org.ruff"));
-            let mut case = TestCase::new("No errors found", TestCaseStatus::success());
-            case.set_classname("ruff");
-            test_suite.add_test_case(case);
-            report.add_test_suite(test_suite);
-        } else {
-            for (filename, diagnostics) in group_diagnostics_by_filename(diagnostics, self.resolver)
-            {
-                let mut test_suite = TestSuite::new(filename);
-                test_suite
-                    .extra
-                    .insert(XmlString::new("package"), XmlString::new("org.ruff"));
-
-                let classname = Path::new(filename).with_extension("");
-
-                for diagnostic in diagnostics {
-                    let DiagnosticWithLocation {
-                        diagnostic,
-                        start_location: location,
-                    } = diagnostic;
-                    let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.body());
-
-                    if let Some(location) = location {
-                        status.set_description(format!(
-                            "line {row}, col {col}, {body}",
-                            row = location.line,
-                            col = location.column,
-                            body = diagnostic.body()
-                        ));
-                    } else {
-                        status.set_description(diagnostic.body());
-                    }
-
-                    let code = diagnostic
-                        .secondary_code()
-                        .map_or_else(|| diagnostic.name(), SecondaryCode::as_str);
-                    let mut case = TestCase::new(format!("org.ruff.{code}"), status);
-                    case.set_classname(classname.to_str().unwrap());
-
-                    if let Some(location) = location {
-                        case.extra.insert(
-                            XmlString::new("line"),
-                            XmlString::new(location.line.to_string()),
-                        );
-                        case.extra.insert(
-                            XmlString::new("column"),
-                            XmlString::new(location.column.to_string()),
-                        );
-                    }
-
-                    test_suite.add_test_case(case);
-                }
-                report.add_test_suite(test_suite);
-            }
-        }
-
-        let adapter = FmtAdapter { fmt: f };
-        report.serialize(adapter).map_err(|_| std::fmt::Error)
-    }
-}
-
-// TODO(brent) this and `group_diagnostics_by_filename` are also used by the `grouped` output
-// format. I think they'd make more sense in that file, but I started here first. I'll move them to
-// that module when adding the `grouped` output format.
-struct DiagnosticWithLocation<'a> {
-    diagnostic: &'a Diagnostic,
-    start_location: Option<LineColumn>,
-}
-
-impl Deref for DiagnosticWithLocation<'_> {
-    type Target = Diagnostic;
-
-    fn deref(&self) -> &Self::Target {
-        self.diagnostic
-    }
-}
-
-fn group_diagnostics_by_filename<'a>(
-    diagnostics: &'a [Diagnostic],
-    resolver: &'a dyn FileResolver,
-) -> BTreeMap<&'a str, Vec<DiagnosticWithLocation<'a>>> {
-    let mut grouped_diagnostics = BTreeMap::default();
-    for diagnostic in diagnostics {
-        let (filename, start_location) = diagnostic
-            .primary_span_ref()
-            .map(|span| {
-                let file = span.file();
-                let start_location =
-                    span.range()
-                        .filter(|_| !resolver.is_notebook(file))
-                        .map(|range| {
-                            file.diagnostic_source(resolver)
-                                .as_source_code()
-                                .line_column(range.start())
-                        });
-
-                (span.file().path(resolver), start_location)
-            })
-            .unwrap_or_default();
-
-        grouped_diagnostics
-            .entry(filename)
-            .or_insert_with(Vec::new)
-            .push(DiagnosticWithLocation {
-                diagnostic,
-                start_location,
-            });
-    }
-    grouped_diagnostics
-}
-
-struct FmtAdapter<'a> {
-    fmt: &'a mut dyn std::fmt::Write,
-}
-
-impl std::io::Write for FmtAdapter<'_> {
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        self.fmt
-            .write_str(std::str::from_utf8(buf).map_err(|_| {
-                std::io::Error::new(
-                    std::io::ErrorKind::InvalidData,
-                    "Invalid UTF-8 in JUnit report",
-                )
-            })?)
-            .map_err(std::io::Error::other)?;
-
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn write_fmt(&mut self, args: std::fmt::Arguments<'_>) -> std::io::Result<()> {
-        self.fmt.write_fmt(args).map_err(std::io::Error::other)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
-    };
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Junit);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Junit);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;]SyntaxError: Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;]SyntaxError: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
@@ -5,7 +5,7 @@ expression: env.render_diagnostics(&diagnostics)
 [
  {
    "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
    "end_location": {
      "column": 1,
      "row": 2
@@ -16,13 +16,13 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 15,
      "row": 1
    },
-    "message": "Expected one or more symbol names after import",
+    "message": "SyntaxError: Expected one or more symbol names after import",
    "noqa_row": null,
    "url": null
  },
  {
    "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
    "end_location": {
      "column": 1,
      "row": 4
@@ -33,7 +33,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 12,
      "row": 3
    },
-    "message": "Expected ')', found newline",
+    "message": "SyntaxError: Expected ')', found newline",
    "noqa_row": null,
    "url": null
  }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
+{"cell":null,"code":null,"end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"SyntaxError: Expected one or more symbol names after import","noqa_row":null,"url":null}
+{"cell":null,"code":null,"end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"SyntaxError: Expected ')', found newline","noqa_row":null,"url":null}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
@@ -1,15 +0,0 @@
---
-source: crates/ruff_db/src/diagnostic/render/junit.rs
-expression: env.render_diagnostics(&diagnostics)
---
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="ruff" tests="2" failures="2" errors="0">
-    <testsuite name="syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="1" column="15">
-            <failure message="Expected one or more symbol names after import">line 1, col 15, Expected one or more symbol names after import</failure>
-        </testcase>
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="3" column="12">
-            <failure message="Expected &apos;)&apos;, found newline">line 3, col 12, Expected &apos;)&apos;, found newline</failure>
-        </testcase>
-    </testsuite>
-</testsuites>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderpylinttests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderpylinttests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/pylint.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-syntax_errors.py:1: [invalid-syntax] Expected one or more symbol names after import
-syntax_errors.py:3: [invalid-syntax] Expected ')', found newline
+syntax_errors.py:1: [invalid-syntax] SyntaxError: Expected one or more symbol names after import
+syntax_errors.py:3: [invalid-syntax] SyntaxError: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
@@ -21,7 +21,7 @@ expression: env.render_diagnostics(&diagnostics)
          }
        }
      },
-      "message": "Expected one or more symbol names after import"
+      "message": "SyntaxError: Expected one or more symbol names after import"
    },
    {
      "code": {
@@ -40,7 +40,7 @@ expression: env.render_diagnostics(&diagnostics)
          }
        }
      },
-      "message": "Expected ')', found newline"
+      "message": "SyntaxError: Expected ')', found newline"
    }
  ],
  "severity": "WARNING",
--- a/crates/ruff_db/src/diagnostic/stylesheet.rs
+++ b/crates/ruff_db/src/diagnostic/stylesheet.rs
@@ -40,12 +40,7 @@ pub struct DiagnosticStylesheet {
    pub(crate) help: Style,
    pub(crate) line_no: Style,
    pub(crate) emphasis: Style,
-    pub(crate) underline: Style,
    pub(crate) none: Style,
-    pub(crate) separator: Style,
-    pub(crate) secondary_code: Style,
-    pub(crate) insertion: Style,
-    pub(crate) deletion: Style,
 }

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

@@ -84,12 +74,7 @@ impl DiagnosticStylesheet {
            help: Style::new(),
            line_no: Style::new(),
            emphasis: Style::new(),
-            underline: Style::new(),
            none: Style::new(),
-            separator: Style::new(),
-            secondary_code: Style::new(),
-            insertion: Style::new(),
-            deletion: Style::new(),
        }
    }
 }
--- a/crates/ruff_db/src/file_revision.rs
+++ b/crates/ruff_db/src/file_revision.rs
@@ -9,7 +9,7 @@ use crate::system::file_time_now;
 /// * The last modification time of the file.
 /// * The hash of the file's content.
 /// * The revision as it comes from an external system, for example the LSP.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Default, get_size2::GetSize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
 pub struct FileRevision(u128);

 impl FileRevision {
--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -1,6 +1,7 @@
 use std::fmt;
 use std::sync::Arc;

+use countme::Count;
 use dashmap::mapref::entry::Entry;
 pub use file_root::{FileRoot, FileRootKind};
 pub use path::FilePath;
@@ -87,12 +88,11 @@ impl Files {
            .system_by_path
            .entry(absolute.clone())
            .or_insert_with(|| {
+                tracing::trace!("Adding file '{path}'");
+
                let metadata = db.system().path_metadata(path);
-
-                tracing::trace!("Adding file '{absolute}'");
-
                let durability = self
-                    .root(db, &absolute)
+                    .root(db, path)
                    .map_or(Durability::default(), |root| root.durability(db));

                let builder = File::builder(FilePath::System(absolute))
@@ -232,7 +232,7 @@ impl Files {
        let roots = inner.roots.read().unwrap();

        for root in roots.all() {
-            if path.starts_with(root.path(db)) {
+            if root.path(db).starts_with(&path) {
                root.set_revision(db).to(FileRevision::now());
            }
        }
@@ -290,7 +290,7 @@ impl std::panic::RefUnwindSafe for Files {}
 /// # Ordering
 /// Ordering is based on the file's salsa-assigned id and not on its values.
 /// The id may change between runs.
-#[salsa::input(heap_size=ruff_memory_usage::heap_size)]
+#[salsa::input]
 #[derive(PartialOrd, Ord)]
 pub struct File {
    /// The path of the file (immutable).
@@ -312,6 +312,11 @@ pub struct File {
    /// the file has been deleted is to change the status to `Deleted`.
    #[default]
    status: FileStatus,
+
+    /// Counter that counts the number of created file instances and active file instances.
+    /// Only enabled in debug builds.
+    #[default]
+    count: Count<File>,
 }

 // The Salsa heap is tracked separately.
@@ -370,25 +375,12 @@ impl File {
    }

    /// Refreshes the file metadata by querying the file system if needed.
-    ///
-    /// This also "touches" the file root associated with the given path.
-    /// This means that any Salsa queries that depend on the corresponding
-    /// root's revision will become invalidated.
    pub fn sync_path(db: &mut dyn Db, path: &SystemPath) {
        let absolute = SystemPath::absolute(path, db.system().current_directory());
        Files::touch_root(db, &absolute);
        Self::sync_system_path(db, &absolute, None);
    }

-    /// Refreshes *only* the file metadata by querying the file system if needed.
-    ///
-    /// This specifically does not touch any file root associated with the
-    /// given file path.
-    pub fn sync_path_only(db: &mut dyn Db, path: &SystemPath) {
-        let absolute = SystemPath::absolute(path, db.system().current_directory());
-        Self::sync_system_path(db, &absolute, None);
-    }
-
    /// Increments the revision for the virtual file at `path`.
    pub fn sync_virtual_path(db: &mut dyn Db, path: &SystemVirtualPath) {
        if let Some(virtual_file) = db.files().try_virtual_file(path) {
@@ -494,7 +486,7 @@ impl fmt::Debug for File {
 ///
 /// This is a wrapper around a [`File`] that provides additional methods to interact with a virtual
 /// file.
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 pub struct VirtualFile(File);

 impl VirtualFile {
@@ -522,7 +514,7 @@ impl VirtualFile {
 // The types in here need to be public because they're salsa ingredients but we
 // don't want them to be publicly accessible. That's why we put them into a private module.
 mod private {
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Default, get_size2::GetSize)]
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
    pub enum FileStatus {
        /// The file exists.
        #[default]
--- a/crates/ruff_db/src/files/file_root.rs
+++ b/crates/ruff_db/src/files/file_root.rs
@@ -16,14 +16,14 @@ use crate::system::{SystemPath, SystemPathBuf};
 /// The main usage of file roots is to determine a file's durability. But it can also be used
 /// to make a salsa query dependent on whether a file in a root has changed without writing any
 /// manual invalidation logic.
-#[salsa::input(debug, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::input(debug)]
 pub struct FileRoot {
    /// The path of a root is guaranteed to never change.
    #[returns(deref)]
    pub path: SystemPathBuf,

    /// The kind of the root at the time of its creation.
-    pub kind_at_time_of_creation: FileRootKind,
+    kind_at_time_of_creation: FileRootKind,

    /// A revision that changes when the contents of the source root change.
    ///
@@ -37,7 +37,7 @@ impl FileRoot {
    }
 }

-#[derive(Copy, Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum FileRootKind {
    /// The root of a project.
    Project,
--- a/crates/ruff_db/src/files/path.rs
+++ b/crates/ruff_db/src/files/path.rs
@@ -11,7 +11,7 @@ use std::fmt::{Display, Formatter};
 /// * a file stored on the [host system](crate::system::System).
 /// * a virtual file stored on the [host system](crate::system::System).
 /// * a vendored file stored in the [vendored file system](crate::vendored::VendoredFileSystem).
-#[derive(Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub enum FilePath {
    /// Path to a file on the [host system](crate::system::System).
    System(SystemPathBuf),
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -1,8 +1,3 @@
-#![warn(
-    clippy::disallowed_methods,
-    reason = "Prefer System trait methods over std methods"
-)]
-
 use crate::files::Files;
 use crate::system::System;
 use crate::vendored::VendoredFileSystem;
@@ -70,10 +65,6 @@ pub trait Db: salsa::Database {
 /// to process work in parallel. For example, to index a directory or checking the files of a project.
 /// ty can still spawn more threads for other tasks, e.g. to wait for a Ctrl+C signal or
 /// watching the files for changes.
-#[expect(
-    clippy::disallowed_methods,
-    reason = "We don't have access to System here, but this is also only used by the CLI and the server which always run on a real system."
-)]
 pub fn max_parallelism() -> NonZeroUsize {
    std::env::var(EnvVars::TY_MAX_PARALLELISM)
        .or_else(|_| std::env::var(EnvVars::RAYON_NUM_THREADS))
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -21,7 +21,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=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::GetSize::get_heap_size)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
    let _span = tracing::trace_span!("parsed_module", ?file).entered();

@@ -92,14 +92,14 @@ impl ParsedModule {
        self.inner.store(None);
    }

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

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

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

@@ -224,7 +220,7 @@ mod indexed {
            T: HasNodeIndex + std::fmt::Debug,
            AnyRootNodeRef<'a>: From<&'a T>,
        {
-            node.node_index().set(NodeIndex::from(self.index));
+            node.node_index().set(self.index);
            self.nodes.push(AnyRootNodeRef::from(node));
            self.index += 1;
        }
--- a/crates/ruff_db/src/source.rs
+++ b/crates/ruff_db/src/source.rs
@@ -1,6 +1,8 @@
 use std::ops::Deref;
 use std::sync::Arc;

+use countme::Count;
+
 use ruff_notebook::Notebook;
 use ruff_python_ast::PySourceType;
 use ruff_source_file::LineIndex;
@@ -9,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=ruff_memory_usage::heap_size)]
+#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
 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();
@@ -36,7 +38,11 @@ pub fn source_text(db: &dyn Db, file: File) -> SourceText {
    };

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

@@ -69,21 +75,21 @@ impl SourceText {
    pub fn as_str(&self) -> &str {
        match &self.inner.kind {
            SourceTextKind::Text(source) => source,
-            SourceTextKind::Notebook { notebook } => notebook.source_code(),
+            SourceTextKind::Notebook(notebook) => notebook.source_code(),
        }
    }

    /// Returns the underlying notebook if this is a notebook file.
    pub fn as_notebook(&self) -> Option<&Notebook> {
        match &self.inner.kind {
-            SourceTextKind::Notebook { notebook } => Some(notebook),
+            SourceTextKind::Notebook(notebook) => Some(notebook),
            SourceTextKind::Text(_) => None,
        }
    }

    /// Returns `true` if this is a notebook source file.
    pub fn is_notebook(&self) -> bool {
-        matches!(&self.inner.kind, SourceTextKind::Notebook { .. })
+        matches!(&self.inner.kind, SourceTextKind::Notebook(_))
    }

    /// Returns `true` if there was an error when reading the content of the file.
@@ -108,7 +114,7 @@ impl std::fmt::Debug for SourceText {
            SourceTextKind::Text(text) => {
                dbg.field(text);
            }
-            SourceTextKind::Notebook { notebook } => {
+            SourceTextKind::Notebook(notebook) => {
                dbg.field(notebook);
            }
        }
@@ -119,19 +125,29 @@ impl std::fmt::Debug for SourceText {

 #[derive(Eq, PartialEq, get_size2::GetSize)]
 struct SourceTextInner {
+    #[get_size(ignore)]
+    count: Count<SourceText>,
    kind: SourceTextKind,
    read_error: Option<SourceTextError>,
 }

-#[derive(Eq, PartialEq, get_size2::GetSize)]
+#[derive(Eq, PartialEq)]
 enum SourceTextKind {
    Text(String),
-    Notebook {
-        // Jupyter notebooks are not very relevant for memory profiling, and contain
-        // arbitrary JSON values that do not implement the `GetSize` trait.
-        #[get_size(ignore)]
-        notebook: Box<Notebook>,
-    },
+    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 {
@@ -142,9 +158,7 @@ impl From<String> for SourceTextKind {

 impl From<Notebook> for SourceTextKind {
    fn from(notebook: Notebook) -> Self {
-        SourceTextKind::Notebook {
-            notebook: Box::new(notebook),
-        }
+        SourceTextKind::Notebook(Box::new(notebook))
    }
 }

@@ -157,7 +171,7 @@ pub enum SourceTextError {
 }

 /// Computes the [`LineIndex`] for `file`.
-#[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
 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
@@ -46,7 +46,7 @@ pub type Result<T> = std::io::Result<T>;
 ///    * File watching isn't supported.
 ///
 /// Abstracting the system also enables tests to use a more efficient in-memory file system.
-pub trait System: Debug + Sync + Send {
+pub trait System: Debug {
    /// Reads the metadata of the file or directory at `path`.
    ///
    /// This function will traverse symbolic links to query information about the destination file.
@@ -197,8 +197,6 @@ pub trait System: Debug + Sync + Send {
    fn as_any(&self) -> &dyn std::any::Any;

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

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

 impl OsSystem {
--- a/crates/ruff_db/src/system/path.rs
+++ b/crates/ruff_db/src/system/path.rs
@@ -236,7 +236,7 @@ impl SystemPath {
    ///
    /// [`CurDir`]: camino::Utf8Component::CurDir
    #[inline]
-    pub fn components(&self) -> camino::Utf8Components<'_> {
+    pub fn components(&self) -> camino::Utf8Components {
        self.0.components()
    }

@@ -762,7 +762,7 @@ impl SystemVirtualPath {
 }

 /// An owned, virtual path on [`System`](`super::System`) (akin to [`String`]).
-#[derive(Eq, PartialEq, Clone, Hash, PartialOrd, Ord, get_size2::GetSize)]
+#[derive(Eq, PartialEq, Clone, Hash, PartialOrd, Ord)]
 pub struct SystemVirtualPathBuf(String);

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

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

 impl WritableSystem for InMemorySystem {
--- a/crates/ruff_db/src/vendored.rs
+++ b/crates/ruff_db/src/vendored.rs
@@ -195,7 +195,7 @@ impl VendoredFileSystem {
    ///
    /// ## Panics:
    /// If the current thread already holds the lock.
-    fn lock_archive(&self) -> LockedZipArchive<'_> {
+    fn lock_archive(&self) -> LockedZipArchive {
        self.inner.lock().unwrap()
    }
 }
@@ -360,7 +360,7 @@ impl VendoredZipArchive {
        Ok(Self(ZipArchive::new(io::Cursor::new(data))?))
    }

-    fn lookup_path(&mut self, path: &NormalizedVendoredPath) -> Result<ZipFile<'_>> {
+    fn lookup_path(&mut self, path: &NormalizedVendoredPath) -> Result<ZipFile> {
        Ok(self.0.by_name(path.as_str())?)
    }

--- a/crates/ruff_db/src/vendored/path.rs
+++ b/crates/ruff_db/src/vendored/path.rs
@@ -37,7 +37,7 @@ impl VendoredPath {
        self.0.as_std_path()
    }

-    pub fn components(&self) -> Utf8Components<'_> {
+    pub fn components(&self) -> Utf8Components {
        self.0.components()
    }

--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -13,7 +13,6 @@ license = { workspace = true }
 [dependencies]
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
-ty_python_semantic = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
--- a/crates/ruff_dev/src/format_dev.rs
+++ b/crates/ruff_dev/src/format_dev.rs
@@ -348,7 +348,7 @@ fn format_dev_multi_project(
        debug!(parent: None, "Starting {}", project_path.display());

        match format_dev_project(
-            std::slice::from_ref(&project_path),
+            &[project_path.clone()],
            args.stability_check,
            args.write,
            args.preview,
@@ -628,7 +628,7 @@ struct CheckRepoResult {
 }

 impl CheckRepoResult {
-    fn display(&self, format: Format) -> DisplayCheckRepoResult<'_> {
+    fn display(&self, format: Format) -> DisplayCheckRepoResult {
        DisplayCheckRepoResult {
            result: self,
            format,
@@ -665,7 +665,7 @@ struct Diagnostic {
 }

 impl Diagnostic {
-    fn display(&self, format: Format) -> DisplayDiagnostic<'_> {
+    fn display(&self, format: Format) -> DisplayDiagnostic {
        DisplayDiagnostic {
            diagnostic: self,
            format,
--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }

 fn generate_markdown() -> String {
-    let registry = ty_python_semantic::default_lint_registry();
+    let registry = &*ty_project::DEFAULT_LINT_REGISTRY;

    let mut output = String::new();

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

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

 get-size2 = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
-
-[features]
-serde = ["dep:serde", "ruff_text_size/serde"]
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -43,7 +43,7 @@ pub enum IsolationLevel {
 }

 /// A collection of [`Edit`] elements to be applied to a source file.
-#[derive(Debug, PartialEq, Eq, Clone, Hash, get_size2::GetSize)]
+#[derive(Debug, PartialEq, Eq, Clone, get_size2::GetSize)]
 #[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_formatter/src/buffer.rs
+++ b/crates/ruff_formatter/src/buffer.rs
@@ -562,7 +562,7 @@ struct RemoveSoftLinebreaksSnapshot {
 pub trait BufferExtensions: Buffer + Sized {
    /// Returns a new buffer that calls the passed inspector for every element that gets written to the output
    #[must_use]
-    fn inspect<F>(&mut self, inspector: F) -> Inspect<'_, Self::Context, F>
+    fn inspect<F>(&mut self, inspector: F) -> Inspect<Self::Context, F>
    where
        F: FnMut(&FormatElement),
    {
@@ -607,7 +607,7 @@ pub trait BufferExtensions: Buffer + Sized {
    /// # }
    /// ```
    #[must_use]
-    fn start_recording(&mut self) -> Recording<'_, Self> {
+    fn start_recording(&mut self) -> Recording<Self> {
        Recording::new(self)
    }

--- a/crates/ruff_formatter/src/builders.rs
+++ b/crates/ruff_formatter/src/builders.rs
@@ -340,7 +340,7 @@ impl<Context> Format<Context> for SourcePosition {
 /// Creates a text from a dynamic string.
 ///
 /// This is done by allocating a new string internally.
-pub fn text(text: &str) -> Text<'_> {
+pub fn text(text: &str) -> Text {
    debug_assert_no_newlines(text);

    Text { text }
@@ -459,10 +459,7 @@ fn debug_assert_no_newlines(text: &str) {
 /// # }
 /// ```
 #[inline]
-pub fn line_suffix<Content, Context>(
-    inner: &Content,
-    reserved_width: u32,
-) -> LineSuffix<'_, Context>
+pub fn line_suffix<Content, Context>(inner: &Content, reserved_width: u32) -> LineSuffix<Context>
 where
    Content: Format<Context>,
 {
@@ -600,10 +597,7 @@ impl<Context> Format<Context> for LineSuffixBoundary {
 /// Use `Memoized.inspect(f)?.has_label(LabelId::of::<SomeLabelId>()` if you need to know if some content breaks that should
 /// only be written later.
 #[inline]
-pub fn labelled<Content, Context>(
-    label_id: LabelId,
-    content: &Content,
-) -> FormatLabelled<'_, Context>
+pub fn labelled<Content, Context>(label_id: LabelId, content: &Content) -> FormatLabelled<Context>
 where
    Content: Format<Context>,
 {
@@ -706,7 +700,7 @@ impl<Context> Format<Context> for Space {
 /// # }
 /// ```
 #[inline]
-pub fn indent<Content, Context>(content: &Content) -> Indent<'_, Context>
+pub fn indent<Content, Context>(content: &Content) -> Indent<Context>
 where
    Content: Format<Context>,
 {
@@ -777,7 +771,7 @@ impl<Context> std::fmt::Debug for Indent<'_, Context> {
 /// # }
 /// ```
 #[inline]
-pub fn dedent<Content, Context>(content: &Content) -> Dedent<'_, Context>
+pub fn dedent<Content, Context>(content: &Content) -> Dedent<Context>
 where
    Content: Format<Context>,
 {
@@ -852,7 +846,7 @@ impl<Context> std::fmt::Debug for Dedent<'_, Context> {
 ///
 /// This resembles the behaviour of Prettier's `align(Number.NEGATIVE_INFINITY, content)` IR element.
 #[inline]
-pub fn dedent_to_root<Content, Context>(content: &Content) -> Dedent<'_, Context>
+pub fn dedent_to_root<Content, Context>(content: &Content) -> Dedent<Context>
 where
    Content: Format<Context>,
 {
@@ -966,7 +960,7 @@ where
 ///
 /// - tab indentation: Printer indents the expression with two tabs because the `align` increases the indentation level.
 /// - space indentation: Printer indents the expression by 4 spaces (one indentation level) **and** 2 spaces for the align.
-pub fn align<Content, Context>(count: u8, content: &Content) -> Align<'_, Context>
+pub fn align<Content, Context>(count: u8, content: &Content) -> Align<Context>
 where
    Content: Format<Context>,
 {
@@ -1036,7 +1030,7 @@ impl<Context> std::fmt::Debug for Align<'_, Context> {
 /// # }
 /// ```
 #[inline]
-pub fn block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<'_, Context> {
+pub fn block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<Context> {
    BlockIndent {
        content: Argument::new(content),
        mode: IndentMode::Block,
@@ -1107,7 +1101,7 @@ pub fn block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<'_,
 /// # }
 /// ```
 #[inline]
-pub fn soft_block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<'_, Context> {
+pub fn soft_block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<Context> {
    BlockIndent {
        content: Argument::new(content),
        mode: IndentMode::Soft,
@@ -1181,9 +1175,7 @@ pub fn soft_block_indent<Context>(content: &impl Format<Context>) -> BlockIndent
 /// # }
 /// ```
 #[inline]
-pub fn soft_line_indent_or_space<Context>(
-    content: &impl Format<Context>,
-) -> BlockIndent<'_, Context> {
+pub fn soft_line_indent_or_space<Context>(content: &impl Format<Context>) -> BlockIndent<Context> {
    BlockIndent {
        content: Argument::new(content),
        mode: IndentMode::SoftLineOrSpace,
@@ -1316,9 +1308,7 @@ impl<Context> std::fmt::Debug for BlockIndent<'_, Context> {
 /// # Ok(())
 /// # }
 /// ```
-pub fn soft_space_or_block_indent<Context>(
-    content: &impl Format<Context>,
-) -> BlockIndent<'_, Context> {
+pub fn soft_space_or_block_indent<Context>(content: &impl Format<Context>) -> BlockIndent<Context> {
    BlockIndent {
        content: Argument::new(content),
        mode: IndentMode::SoftSpace,
@@ -1398,7 +1388,7 @@ pub fn soft_space_or_block_indent<Context>(
 /// # }
 /// ```
 #[inline]
-pub fn group<Context>(content: &impl Format<Context>) -> Group<'_, Context> {
+pub fn group<Context>(content: &impl Format<Context>) -> Group<Context> {
    Group {
        content: Argument::new(content),
        id: None,
@@ -1561,7 +1551,7 @@ impl<Context> std::fmt::Debug for Group<'_, Context> {
 #[inline]
 pub fn best_fit_parenthesize<Context>(
    content: &impl Format<Context>,
-) -> BestFitParenthesize<'_, Context> {
+) -> BestFitParenthesize<Context> {
    BestFitParenthesize {
        content: Argument::new(content),
        group_id: None,
@@ -1701,7 +1691,7 @@ impl<Context> std::fmt::Debug for BestFitParenthesize<'_, Context> {
 pub fn conditional_group<Content, Context>(
    content: &Content,
    condition: Condition,
-) -> ConditionalGroup<'_, Context>
+) -> ConditionalGroup<Context>
 where
    Content: Format<Context>,
 {
@@ -1862,7 +1852,7 @@ impl<Context> Format<Context> for ExpandParent {
 /// # }
 /// ```
 #[inline]
-pub fn if_group_breaks<Content, Context>(content: &Content) -> IfGroupBreaks<'_, Context>
+pub fn if_group_breaks<Content, Context>(content: &Content) -> IfGroupBreaks<Context>
 where
    Content: Format<Context>,
 {
@@ -1943,7 +1933,7 @@ where
 /// # }
 /// ```
 #[inline]
-pub fn if_group_fits_on_line<Content, Context>(flat_content: &Content) -> IfGroupBreaks<'_, Context>
+pub fn if_group_fits_on_line<Content, Context>(flat_content: &Content) -> IfGroupBreaks<Context>
 where
    Content: Format<Context>,
 {
@@ -2132,7 +2122,7 @@ impl<Context> std::fmt::Debug for IfGroupBreaks<'_, Context> {
 pub fn indent_if_group_breaks<Content, Context>(
    content: &Content,
    group_id: GroupId,
-) -> IndentIfGroupBreaks<'_, Context>
+) -> IndentIfGroupBreaks<Context>
 where
    Content: Format<Context>,
 {
@@ -2215,7 +2205,7 @@ impl<Context> std::fmt::Debug for IndentIfGroupBreaks<'_, Context> {
 /// # Ok(())
 /// # }
 /// ```
-pub fn fits_expanded<Content, Context>(content: &Content) -> FitsExpanded<'_, Context>
+pub fn fits_expanded<Content, Context>(content: &Content) -> FitsExpanded<Context>
 where
    Content: Format<Context>,
 {
--- a/crates/ruff_formatter/src/format_element.rs
+++ b/crates/ruff_formatter/src/format_element.rs
@@ -197,7 +197,7 @@ pub const LINE_TERMINATORS: [char; 3] = ['\r', LINE_SEPARATOR, PARAGRAPH_SEPARAT

 /// Replace the line terminators matching the provided list with "\n"
 /// since its the only line break type supported by the printer
-pub fn normalize_newlines<const N: usize>(text: &str, terminators: [char; N]) -> Cow<'_, str> {
+pub fn normalize_newlines<const N: usize>(text: &str, terminators: [char; N]) -> Cow<str> {
    let mut result = String::new();
    let mut last_end = 0;

--- a/crates/ruff_formatter/src/format_element/document.rs
+++ b/crates/ruff_formatter/src/format_element/document.rs
@@ -222,7 +222,7 @@ impl FormatContext for IrFormatContext<'_> {
        &IrFormatOptions
    }

-    fn source_code(&self) -> SourceCode<'_> {
+    fn source_code(&self) -> SourceCode {
        self.source_code
    }
 }
--- a/crates/ruff_formatter/src/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -193,7 +193,7 @@ pub trait FormatContext {
    fn options(&self) -> &Self::Options;

    /// Returns the source code from the document that gets formatted.
-    fn source_code(&self) -> SourceCode<'_>;
+    fn source_code(&self) -> SourceCode;
 }

 /// Options customizing how the source code should be formatted.
@@ -239,7 +239,7 @@ impl FormatContext for SimpleFormatContext {
        &self.options
    }

-    fn source_code(&self) -> SourceCode<'_> {
+    fn source_code(&self) -> SourceCode {
        SourceCode::new(&self.source_code)
    }
 }
@@ -326,7 +326,7 @@ where
        printer.print_with_indent(&self.document, indent)
    }

-    fn create_printer(&self) -> Printer<'_> {
+    fn create_printer(&self) -> Printer {
        let source_code = self.context.source_code();
        let print_options = self.context.options().as_print_options();

--- a/crates/ruff_graph/Cargo.toml
+++ b/crates/ruff_graph/Cargo.toml
@@ -20,7 +20,6 @@ ty_python_semantic = { workspace = true }

 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }
-memchr = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
--- a/crates/ruff_graph/src/collector.rs
+++ b/crates/ruff_graph/src/collector.rs
@@ -1,4 +1,3 @@
-use crate::StringImports;
 use ruff_python_ast::visitor::source_order::{
    SourceOrderVisitor, walk_expr, walk_module, walk_stmt,
 };
@@ -11,13 +10,13 @@ pub(crate) struct Collector<'a> {
    /// The path to the current module.
    module_path: Option<&'a [String]>,
    /// Whether to detect imports from string literals.
-    string_imports: StringImports,
+    string_imports: bool,
    /// The collected imports from the Python AST.
    imports: Vec<CollectedImport>,
 }

 impl<'a> Collector<'a> {
-    pub(crate) fn new(module_path: Option<&'a [String]>, string_imports: StringImports) -> Self {
+    pub(crate) fn new(module_path: Option<&'a [String]>, string_imports: bool) -> Self {
        Self {
            module_path,
            string_imports,
@@ -119,7 +118,7 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
            | Stmt::Continue(_)
            | Stmt::IpyEscapeCommand(_) => {
                // Only traverse simple statements when string imports is enabled.
-                if self.string_imports.enabled {
+                if self.string_imports {
                    walk_stmt(self, stmt);
                }
            }
@@ -127,26 +126,20 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
    }

    fn visit_expr(&mut self, expr: &'ast Expr) {
-        if self.string_imports.enabled {
+        if self.string_imports {
            if let Expr::StringLiteral(ast::ExprStringLiteral {
                value,
                range: _,
                node_index: _,
            }) = expr
            {
-                let value = value.to_str();
                // Determine whether the string literal "looks like" an import statement: contains
-                // the requisite number of dots, and consists solely of valid Python identifiers.
-                if self.string_imports.min_dots == 0
-                    || memchr::memchr_iter(b'.', value.as_bytes()).count()
-                        >= self.string_imports.min_dots
-                {
-                    if let Some(module_name) = ModuleName::new(value) {
-                        self.imports.push(CollectedImport::Import(module_name));
-                    }
+                // a dot, and consists solely of valid Python identifiers.
+                let value = value.to_str();
+                if let Some(module_name) = ModuleName::new(value) {
+                    self.imports.push(CollectedImport::Import(module_name));
                }
            }
-
            walk_expr(self, expr);
        }
    }
--- a/crates/ruff_graph/src/db.rs
+++ b/crates/ruff_graph/src/db.rs
@@ -87,7 +87,7 @@ impl SourceDb for ModuleDb {

 #[salsa::db]
 impl Db for ModuleDb {
-    fn should_check_file(&self, file: File) -> bool {
+    fn is_file_open(&self, file: File) -> bool {
        !file.path(self).is_vendored_path()
    }

--- a/crates/ruff_graph/src/lib.rs
+++ b/crates/ruff_graph/src/lib.rs
@@ -9,7 +9,7 @@ use ruff_python_parser::{Mode, ParseOptions, parse};
 use crate::collector::Collector;
 pub use crate::db::ModuleDb;
 use crate::resolver::Resolver;
-pub use crate::settings::{AnalyzeSettings, Direction, StringImports};
+pub use crate::settings::{AnalyzeSettings, Direction};

 mod collector;
 mod db;
@@ -26,7 +26,7 @@ impl ModuleImports {
        db: &ModuleDb,
        path: &SystemPath,
        package: Option<&SystemPath>,
-        string_imports: StringImports,
+        string_imports: bool,
    ) -> Result<Self> {
        // Read and parse the source code.
        let source = std::fs::read_to_string(path)?;
@@ -42,11 +42,13 @@ impl ModuleImports {
        // Resolve the imports.
        let mut resolved_imports = ModuleImports::default();
        for import in imports {
-            for resolved in Resolver::new(db).resolve(import) {
-                if let Some(path) = resolved.as_system_path() {
-                    resolved_imports.insert(path.to_path_buf());
-                }
-            }
+            let Some(resolved) = Resolver::new(db).resolve(import) else {
+                continue;
+            };
+            let Some(path) = resolved.as_system_path() else {
+                continue;
+            };
+            resolved_imports.insert(path.to_path_buf());
        }

        Ok(resolved_imports)
--- a/crates/ruff_graph/src/resolver.rs
+++ b/crates/ruff_graph/src/resolver.rs
@@ -1,5 +1,5 @@
 use ruff_db::files::FilePath;
-use ty_python_semantic::{ModuleName, resolve_module, resolve_real_module};
+use ty_python_semantic::resolve_module;

 use crate::ModuleDb;
 use crate::collector::CollectedImport;
@@ -16,67 +16,24 @@ impl<'a> Resolver<'a> {
    }

    /// Resolve the [`CollectedImport`] into a [`FilePath`].
-    pub(crate) fn resolve(&self, import: CollectedImport) -> impl Iterator<Item = &'a FilePath> {
+    pub(crate) fn resolve(&self, import: CollectedImport) -> Option<&'a FilePath> {
        match import {
            CollectedImport::Import(import) => {
-                // Attempt to resolve the module (e.g., given `import foo`, look for `foo`).
-                let file = self.resolve_module(&import);
-
-                // If the file is a stub, look for the corresponding source file.
-                let source_file = file
-                    .is_some_and(|file| file.extension() == Some("pyi"))
-                    .then(|| self.resolve_real_module(&import))
-                    .flatten();
-
-                std::iter::once(file)
-                    .chain(std::iter::once(source_file))
-                    .flatten()
+                let module = resolve_module(self.db, &import)?;
+                Some(module.file()?.path(self.db))
            }
            CollectedImport::ImportFrom(import) => {
                // Attempt to resolve the member (e.g., given `from foo import bar`, look for `foo.bar`).
-                if let Some(file) = self.resolve_module(&import) {
-                    // If the file is a stub, look for the corresponding source file.
-                    let source_file = (file.extension() == Some("pyi"))
-                        .then(|| self.resolve_real_module(&import))
-                        .flatten();
-
-                    return std::iter::once(Some(file))
-                        .chain(std::iter::once(source_file))
-                        .flatten();
-                }
-
-                // Attempt to resolve the module (e.g., given `from foo import bar`, look for `foo`).
                let parent = import.parent();
-                let file = parent
-                    .as_ref()
-                    .and_then(|parent| self.resolve_module(parent));

-                // If the file is a stub, look for the corresponding source file.
-                let source_file = file
-                    .is_some_and(|file| file.extension() == Some("pyi"))
-                    .then(|| {
-                        parent
-                            .as_ref()
-                            .and_then(|parent| self.resolve_real_module(parent))
-                    })
-                    .flatten();
+                let module = resolve_module(self.db, &import).or_else(|| {
+                    // Attempt to resolve the module (e.g., given `from foo import bar`, look for `foo`).

-                std::iter::once(file)
-                    .chain(std::iter::once(source_file))
-                    .flatten()
+                    resolve_module(self.db, &parent?)
+                })?;
+
+                Some(module.file()?.path(self.db))
            }
        }
    }
-
-    /// Resolves a module name to a module.
-    pub(crate) fn resolve_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = resolve_module(self.db, module_name)?;
-        Some(module.file(self.db)?.path(self.db))
-    }
-
-    /// Resolves a module name to a module (stubs not allowed).
-    fn resolve_real_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = resolve_real_module(self.db, module_name)?;
-        Some(module.file(self.db)?.path(self.db))
-    }
 }
--- a/crates/ruff_graph/src/settings.rs
+++ b/crates/ruff_graph/src/settings.rs
@@ -11,7 +11,7 @@ pub struct AnalyzeSettings {
    pub exclude: FilePatternSet,
    pub preview: PreviewMode,
    pub target_version: PythonVersion,
-    pub string_imports: StringImports,
+    pub detect_string_imports: bool,
    pub include_dependencies: BTreeMap<PathBuf, (PathBuf, Vec<String>)>,
    pub extension: ExtensionMapping,
 }
@@ -26,7 +26,7 @@ impl fmt::Display for AnalyzeSettings {
                self.exclude,
                self.preview,
                self.target_version,
-                self.string_imports,
+                self.detect_string_imports,
                self.extension | debug,
                self.include_dependencies | debug,
            ]
@@ -35,31 +35,6 @@ impl fmt::Display for AnalyzeSettings {
    }
 }

-#[derive(Debug, Copy, Clone, CacheKey)]
-pub struct StringImports {
-    pub enabled: bool,
-    pub min_dots: usize,
-}
-
-impl Default for StringImports {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            min_dots: 2,
-        }
-    }
-}
-
-impl fmt::Display for StringImports {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.enabled {
-            write!(f, "enabled (min_dots: {})", self.min_dots)
-        } else {
-            write!(f, "disabled")
-        }
-    }
-}
-
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, CacheKey)]
 #[cfg_attr(
    feature = "serde",
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.10"
+version = "0.12.3"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -13,8 +13,9 @@ license = { workspace = true }
 [lib]

 [dependencies]
+ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true }
-ruff_db = { workspace = true, features = ["junit", "serde"] }
+ruff_db = { workspace = true, features = ["serde"] }
 ruff_diagnostics = { workspace = true, features = ["serde"] }
 ruff_notebook = { workspace = true }
 ruff_macros = { workspace = true }
@@ -54,6 +55,7 @@ path-absolutize = { workspace = true, features = [
 pathdiff = { workspace = true }
 pep440_rs = { workspace = true }
 pyproject-toml = { workspace = true }
+quick-junit = { workspace = true }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 schemars = { workspace = true, optional = true }
--- a/Show More
+++ b/Show More