wip

clear source texts
2025-06-19 21:58:29 -04:00 · 2025-06-18 23:10:17 -04:00
4547 changed files with 188306 additions and 367780 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
@@ -39,17 +39,17 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          command: sdist
          args: --out dist
@@ -68,18 +68,18 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: x86_64
          args: --release --locked --out dist
@@ -110,18 +110,18 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: arm64
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: aarch64
          args: --release --locked --out dist
@@ -166,18 +166,18 @@ jobs:
          - target: aarch64-pc-windows-msvc
            arch: x64
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.platform.arch }}
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.platform.target }}
          args: --release --locked --out dist
@@ -219,18 +219,18 @@ jobs:
          - x86_64-unknown-linux-gnu
          - i686-unknown-linux-gnu
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -292,21 +292,19 @@ 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        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
@@ -361,18 +359,18 @@ jobs:
          - x86_64-unknown-linux-musl
          - i686-unknown-linux-musl
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
@@ -427,17 +425,17 @@ jobs:
            arch: armv7

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - 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@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -33,14 +33,14 @@ jobs:
          - linux/amd64
          - linux/arm64
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          submodules: recursive
          persist-credentials: false

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

-      - uses: docker/login-action@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
@@ -113,17 +113,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

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

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

-      - uses: docker/login-action@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
@@ -256,17 +256,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

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

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        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,12 +38,11 @@ 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:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -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"
@@ -88,6 +88,7 @@ jobs:
            ':!crates/ruff_python_formatter/**' \
            ':!crates/ruff_formatter/**' \
            ':!crates/ruff_dev/**' \
+            ':!crates/ruff_db/**' \
            ':scripts/*' \
            ':python/**' \
            ':.github/workflows/ci.yaml' \
@@ -137,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
@@ -208,7 +197,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -222,10 +211,10 @@ jobs:
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: |
          rustup component add clippy
@@ -242,26 +231,22 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
        if: ${{ needs.determine_changes.outputs.ty == 'true' }}
        env:
@@ -304,26 +289,22 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
      - name: "Run tests"
        shell: bash
        env:
@@ -337,20 +318,16 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
        with:
          tool: cargo-nextest
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
      - name: "Run tests"
        shell: bash
        env:
@@ -368,15 +345,15 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
-          node-version: 22
+          node-version: 20
          cache: "npm"
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
@@ -397,14 +374,14 @@ jobs:
    if: ${{ github.ref == 'refs/heads/main' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -415,7 +392,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
@@ -423,18 +400,27 @@ jobs:
        with:
          file: "Cargo.toml"
          field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        env:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - name: "Build tests"
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+      - name: "Install cargo nextest"
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        with:
+          tool: cargo-nextest
+      - name: "Install cargo insta"
+        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        with:
+          tool: cargo-insta
+      - name: "Run tests"
        shell: bash
        env:
+          NEXTEST_PROFILE: "ci"
          MSRV: ${{ steps.msrv.outputs.value }}
-        run: cargo "+${MSRV}" test --no-run --all-features
+        run: cargo "+${MSRV}" insta test --all-features --unreferenced reject --test-runner nextest

  cargo-fuzz-build:
    name: "cargo fuzz build"
@@ -443,16 +429,18 @@ jobs:
    if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
          workspaces: "fuzz -> target"
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+        uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
+        with:
+          tool: cargo-fuzz@0.11.2
      - name: "Install cargo-fuzz"
        # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
        run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -464,16 +452,16 @@ 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
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
        with:
@@ -503,10 +491,10 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 5
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -533,14 +521,14 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}

-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download comparison Ruff binary
        id: ruff-target
        with:
@@ -654,13 +642,13 @@ 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download new ty binary
        id: ty-new
        with:
@@ -673,7 +661,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -700,10 +688,10 @@ jobs:
    needs: determine_changes
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+      - uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -713,18 +701,18 @@ jobs:
    timeout-minutes: 20
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@aef21716ff3dcae8a1c301d23ec3e4446972a6e3 # v1.49.1
        with:
          args: --out dist
      - name: "Test wheel"
@@ -740,16 +728,16 @@ jobs:
    runs-on: depot-ubuntu-22.04-16
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          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') }}
@@ -771,13 +759,13 @@ jobs:
    env:
      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: "3.13"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -786,7 +774,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -813,10 +801,10 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Run checks"
@@ -839,18 +827,18 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        name: "Download ruff-lsp source"
        with:
          persist-credentials: false
          repository: "astral-sh/ruff-lsp"

-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          # installation fails on 3.13 and newer
          python-version: "3.12"

-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download development ruff binary
        id: ruff-target
        with:
@@ -881,13 +869,13 @@ jobs:
      - determine_changes
    if: ${{ (needs.determine_changes.outputs.playground == 'true') }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
          cache: "npm"
@@ -906,73 +894,34 @@ jobs:
        run: npm run fmt:check
        working-directory: playground

-  benchmarks-instrumented-ruff:
-    name: "benchmarks instrumented (ruff)"
+  benchmarks-instrumented:
    runs-on: ubuntu-24.04
    needs: determine_changes
-    if: |
-      github.ref == 'refs/heads/main' || 
-      (needs.determine_changes.outputs.formatter == 'true' || needs.determine_changes.outputs.linter == 'true')
+    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

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

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

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark formatter lexer linter parser
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
+        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
        with:
-          mode: instrumentation
-          run: cargo codspeed run
-          token: ${{ secrets.CODSPEED_TOKEN }}
-
-  benchmarks-instrumented-ty:
-    name: "benchmarks instrumented (ty)"
-    runs-on: ubuntu-24.04
-    needs: determine_changes
-    if: |
-      github.ref == 'refs/heads/main' || 
-      needs.determine_changes.outputs.ty == 'true'
-    timeout-minutes: 20
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
-        with:
-          tool: cargo-codspeed
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark ty
-
-      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
-        with:
-          mode: instrumentation
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}

@@ -985,18 +934,18 @@ jobs:
      TY_LOG: ruff_benchmark=debug
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0

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

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

@@ -1004,13 +953,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
-        env:
-          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
-          # appear to provide much useful insight for our walltime benchmarks right now
-          # (see https://github.com/astral-sh/ruff/pull/20419)
-          CODSPEED_PERF_ENABLED: false
+        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
        with:
-          mode: walltime
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -31,15 +31,15 @@ jobs:
    # Don't run the cron job on forks:
    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
        # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
@@ -65,7 +65,7 @@ jobs:
    permissions:
      issues: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -11,9 +11,7 @@ on:
      - "crates/ruff_python_parser"
      - ".github/workflows/mypy_primer.yaml"
      - ".github/workflows/mypy_primer_comment.yaml"
-      - "scripts/mypy_primer.sh"
      - "Cargo.lock"
-      - "!**.md"

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -32,16 +30,16 @@ jobs:
    runs-on: depot-ubuntu-22.04-32
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

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

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

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

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

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

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

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

-          if [ -s "pr/mypy_primer_memory_diff/mypy_primer_memory.diff" ]; then
-            echo '<details>' >> comment.txt
-            echo '<summary>Memory usage changes were detected when running on open source projects</summary>' >> comment.txt
-            echo '' >> comment.txt
-            echo '```diff' >> comment.txt
-            cat pr/mypy_primer_memory_diff/mypy_primer_memory.diff >> comment.txt
-            echo '```' >> comment.txt
-            echo '</details>' >> comment.txt
-          else
-            echo 'No memory usage changes detected ✅' >> comment.txt
-          fi
-
          echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
          cat comment.txt >> "$GITHUB_OUTPUT"
          echo 'EOF' >> "$GITHUB_OUTPUT"
--- a/.github/workflows/notify-dependents.yml
+++ b/.github/workflows/notify-dependents.yml
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: "Update pre-commit mirror"
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
          script: |
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -23,12 +23,12 @@ jobs:
    env:
      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: true

-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: 3.12

@@ -68,7 +68,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show

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

      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -24,12 +24,12 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
          cache: "npm"
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,8 +22,8 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels-*
          path: wheels
--- a/.github/workflows/publish-ty-playground.yml
+++ b/.github/workflows/publish-ty-playground.yml
@@ -30,12 +30,12 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
--- a/.github/workflows/publish-wasm.yml
+++ b/.github/workflows/publish-wasm.yml
@@ -29,7 +29,7 @@ jobs:
        target: [web, bundler, nodejs]
      fail-fast: false
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -45,9 +45,9 @@ jobs:
          jq '.name="@astral-sh/ruff-wasm-${{ matrix.target }}"' crates/ruff_wasm/pkg/package.json > /tmp/package.json
          mv /tmp/package.json crates/ruff_wasm/pkg
      - run: cp LICENSE crates/ruff_wasm/pkg # wasm-pack does not put the LICENSE file in the pkg
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
-          node-version: 22
+          node-version: 20
          registry-url: "https://registry.npmjs.org"
      - name: "Publish (dry-run)"
        if: ${{ inputs.plan == '' || fromJson(inputs.plan).announcement_tag_is_implicit }}
--- 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
@@ -1,25 +1,5 @@
 name: Sync typeshed

-# How this works:
-#
-# 1. A Linux worker:
-#    a. Checks out Ruff and typeshed
-#    b. Deletes the vendored typeshed stdlib stubs from Ruff
-#    c. Copies the latest versions of the stubs from typeshed
-#    d. Uses docstring-adder to sync all docstrings available on Linux
-#    e. Creates a new branch on the upstream astral-sh/ruff repository
-#    f. Commits the changes it's made and pushes them to the new upstream branch
-# 2. Once the Linux worker is done, a Windows worker:
-#    a. Checks out the branch created by the Linux worker
-#    b. Syncs all docstrings available on Windows that are not available on Linux
-#    c. Commits the changes and pushes them to the same upstream branch
-# 3. Once the Windows worker is done, a MacOS worker:
-#    a. Checks out the branch created by the Linux worker
-#    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Commits the changes and pushes them to the same upstream branch
-#    d. Creates a PR against the `main` branch using the branch all three workers have pushed to
-# 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
-
 on:
  workflow_dispatch:
  schedule:
@@ -30,17 +10,7 @@ env:
  FORCE_COLOR: 1
  GH_TOKEN: ${{ github.token }}

-  # The name of the upstream branch that the first worker creates,
-  # 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.
  sync:
    name: Sync typeshed
    runs-on: ubuntu-latest
@@ -49,13 +19,14 @@ jobs:
    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
    permissions:
      contents: write
+      pull-requests: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        name: Checkout Ruff
        with:
          path: ruff
          persist-credentials: true
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        name: Checkout typeshed
        with:
          repository: python/typeshed
@@ -65,134 +36,41 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - name: Sync typeshed stubs
+      - name: Sync typeshed
+        id: sync
        run: |
-          rm -rf "ruff/${VENDORED_TYPESHED}"
-          mkdir "ruff/${VENDORED_TYPESHED}"
-          cp typeshed/README.md "ruff/${VENDORED_TYPESHED}"
-          cp typeshed/LICENSE "ruff/${VENDORED_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 -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"
-          cd ruff
-          git checkout -b "${UPSTREAM_BRANCH}"
-          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
-        if: ${{ success() }}
-        run: |
-          cd ruff
-          ./scripts/codemod_docstrings.sh
-          git commit -am "Sync Linux docstrings" --allow-empty
-      - name: Push the changes
-        id: commit
-        if: ${{ success() }}
-        run: git -C ruff push --force --set-upstream origin "${UPSTREAM_BRANCH}"
-
-  # Checkout the branch created by the sync job,
-  # and sync all docstrings available on Windows that are not available on Linux.
-  # Commit the changes and push them to the same branch.
-  docstrings-windows:
-    runs-on: windows-latest
-    timeout-minutes: 20
-    needs: [sync]
-
-    # Don't run the cron job on forks.
-    # The job will also be skipped if the sync job failed, because it's specified in `needs` above,
-    # and we haven't used `always()` in the `if` condition here
-    # (https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-requiring-successful-dependent-jobs)
-    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
-
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        name: Checkout Ruff
-        with:
-          persist-credentials: true
-          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - name: Setup git
-        run: |
-          git config --global user.name typeshedbot
-          git config --global user.email '<>'
-      - name: Sync Windows docstrings
-        id: docstrings
-        shell: bash
-        run: ./scripts/codemod_docstrings.sh
+          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
+          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
      - name: Commit the changes
-        if: ${{ steps.docstrings.outcome == 'success' }}
+        id: commit
+        if: ${{ steps.sync.outcome == 'success' }}
        run: |
-          git commit -am "Sync Windows docstrings" --allow-empty
-          git push
-
-  # Checkout the branch created by the sync job,
-  # and sync all docstrings available on macOS that are not available on Linux or Windows.
-  # Push the changes to the same branch and create a PR against the `main` branch using that branch.
-  docstrings-macos-and-pr:
-    runs-on: macos-latest
-    timeout-minutes: 20
-    needs: [sync, docstrings-windows]
-
-    # Don't run the cron job on forks.
-    # The job will also be skipped if the sync or docstrings-windows jobs failed,
-    # because they're specified in `needs` above and we haven't used an `always()` condition in the `if` here
-    # (https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-requiring-successful-dependent-jobs)
-    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
-
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        name: Checkout Ruff
-        with:
-          persist-credentials: true
-          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - name: Setup git
-        run: |
-          git config --global user.name typeshedbot
-          git config --global user.email '<>'
-      - name: Sync macOS docstrings
-        run: ./scripts/codemod_docstrings.sh
-      - name: Commit and push the changes
-        if: ${{ success() }}
-        run: |
-          git commit -am "Sync macOS docstrings" --allow-empty
-
-          # Here we just reformat the codemodded stubs so that they are
-          # 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
-          git commit -am "Format codemodded docstrings" --allow-empty
-
-          rm "${VENDORED_TYPESHED}/pyproject.toml"
-          git commit -am "Remove pyproject.toml file"
-
-          git push
+          cd ruff
+          git checkout -b typeshedbot/sync-typeshed
+          git add .
+          git diff --staged --quiet || git commit -m "Sync typeshed. Source commit: https://github.com/python/typeshed/commit/$(git -C ../typeshed rev-parse HEAD)"
      - name: Create a PR
-        if: ${{ success() }}
+        if: ${{ steps.sync.outcome == 'success' && steps.commit.outcome == '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
+          cd ruff
+          git push --force origin typeshedbot/sync-typeshed
+          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:
    name: Create an issue if the typeshed sync failed
    runs-on: ubuntu-latest
-    needs: [sync, docstrings-windows, docstrings-macos-and-pr]
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result == 'failure' || needs.docstrings-windows.result == 'failure' || needs.docstrings-macos-and-pr.result == 'failure') }}
+    needs: [sync]
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.sync.result == 'failure' }}
    permissions:
      issues: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -1,139 +0,0 @@
-name: ty ecosystem-analyzer
-
-permissions: {}
-
-on:
-  pull_request:
-    types: [labeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-  RUST_BACKTRACE: 1
-  REF_NAME: ${{ github.ref_name }}
-  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
-
-jobs:
-  ty-ecosystem-analyzer:
-    name: Compute diagnostic diff
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 20
-    if: contains(github.event.label.name, 'ecosystem-analyzer')
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Compute diagnostic diff
-        shell: bash
-        run: |
-          cd ruff
-
-          echo "Enabling configuration overloads (see .github/mypy-primer-ty.toml)"
-          mkdir -p ~/.config/ty
-          cp .github/mypy-primer-ty.toml ~/.config/ty/ty.toml
-
-          echo "new commit"
-          git checkout -b new_commit "$GITHUB_SHA"
-          git rev-list --format=%s --max-count=1 new_commit
-          cp crates/ty_python_semantic/resources/primer/good.txt projects_new.txt
-
-          echo "old commit (merge base)"
-          MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
-          git checkout -b old_commit "$MERGE_BASE"
-          git rev-list --format=%s --max-count=1 old_commit
-          cp crates/ty_python_semantic/resources/primer/good.txt projects_old.txt
-
-          cd ..
-
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@fc0f612798710b0dd69bb7528bc9b361dc60bd43"
-
-          ecosystem-analyzer \
-            --repository ruff \
-            diff \
-            --profile=release \
-            --projects-old ruff/projects_old.txt \
-            --projects-new ruff/projects_new.txt \
-            --old old_commit \
-            --new new_commit \
-            --output-old diagnostics-old.json \
-            --output-new diagnostics-new.json
-
-          mkdir dist
-
-          ecosystem-analyzer \
-            generate-diff \
-            diagnostics-old.json \
-            diagnostics-new.json \
-            --old-name "main (merge base)" \
-            --new-name "$REF_NAME" \
-            --output-html dist/diff.html
-
-          ecosystem-analyzer \
-            generate-diff-statistics \
-            diagnostics-old.json \
-            diagnostics-new.json \
-            --old-name "main (merge base)" \
-            --new-name "$REF_NAME" \
-            --output diff-statistics.md
-
-          echo '## `ecosystem-analyzer` results' > comment.md
-          echo >> comment.md
-          cat diff-statistics.md >> comment.md
-
-          cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"
-
-          echo ${{ github.event.number }} > pr-number
-
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        id: deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
-        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=ty-ecosystem --branch ${{ github.head_ref }} --commit-hash ${GITHUB_SHA}
-
-      - name: "Append deployment URL"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        env:
-          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
-        run: |
-          echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)**" >> comment.md
-
-      - name: Upload comment
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: comment.md
-          path: comment.md
-
-      - name: Upload pr-number
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: pr-number
-          path: pr-number
-
-      - name: Upload diagnostics diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: diff.html
-          path: dist/diff.html
--- a/.github/workflows/ty-ecosystem-analyzer_comment.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer_comment.yaml
@@ -1,85 +0,0 @@
-name: PR comment (ty ecosystem-analyzer)
-
-on: # zizmor: ignore[dangerous-triggers]
-  workflow_run:
-    workflows: [ty ecosystem-analyzer]
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      workflow_run_id:
-        description: The ty ecosystem-analyzer 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 comment.md"
-        id: download-comment
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: comment.md
-          workflow: ty-ecosystem-analyzer.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/comment
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-          allow_forks: true
-
-      - name: Generate comment content
-        id: generate-comment
-        if: ${{ steps.download-comment.outputs.found_artifact == 'true' }}
-        run: |
-          # Guard against malicious ty ecosystem-analyzer results that symlink to a secret
-          # file on this runner
-          if [[ -L pr/comment/comment.md ]]
-          then
-              echo "Error: comment.md cannot be a symlink"
-              exit 1
-          fi
-
-          # Note: this identifier is used to find the comment to update on subsequent runs
-          echo '<!-- generated-comment ty ecosystem-analyzer -->' > comment.md
-          echo >> comment.md
-          cat pr/comment/comment.md >> comment.md
-
-          echo 'comment<<EOF' >> "$GITHUB_OUTPUT"
-          cat comment.md >> "$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 ty ecosystem-analyzer -->"
-
-      - 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.md
-          edit-mode: replace
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -1,76 +0,0 @@
-name: ty ecosystem-report
-
-permissions: {}
-
-on:
-  workflow_dispatch:
-  schedule:
-    # Run every Wednesday at 5:00 UTC:
-    - cron: 0 5 * * 3
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-  RUST_BACKTRACE: 1
-  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
-
-jobs:
-  ty-ecosystem-report:
-    name: Create ecosystem report
-    runs-on: depot-ubuntu-22.04-32
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-        with:
-          workspaces: "ruff"
-
-      - name: Install Rust toolchain
-        run: rustup show
-
-      - name: Create report
-        shell: bash
-        run: |
-          cd ruff
-
-          echo "Enabling configuration overloads (see .github/mypy-primer-ty.toml)"
-          mkdir -p ~/.config/ty
-          cp .github/mypy-primer-ty.toml ~/.config/ty/ty.toml
-
-          cd ..
-
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@fc0f612798710b0dd69bb7528bc9b361dc60bd43"
-
-          ecosystem-analyzer \
-            --verbose \
-            --repository ruff \
-            analyze \
-            --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
-            --output ecosystem-diagnostics.json
-
-          mkdir dist
-
-          ecosystem-analyzer \
-            generate-report \
-            --max-diagnostics-per-project=1200 \
-            ecosystem-diagnostics.json \
-            --output dist/index.html
-
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        id: deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
-        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}
--- 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: ruff
-          fetch-depth: 0
-          persist-credentials: false
-
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        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/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -10,8 +10,6 @@ rules:
    ignore:
      - build-docker.yml
      - publish-playground.yml
-      - ty-ecosystem-analyzer.yaml
-      - ty-ecosystem-report.yaml
  excessive-permissions:
    # it's hard to test what the impact of removing these ignores would be
    # without actually running the release workflow...
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ exclude: |
    crates/ty_vendored/vendor/.*|
    crates/ty_project/resources/.*|
    crates/ty_python_semantic/resources/corpus/.*|
-    crates/ty/docs/(configuration|rules|cli|environment).md|
+    crates/ty/docs/(configuration|rules|cli).md|
    crates/ruff_benchmark/resources/.*|
    crates/ruff_linter/resources/.*|
    crates/ruff_linter/src/rules/.*/snapshots/.*|
@@ -67,7 +67,7 @@ repos:
          - black==25.1.0

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

@@ -81,17 +81,17 @@ 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.11.13
    hooks:
      - id: ruff-format
-      - id: ruff-check
+      - id: ruff
        args: [--fix, --exit-non-zero-on-fix]
        types_or: [python, pyi]
        require_serial: true

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

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

@@ -128,10 +128,5 @@ repos:
          # but the integration only works if shellcheck is installed
          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.10.0"

-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
-    hooks:
-      - id: shellcheck
-
 ci:
  skip: [cargo-fmt, dev-generate-all]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,4 @@
        "--all-features"
    ],
    "rust-analyzer.check.command": "clippy",
-    "search.exclude": {
-        "**/*.snap": true
-    }
-}
+}
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,44 +1,5 @@
 # Breaking Changes

-## 0.13.0
-
- **Several rules can now add `from __future__ import annotations` automatically**
-
-    `TC001`, `TC002`, `TC003`, `RUF013`, and `UP037` now add `from __future__ import annotations` as part of their fixes when the
-    `lint.future-annotations` setting is enabled. This allows the rules to move
-    more imports into `TYPE_CHECKING` blocks (`TC001`, `TC002`, and `TC003`),
-    use PEP 604 union syntax on Python versions before 3.10 (`RUF013`), and
-    unquote more annotations (`UP037`).
-
- **Full module paths are now used to verify first-party modules**
-
-    Ruff now checks that the full path to a module exists on disk before
-    categorizing it as a first-party import. This change makes first-party
-    import detection more accurate, helping to avoid false positives on local
-    directories with the same name as a third-party dependency, for example. See
-    the [FAQ
-    section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) on import categorization for more details.
-
- **Deprecated rules must now be selected by exact rule code**
-
-    Ruff will no longer activate deprecated rules selected by their group name
-    or prefix. As noted below, the two remaining deprecated rules were also
-    removed in this release, so this won't affect any current rules, but it will
-    still affect any deprecations in the future.
-
- **The deprecated macOS configuration directory fallback has been removed**
-
-    Ruff will no longer look for a user-level configuration file at
-    `~/Library/Application Support/ruff/ruff.toml` on macOS. This feature was
-    deprecated in v0.5 in favor of using the [XDG
-    specification](https://specifications.freedesktop.org/basedir-spec/latest/)
-    (usually resolving to `~/.config/ruff/ruff.toml`), like on Linux. The
-    fallback and accompanying deprecation warning have now been removed.
-
- **[`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name) (`PD901`) has been removed**
-
- **[`non-pep604-isinstance`](https://docs.astral.sh/ruff/rules/non-pep604-isinstance) (`UP038`) has been removed**
-
 ## 0.12.0

 - **Detection of more syntax errors**
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,179 +1,144 @@
 # Changelog

-## 0.13.1
+## 0.12.0

-Released on 2025-09-18.
-
-### Preview features
-
- \[`flake8-simplify`\] Detect unnecessary `None` default for additional key expression types (`SIM910`) ([#20343](https://github.com/astral-sh/ruff/pull/20343))
- \[`flake8-use-pathlib`\] Add fix for `PTH123` ([#20169](https://github.com/astral-sh/ruff/pull/20169))
- \[`flake8-use-pathlib`\] Fix `PTH101`, `PTH104`, `PTH105`, `PTH121` fixes ([#20143](https://github.com/astral-sh/ruff/pull/20143))
- \[`flake8-use-pathlib`\] Make `PTH111` fix unsafe because it can change behavior ([#20215](https://github.com/astral-sh/ruff/pull/20215))
- \[`pycodestyle`\] Fix `E301` to only trigger for functions immediately within a class ([#19768](https://github.com/astral-sh/ruff/pull/19768))
- \[`refurb`\] Mark `single-item-membership-test` fix as always unsafe (`FURB171`) ([#20279](https://github.com/astral-sh/ruff/pull/20279))
-
-### Bug fixes
-
- Handle t-strings for token-based rules and suppression comments ([#20357](https://github.com/astral-sh/ruff/pull/20357))
- \[`flake8-bandit`\] Fix truthiness: dict-only `**` displays not truthy for `shell` (`S602`, `S604`, `S609`) ([#20177](https://github.com/astral-sh/ruff/pull/20177))
- \[`flake8-simplify`\] Fix diagnostic to show correct method name for `str.rsplit` calls (`SIM905`) ([#20459](https://github.com/astral-sh/ruff/pull/20459))
- \[`flynt`\] Use triple quotes for joined raw strings with newlines (`FLY002`) ([#20197](https://github.com/astral-sh/ruff/pull/20197))
- \[`pyupgrade`\] Fix false positive when class name is shadowed by local variable (`UP008`) ([#20427](https://github.com/astral-sh/ruff/pull/20427))
- \[`pyupgrade`\] Prevent infinite loop with `I002` and `UP026` ([#20327](https://github.com/astral-sh/ruff/pull/20327))
- \[`ruff`\] Recognize t-strings, generators, and lambdas in `invalid-index-type` (`RUF016`) ([#20213](https://github.com/astral-sh/ruff/pull/20213))
-
-### Rule changes
-
- \[`RUF102`\] Respect rule redirects in invalid rule code detection ([#20245](https://github.com/astral-sh/ruff/pull/20245))
- \[`flake8-bugbear`\] Mark the fix for `unreliable-callable-check` as always unsafe (`B004`) ([#20318](https://github.com/astral-sh/ruff/pull/20318))
- \[`ruff`\] Allow dataclass attribute value instantiation from nested frozen dataclass (`RUF009`) ([#20352](https://github.com/astral-sh/ruff/pull/20352))
-
-### CLI
-
- Add fixes to `output-format=sarif` ([#20300](https://github.com/astral-sh/ruff/pull/20300))
- Treat panics as fatal diagnostics, sort panics last ([#20258](https://github.com/astral-sh/ruff/pull/20258))
-
-### Documentation
-
- \[`ruff`\] Add `analyze.string-imports-min-dots` to settings ([#20375](https://github.com/astral-sh/ruff/pull/20375))
- Update README.md with Albumentations new repository URL ([#20415](https://github.com/astral-sh/ruff/pull/20415))
-
-### Other changes
-
- Bump MSRV to Rust 1.88 ([#20470](https://github.com/astral-sh/ruff/pull/20470))
- Enable inline noqa for multiline strings in playground ([#20442](https://github.com/astral-sh/ruff/pull/20442))
-
-### Contributors
-
- [@chirizxc](https://github.com/chirizxc)
- [@danparizher](https://github.com/danparizher)
- [@IDrokin117](https://github.com/IDrokin117)
- [@amyreese](https://github.com/amyreese)
- [@AlexWaygood](https://github.com/AlexWaygood)
- [@dylwil3](https://github.com/dylwil3)
- [@njhearp](https://github.com/njhearp)
- [@woodruffw](https://github.com/woodruffw)
- [@dcreager](https://github.com/dcreager)
- [@TaKO8Ki](https://github.com/TaKO8Ki)
- [@BurntSushi](https://github.com/BurntSushi)
- [@salahelfarissi](https://github.com/salahelfarissi)
- [@MichaReiser](https://github.com/MichaReiser)
-
-## 0.13.0
-
-Check out the [blog post](https://astral.sh/blog/ruff-v0.13.0) for a migration
+Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
 guide and overview of the changes!

 ### Breaking changes

- **Several rules can now add `from __future__ import annotations` automatically**
+- **Detection of more syntax errors**

-    `TC001`, `TC002`, `TC003`, `RUF013`, and `UP037` now add `from __future__ import annotations` as part of their fixes when the
-    `lint.future-annotations` setting is enabled. This allows the rules to move
-    more imports into `TYPE_CHECKING` blocks (`TC001`, `TC002`, and `TC003`),
-    use PEP 604 union syntax on Python versions before 3.10 (`RUF013`), and
-    unquote more annotations (`UP037`).
+    Ruff now detects version-related syntax errors, such as the use of the `match`
+    statement on Python versions before 3.10, and syntax errors emitted by
+    CPython's compiler, such as irrefutable `match` patterns before the final
+    `case` arm.

- **Full module paths are now used to verify first-party modules**
+- **New default Python version handling for syntax errors**

-    Ruff now checks that the full path to a module exists on disk before
-    categorizing it as a first-party import. This change makes first-party
-    import detection more accurate, helping to avoid false positives on local
-    directories with the same name as a third-party dependency, for example. See
-    the [FAQ
-    section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) on import categorization for more details.
+    Ruff will default to the _latest_ supported Python version (3.13) when
+    checking for the version-related syntax errors mentioned above to prevent
+    false positives in projects without a Python version configured. The default
+    in all other cases, like applying lint rules, is unchanged and remains at the
+    minimum supported Python version (3.9).

- **Deprecated rules must now be selected by exact rule code**
+- **Updated f-string formatting**

-    Ruff will no longer activate deprecated rules selected by their group name
-    or prefix. As noted below, the two remaining deprecated rules were also
-    removed in this release, so this won't affect any current rules, but it will
-    still affect any deprecations in the future.
+    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
+    line break after the format specifier. This addresses a change to the Python
+    grammar in version 3.13.4 that made such a line break a syntax error.

- **The deprecated macOS configuration directory fallback has been removed**
+- **`rust-toolchain.toml` is no longer included in source distributions**

-    Ruff will no longer look for a user-level configuration file at
-    `~/Library/Application Support/ruff/ruff.toml` on macOS. This feature was
-    deprecated in v0.5 in favor of using the [XDG
-    specification](https://specifications.freedesktop.org/basedir-spec/latest/)
-    (usually resolving to `~/.config/ruff/ruff.toml`), like on Linux. The
-    fallback and accompanying deprecation warning have now been removed.
+    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
+    minimum supported Rust version (MSRV) for development and building release
+    artifacts. However, when present in source distributions, it would also cause
+    downstream package maintainers to pull in the same Rust toolchain, even if
+    their available toolchain was MSRV-compatible.

 ### Removed Rules

 The following rules have been removed:

- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name) (`PD901`)
- [`non-pep604-isinstance`](https://docs.astral.sh/ruff/rules/non-pep604-isinstance) (`UP038`)
+- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
+    (`S320`)
+
+### Deprecated Rules
+
+The following rules have been deprecated:
+
+- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)

 ### Stabilization

 The following rules have been stabilized and are no longer in preview:

- [`airflow-dag-no-schedule-argument`](https://docs.astral.sh/ruff/rules/airflow-dag-no-schedule-argument)
-    (`AIR002`)
- [`airflow3-removal`](https://docs.astral.sh/ruff/rules/airflow3-removal) (`AIR301`)
- [`airflow3-moved-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-moved-to-provider)
-    (`AIR302`)
- [`airflow3-suggested-update`](https://docs.astral.sh/ruff/rules/airflow3-suggested-update)
-    (`AIR311`)
- [`airflow3-suggested-to-move-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-suggested-to-move-to-provider)
-    (`AIR312`)
- [`long-sleep-not-forever`](https://docs.astral.sh/ruff/rules/long-sleep-not-forever) (`ASYNC116`)
- [`f-string-number-format`](https://docs.astral.sh/ruff/rules/f-string-number-format) (`FURB116`)
- [`os-symlink`](https://docs.astral.sh/ruff/rules/os-symlink) (`PTH211`)
- [`generic-not-last-base-class`](https://docs.astral.sh/ruff/rules/generic-not-last-base-class)
-    (`PYI059`)
- [`redundant-none-literal`](https://docs.astral.sh/ruff/rules/redundant-none-literal) (`PYI061`)
- [`pytest-raises-ambiguous-pattern`](https://docs.astral.sh/ruff/rules/pytest-raises-ambiguous-pattern)
-    (`RUF043`)
- [`unused-unpacked-variable`](https://docs.astral.sh/ruff/rules/unused-unpacked-variable)
-    (`RUF059`)
- [`useless-class-metaclass-type`](https://docs.astral.sh/ruff/rules/useless-class-metaclass-type)
-    (`UP050`)
+- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
+- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
+- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
+- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
+- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
+- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
+- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
+- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
+- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
+- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
+- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
+- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
+- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
+- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
+- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
+- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
+- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
+- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
+- [`non-pep604-annotation-optional`](https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional) (`UP045`)
+- [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
+- [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
+- [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)

 The following behaviors have been stabilized:

- [`assert-raises-exception`](https://docs.astral.sh/ruff/rules/assert-raises-exception) (`B017`)
-    now checks for direct calls to `unittest.TestCase.assert_raises` and `pytest.raises` instead of
-    only the context manager forms.
- [`missing-trailing-comma`](https://docs.astral.sh/ruff/rules/missing-trailing-comma) (`COM812`)
-    and [`prohibited-trailing-comma`](https://docs.astral.sh/ruff/rules/prohibited-trailing-comma)
-    (`COM819`) now check for trailing commas in PEP 695 type parameter lists.
- [`raw-string-in-exception`](https://docs.astral.sh/ruff/rules/raw-string-in-exception) (`EM101`)
-    now also checks for byte strings in exception messages.
- [`invalid-mock-access`](https://docs.astral.sh/ruff/rules/invalid-mock-access) (`PGH005`) now
-    checks for `AsyncMock` methods like `not_awaited` in addition to the synchronous variants.
- [`useless-import-alias`](https://docs.astral.sh/ruff/rules/useless-import-alias) (`PLC0414`) no
-    longer applies to `__init__.py` files, where it conflicted with one of the suggested fixes for
-    [`unused-import`](https://docs.astral.sh/ruff/rules/unused-import) (`F401`).
- [`bidirectional-unicode`](https://docs.astral.sh/ruff/rules/bidirectional-unicode) (`PLE2502`) now
-    also checks for U+061C (Arabic Letter Mark).
- The fix for
-    [`multiple-with-statements`](https://docs.astral.sh/ruff/rules/multiple-with-statements)
-    (`SIM117`) is now marked as always safe.
+- [`collection-literal-concatenation`] (`RUF005`) now recognizes slices, in
+    addition to list literals and variables.
+- The fix for [`readlines-in-for`] (`FURB129`) is now marked as always safe.
+- [`if-else-block-instead-of-if-exp`] (`SIM108`) will now further simplify
+    expressions to use `or` instead of an `if` expression, where possible.
+- [`unused-noqa`] (`RUF100`) now checks for file-level `noqa` comments as well
+    as inline comments.
+- [`subprocess-without-shell-equals-true`] (`S603`) now accepts literal strings,
+    as well as lists and tuples of literal strings, as trusted input.
+- [`boolean-type-hint-positional-argument`] (`FBT001`) now applies to types that
+    include `bool`, like `bool | int` or `typing.Optional[bool]`, in addition to
+    plain `bool` annotations.
+- [`non-pep604-annotation-union`] (`UP007`) has now been split into two rules.
+    `UP007` now applies only to `typing.Union`, while
+    [`non-pep604-annotation-optional`] (`UP045`) checks for use of
+    `typing.Optional`. `UP045` has also been stabilized in this release, but you
+    may need to update existing `include`, `ignore`, or `noqa` settings to
+    accommodate this change.

 ### Preview features

- \[`pyupgrade`\] Enable `UP043` in stub files ([#20027](https://github.com/astral-sh/ruff/pull/20027))
+- \[`ruff`\] Check for non-context-manager use of `pytest.raises`, `pytest.warns`, and `pytest.deprecated_call` (`RUF061`) ([#17368](https://github.com/astral-sh/ruff/pull/17368))
+- [syntax-errors] Raise unsupported syntax error for template strings prior to Python 3.14 ([#18664](https://github.com/astral-sh/ruff/pull/18664))

 ### Bug fixes

- \[`pyupgrade`\] Apply `UP008` only when the `__class__` cell exists ([#19424](https://github.com/astral-sh/ruff/pull/19424))
- \[`ruff`\] Fix empty f-string detection in `in-empty-collection` (`RUF060`) ([#20249](https://github.com/astral-sh/ruff/pull/20249))
+- Add syntax error when conversion flag does not immediately follow exclamation mark ([#18706](https://github.com/astral-sh/ruff/pull/18706))
+- Add trailing space around `readlines` ([#18542](https://github.com/astral-sh/ruff/pull/18542))
+- Fix `\r` and `\r\n` handling in t- and f-string debug texts ([#18673](https://github.com/astral-sh/ruff/pull/18673))
+- Hug closing `}` when f-string expression has a format specifier ([#18704](https://github.com/astral-sh/ruff/pull/18704))
+- \[`flake8-pyi`\] Avoid syntax error in the case of starred and keyword arguments (`PYI059`) ([#18611](https://github.com/astral-sh/ruff/pull/18611))
+- \[`flake8-return`\] Fix `RET504` autofix generating a syntax error ([#18428](https://github.com/astral-sh/ruff/pull/18428))
+- \[`pep8-naming`\] Suppress fix for `N804` and `N805` if the recommended name is already used ([#18472](https://github.com/astral-sh/ruff/pull/18472))
+- \[`pycodestyle`\] Avoid causing a syntax error in expressions spanning multiple lines (`E731`) ([#18479](https://github.com/astral-sh/ruff/pull/18479))
+- \[`pyupgrade`\] Suppress `UP008` if `super` is shadowed ([#18688](https://github.com/astral-sh/ruff/pull/18688))
+- \[`refurb`\] Parenthesize lambda and ternary expressions (`FURB122`, `FURB142`) ([#18592](https://github.com/astral-sh/ruff/pull/18592))
+- \[`ruff`\] Handle extra arguments to `deque` (`RUF037`) ([#18614](https://github.com/astral-sh/ruff/pull/18614))
+- \[`ruff`\] Preserve parentheses around `deque` in fix for `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#18598](https://github.com/astral-sh/ruff/pull/18598))
+- \[`ruff`\] Validate arguments before offering a fix (`RUF056`) ([#18631](https://github.com/astral-sh/ruff/pull/18631))
+- \[`ruff`\] Skip fix for `RUF059` if dummy name is already bound ([#18509](https://github.com/astral-sh/ruff/pull/18509))
+- \[`pylint`\] Fix `PLW0128` to check assignment targets in square brackets and after asterisks ([#18665](https://github.com/astral-sh/ruff/pull/18665))
+
+### Rule changes
+
+- Fix false positive on mutations in `return` statements (`B909`) ([#18408](https://github.com/astral-sh/ruff/pull/18408))
+- Treat `ty:` comments as pragma comments ([#18532](https://github.com/astral-sh/ruff/pull/18532))
+- \[`flake8-pyi`\] Apply `custom-typevar-for-self` to string annotations (`PYI019`) ([#18311](https://github.com/astral-sh/ruff/pull/18311))
+- \[`pyupgrade`\] Don't offer a fix for `Optional[None]` (`UP007`, `UP045)` ([#18545](https://github.com/astral-sh/ruff/pull/18545))
+- \[`pyupgrade`\] Fix `super(__class__, self)` detection (`UP008`) ([#18478](https://github.com/astral-sh/ruff/pull/18478))
+- \[`refurb`\] Make the fix for `FURB163` unsafe for `log2`, `log10`, `*args`, and deleted comments ([#18645](https://github.com/astral-sh/ruff/pull/18645))

 ### Server

- Add support for using uv as an alternative formatter backend ([#19665](https://github.com/astral-sh/ruff/pull/19665))
+- Support cancellation requests ([#18627](https://github.com/astral-sh/ruff/pull/18627))

 ### Documentation

- \[`pep8-naming`\] Fix formatting of `__all__` (`N816`) ([#20301](https://github.com/astral-sh/ruff/pull/20301))
-
-## 0.12.x
-
-See [changelogs/0.12.x](./changelogs/0.12.x.md)
+- Drop confusing second `*` from glob pattern example for `per-file-target-version` ([#18709](https://github.com/astral-sh/ruff/pull/18709))
+- Update Neovim configuration examples ([#18491](https://github.com/astral-sh/ruff/pull/18491))
+- \[`pylint`\] De-emphasize `__hash__ = Parent.__hash__` (`PLW1641`) ([#18613](https://github.com/astral-sh/ruff/pull/18613))
+- \[`refurb`\] Add a note about float literal handling (`FURB157`) ([#18615](https://github.com/astral-sh/ruff/pull/18615))

 ## 0.11.x

@@ -218,3 +183,12 @@ See [changelogs/0.2.x](./changelogs/0.2.x.md)
 ## 0.1.x

 See [changelogs/0.1.x](./changelogs/0.1.x.md)
+
+[`boolean-type-hint-positional-argument`]: https://docs.astral.sh/ruff/rules/boolean-type-hint-positional-argument
+[`collection-literal-concatenation`]: https://docs.astral.sh/ruff/rules/collection-literal-concatenation
+[`if-else-block-instead-of-if-exp`]: https://docs.astral.sh/ruff/rules/if-else-block-instead-of-if-exp
+[`non-pep604-annotation-optional`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional
+[`non-pep604-annotation-union`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
+[`readlines-in-for`]: https://docs.astral.sh/ruff/rules/readlines-in-for
+[`subprocess-without-shell-equals-true`]: https://docs.astral.sh/ruff/rules/subprocess-without-shell-equals-true
+[`unused-noqa`]: https://docs.astral.sh/ruff/rules/unused-noqa
--- 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.88"
+rust-version = "1.85"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -23,13 +23,11 @@ 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" }
 ruff_python_codegen = { path = "crates/ruff_python_codegen" }
 ruff_python_formatter = { path = "crates/ruff_python_formatter" }
-ruff_python_importer = { path = "crates/ruff_python_importer" }
 ruff_python_index = { path = "crates/ruff_python_index" }
 ruff_python_literal = { path = "crates/ruff_python_literal" }
 ruff_python_parser = { path = "crates/ruff_python_parser" }
@@ -42,12 +40,10 @@ 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" }
 ty_server = { path = "crates/ty_server" }
-ty_static = { path = "crates/ty_static" }
 ty_test = { path = "crates/ty_test" }
 ty_vendored = { path = "crates/ty_vendored" }

@@ -60,42 +56,34 @@ 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" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
-divan = { package = "codspeed-divan-compat", version = "3.0.2" }
-codspeed-criterion-compat = { version = "3.0.2", default-features = false }
+divan = { package = "codspeed-divan-compat", version = "2.10.1" }
+codspeed-criterion-compat = { version = "2.6.0", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 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" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
+env_logger = { version = "0.11.0" }
 etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.7.0", features = [
-    "derive",
-    "smallvec",
-    "hashbrown",
-    "compact-str",
-] }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
-hashbrown = { version = "0.16.0", default-features = false, features = [
+hashbrown = { version = "0.15.0", default-features = false, features = [
    "raw-entry",
    "equivalent",
    "inline-more",
@@ -105,7 +93,7 @@ ignore = { version = "0.4.22" }
 imara-diff = { version = "0.1.5" }
 imperative = { version = "1.0.4" }
 indexmap = { version = "2.6.0" }
-indicatif = { version = "0.18.0" }
+indicatif = { version = "0.17.8" }
 indoc = { version = "2.0.4" }
 insta = { version = "1.35.1" }
 insta-cmd = { version = "0.6.0" }
@@ -116,7 +104,7 @@ jiff = { version = "0.2.0" }
 js-sys = { version = "0.3.69" }
 jod-thread = { version = "1.0.0" }
 libc = { version = "0.2.153" }
-libcst = { version = "1.8.4", default-features = false }
+libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
 lsp-server = { version = "0.7.6" }
 lsp-types = { git = "https://github.com/astral-sh/lsp-types.git", rev = "3512a9f", features = [
@@ -144,12 +132,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "3713cd7eb30821c0c086591832dd6f59f2af7fe7", default-features = false, features = [
-    "compact_str",
-    "macros",
-    "salsa_unstable",
-    "inventory",
-] }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "09627e450566f894956710a3fd923dc80462ae6d" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
@@ -161,7 +144,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",
@@ -176,16 +159,16 @@ tempfile = { version = "3.9.0" }
 test-case = { version = "3.3.1" }
 thiserror = { version = "2.0.0" }
 tikv-jemallocator = { version = "0.6.0" }
-toml = { version = "0.9.0" }
+toml = { version = "0.8.11" }
 tracing = { version = "0.1.40" }
 tracing-flame = { version = "0.2.0" }
-tracing-indicatif = { version = "0.3.11" }
+tracing-indicatif = { version = "0.3.6" }
 tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.18", default-features = false, features = [
    "env-filter",
    "fmt",
    "ansi",
-    "smallvec",
+    "smallvec"
 ] }
 tryfn = { version = "0.2.1" }
 typed-arena = { version = "2.0.2" }
@@ -195,7 +178,11 @@ unicode-width = { version = "0.2.0" }
 unicode_names2 = { version = "1.2.2" }
 unicode-normalization = { version = "0.1.23" }
 url = { version = "2.5.0" }
-uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
+uuid = { version = "1.6.1", features = [
+    "v4",
+    "fast-rng",
+    "macro-diagnostics",
+] }
 walkdir = { version = "2.3.2" }
 wasm-bindgen = { version = "0.2.92" }
 wasm-bindgen-test = { version = "0.3.42" }
@@ -203,7 +190,7 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }

 [workspace.metadata.cargo-shear]
-ignored = ["getrandom", "ruff_options_metadata", "uuid", "get-size2"]
+ignored = ["getrandom", "ruff_options_metadata", "uuid"]


 [workspace.lints.rust]
@@ -216,8 +203,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"
@@ -232,12 +217,11 @@ must_use_candidate = "allow"
 similar_names = "allow"
 single_match_else = "allow"
 too_many_lines = "allow"
-needless_continue = "allow" # An explicit continue can be more readable, especially if the alternative is an empty block.
-unnecessary_debug_formatting = "allow" # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
+needless_continue = "allow"       # An explicit continue can be more readable, especially if the alternative is an empty block.
+unnecessary_debug_formatting = "allow"  # too many instances, the display also doesn't quote the path which is often desired in logs where we use them the most often.
 # Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
 needless_raw_string_hashes = "allow"
 # Disallowed restriction lints
-ignore_without_reason = "allow" # Too many exsisting instances, and there's no auto fix.
 print_stdout = "warn"
 print_stderr = "warn"
 dbg_macro = "warn"
@@ -252,19 +236,10 @@ rest_pat_in_fully_bound_structs = "warn"
 redundant_clone = "warn"
 debug_assert_with_mut_call = "warn"
 unused_peekable = "warn"
-# This lint sometimes flags code whose `if` and `else`
-# bodies could be flipped when a `!` operator is removed.
-# While perhaps sometimes a good idea, it is also often
-# not a good idea due to other factors impacting
-# readability. For example, if flipping the bodies results
-# in the `if` being an order of magnitude bigger than the
-# `else`, then some might consider that harder to read.
-if_not_else = "allow"

 # 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/1160
+++ b/1160
--- 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.13.1/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.13.1/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.0/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.0/install.ps1 | iex"
 ```

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.13.1
+  rev: v0.12.0
  hooks:
    # Run the linter.
    - id: ruff-check
@@ -421,16 +421,14 @@ Ruff is released under the MIT license.

 Ruff is used by a number of major open-source projects and companies, including:

- [Albumentations](https://github.com/albumentations-team/AlbumentationsX)
+- [Albumentations](https://github.com/albumentations-team/albumentations)
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
- [Anki](https://apps.ankiweb.net/)
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
 - AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))
 - [Babel](https://github.com/python-babel/babel)
 - Benchling ([Refac](https://github.com/benchling/refac))
 - [Bokeh](https://github.com/bokeh/bokeh)
- Capital One ([datacompy](https://github.com/capitalone/datacompy))
 - CrowdCent ([NumerBlox](https://github.com/crowdcent/numerblox)) <!-- typos: ignore -->
 - [Cryptography (PyCA)](https://github.com/pyca/cryptography)
 - CERN ([Indico](https://getindico.io/))
@@ -507,7 +505,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Streamlit](https://github.com/streamlit/streamlit)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
- [Weblate](https://weblate.org/)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))
 - [ZenML](https://github.com/zenml-io/zenml)
 - [Zulip](https://github.com/zulip/zulip)
--- a/changelogs/0.12.x.md
+++ b/changelogs/0.12.x.md
@@ -1,551 +0,0 @@
-# Changelog 0.12.x
-
-## 0.12.0
-
-Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
-guide and overview of the changes!
-
-### Breaking changes
-
- **Detection of more syntax errors**
-
-    Ruff now detects version-related syntax errors, such as the use of the `match`
-    statement on Python versions before 3.10, and syntax errors emitted by
-    CPython's compiler, such as irrefutable `match` patterns before the final
-    `case` arm.
-
- **New default Python version handling for syntax errors**
-
-    Ruff will default to the *latest* supported Python version (3.13) when
-    checking for the version-related syntax errors mentioned above to prevent
-    false positives in projects without a Python version configured. The default
-    in all other cases, like applying lint rules, is unchanged and remains at the
-    minimum supported Python version (3.9).
-
- **Updated f-string formatting**
-
-    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
-    line break after the format specifier. This addresses a change to the Python
-    grammar in version 3.13.4 that made such a line break a syntax error.
-
- **`rust-toolchain.toml` is no longer included in source distributions**
-
-    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
-    minimum supported Rust version (MSRV) for development and building release
-    artifacts. However, when present in source distributions, it would also cause
-    downstream package maintainers to pull in the same Rust toolchain, even if
-    their available toolchain was MSRV-compatible.
-
-### Removed Rules
-
-The following rules have been removed:
-
- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
-    (`S320`)
-
-### Deprecated Rules
-
-The following rules have been deprecated:
-
- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)
-
-### Stabilization
-
-The following rules have been stabilized and are no longer in preview:
-
- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
- [`non-pep604-annotation-optional`] (`UP045`)
- [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
- [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
- [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)
-
-The following behaviors have been stabilized:
-
- [`collection-literal-concatenation`] (`RUF005`) now recognizes slices, in
-    addition to list literals and variables.
- The fix for [`readlines-in-for`] (`FURB129`) is now marked as always safe.
- [`if-else-block-instead-of-if-exp`] (`SIM108`) will now further simplify
-    expressions to use `or` instead of an `if` expression, where possible.
- [`unused-noqa`] (`RUF100`) now checks for file-level `noqa` comments as well
-    as inline comments.
- [`subprocess-without-shell-equals-true`] (`S603`) now accepts literal strings,
-    as well as lists and tuples of literal strings, as trusted input.
- [`boolean-type-hint-positional-argument`] (`FBT001`) now applies to types that
-    include `bool`, like `bool | int` or `typing.Optional[bool]`, in addition to
-    plain `bool` annotations.
- [`non-pep604-annotation-union`] (`UP007`) has now been split into two rules.
-    `UP007` now applies only to `typing.Union`, while
-    [`non-pep604-annotation-optional`] (`UP045`) checks for use of
-    `typing.Optional`. `UP045` has also been stabilized in this release, but you
-    may need to update existing `include`, `ignore`, or `noqa` settings to
-    accommodate this change.
-
-### Preview features
-
- \[`ruff`\] Check for non-context-manager use of `pytest.raises`, `pytest.warns`, and `pytest.deprecated_call` (`RUF061`) ([#17368](https://github.com/astral-sh/ruff/pull/17368))
- [syntax-errors] Raise unsupported syntax error for template strings prior to Python 3.14 ([#18664](https://github.com/astral-sh/ruff/pull/18664))
-
-### Bug fixes
-
- Add syntax error when conversion flag does not immediately follow exclamation mark ([#18706](https://github.com/astral-sh/ruff/pull/18706))
- Add trailing space around `readlines` ([#18542](https://github.com/astral-sh/ruff/pull/18542))
- Fix `\r` and `\r\n` handling in t- and f-string debug texts ([#18673](https://github.com/astral-sh/ruff/pull/18673))
- Hug closing `}` when f-string expression has a format specifier ([#18704](https://github.com/astral-sh/ruff/pull/18704))
- \[`flake8-pyi`\] Avoid syntax error in the case of starred and keyword arguments (`PYI059`) ([#18611](https://github.com/astral-sh/ruff/pull/18611))
- \[`flake8-return`\] Fix `RET504` autofix generating a syntax error ([#18428](https://github.com/astral-sh/ruff/pull/18428))
- \[`pep8-naming`\] Suppress fix for `N804` and `N805` if the recommended name is already used ([#18472](https://github.com/astral-sh/ruff/pull/18472))
- \[`pycodestyle`\] Avoid causing a syntax error in expressions spanning multiple lines (`E731`) ([#18479](https://github.com/astral-sh/ruff/pull/18479))
- \[`pyupgrade`\] Suppress `UP008` if `super` is shadowed ([#18688](https://github.com/astral-sh/ruff/pull/18688))
- \[`refurb`\] Parenthesize lambda and ternary expressions (`FURB122`, `FURB142`) ([#18592](https://github.com/astral-sh/ruff/pull/18592))
- \[`ruff`\] Handle extra arguments to `deque` (`RUF037`) ([#18614](https://github.com/astral-sh/ruff/pull/18614))
- \[`ruff`\] Preserve parentheses around `deque` in fix for `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#18598](https://github.com/astral-sh/ruff/pull/18598))
- \[`ruff`\] Validate arguments before offering a fix (`RUF056`) ([#18631](https://github.com/astral-sh/ruff/pull/18631))
- \[`ruff`\] Skip fix for `RUF059` if dummy name is already bound ([#18509](https://github.com/astral-sh/ruff/pull/18509))
- \[`pylint`\] Fix `PLW0128` to check assignment targets in square brackets and after asterisks ([#18665](https://github.com/astral-sh/ruff/pull/18665))
-
-### Rule changes
-
- Fix false positive on mutations in `return` statements (`B909`) ([#18408](https://github.com/astral-sh/ruff/pull/18408))
- Treat `ty:` comments as pragma comments ([#18532](https://github.com/astral-sh/ruff/pull/18532))
- \[`flake8-pyi`\] Apply `custom-typevar-for-self` to string annotations (`PYI019`) ([#18311](https://github.com/astral-sh/ruff/pull/18311))
- \[`pyupgrade`\] Don't offer a fix for `Optional[None]` (`UP007`, `UP045)` ([#18545](https://github.com/astral-sh/ruff/pull/18545))
- \[`pyupgrade`\] Fix `super(__class__, self)` detection (`UP008`) ([#18478](https://github.com/astral-sh/ruff/pull/18478))
- \[`refurb`\] Make the fix for `FURB163` unsafe for `log2`, `log10`, `*args`, and deleted comments ([#18645](https://github.com/astral-sh/ruff/pull/18645))
-
-### Server
-
- Support cancellation requests ([#18627](https://github.com/astral-sh/ruff/pull/18627))
-
-### Documentation
-
- Drop confusing second `*` from glob pattern example for `per-file-target-version` ([#18709](https://github.com/astral-sh/ruff/pull/18709))
- Update Neovim configuration examples ([#18491](https://github.com/astral-sh/ruff/pull/18491))
- \[`pylint`\] De-emphasize `__hash__ = Parent.__hash__` (`PLW1641`) ([#18613](https://github.com/astral-sh/ruff/pull/18613))
- \[`refurb`\] Add a note about float literal handling (`FURB157`) ([#18615](https://github.com/astral-sh/ruff/pull/18615))
-
-## 0.12.1
-
-### Preview features
-
- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
-
-### Bug fixes
-
- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
-
-### Rule changes
-
- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
-
-### Server
-
- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
-
-### Documentation
-
- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
-
-### Other changes
-
- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
-
-## 0.12.2
-
-### Preview features
-
- \[`flake8-pyi`\] Expand `Optional[A]` to `A | None` (`PYI016`) ([#18572](https://github.com/astral-sh/ruff/pull/18572))
- \[`pyupgrade`\] Mark `UP008` fix safe if no comments are in range ([#18683](https://github.com/astral-sh/ruff/pull/18683))
-
-### Bug fixes
-
- \[`flake8-comprehensions`\] Fix `C420` to prepend whitespace when needed ([#18616](https://github.com/astral-sh/ruff/pull/18616))
- \[`perflint`\] Fix `PERF403` panic on attribute or subscription loop variable ([#19042](https://github.com/astral-sh/ruff/pull/19042))
- \[`pydocstyle`\] Fix `D413` infinite loop for parenthesized docstring ([#18930](https://github.com/astral-sh/ruff/pull/18930))
- \[`pylint`\] Fix `PLW0108` autofix introducing a syntax error when the lambda's body contains an assignment expression ([#18678](https://github.com/astral-sh/ruff/pull/18678))
- \[`refurb`\] Fix false positive on empty tuples (`FURB168`) ([#19058](https://github.com/astral-sh/ruff/pull/19058))
- \[`ruff`\] Allow more `field` calls from `attrs` (`RUF009`) ([#19021](https://github.com/astral-sh/ruff/pull/19021))
- \[`ruff`\] Fix syntax error introduced for an empty string followed by a u-prefixed string (`UP025`) ([#18899](https://github.com/astral-sh/ruff/pull/18899))
-
-### Rule changes
-
- \[`flake8-executable`\] Allow `uvx` in shebang line (`EXE003`) ([#18967](https://github.com/astral-sh/ruff/pull/18967))
- \[`pandas`\] Avoid flagging `PD002` if `pandas` is not imported ([#18963](https://github.com/astral-sh/ruff/pull/18963))
- \[`pyupgrade`\] Avoid PEP-604 unions with `typing.NamedTuple` (`UP007`, `UP045`) ([#18682](https://github.com/astral-sh/ruff/pull/18682))
-
-### Documentation
-
- Document link between `import-outside-top-level (PLC0415)` and `lint.flake8-tidy-imports.banned-module-level-imports` ([#18733](https://github.com/astral-sh/ruff/pull/18733))
- Fix description of the `format.skip-magic-trailing-comma` example ([#19095](https://github.com/astral-sh/ruff/pull/19095))
- \[`airflow`\] Make `AIR302` example error out-of-the-box ([#18988](https://github.com/astral-sh/ruff/pull/18988))
- \[`airflow`\] Make `AIR312` example error out-of-the-box ([#18989](https://github.com/astral-sh/ruff/pull/18989))
- \[`flake8-annotations`\] Make `ANN401` example error out-of-the-box ([#18974](https://github.com/astral-sh/ruff/pull/18974))
- \[`flake8-async`\] Make `ASYNC100` example error out-of-the-box ([#18993](https://github.com/astral-sh/ruff/pull/18993))
- \[`flake8-async`\] Make `ASYNC105` example error out-of-the-box ([#19002](https://github.com/astral-sh/ruff/pull/19002))
- \[`flake8-async`\] Make `ASYNC110` example error out-of-the-box ([#18975](https://github.com/astral-sh/ruff/pull/18975))
- \[`flake8-async`\] Make `ASYNC210` example error out-of-the-box ([#18977](https://github.com/astral-sh/ruff/pull/18977))
- \[`flake8-async`\] Make `ASYNC220`, `ASYNC221`, and `ASYNC222` examples error out-of-the-box ([#18978](https://github.com/astral-sh/ruff/pull/18978))
- \[`flake8-async`\] Make `ASYNC251` example error out-of-the-box ([#18990](https://github.com/astral-sh/ruff/pull/18990))
- \[`flake8-bandit`\] Make `S201` example error out-of-the-box ([#19017](https://github.com/astral-sh/ruff/pull/19017))
- \[`flake8-bandit`\] Make `S604` and `S609` examples error out-of-the-box ([#19049](https://github.com/astral-sh/ruff/pull/19049))
- \[`flake8-bugbear`\] Make `B028` example error out-of-the-box ([#19054](https://github.com/astral-sh/ruff/pull/19054))
- \[`flake8-bugbear`\] Make `B911` example error out-of-the-box ([#19051](https://github.com/astral-sh/ruff/pull/19051))
- \[`flake8-datetimez`\] Make `DTZ011` example error out-of-the-box ([#19055](https://github.com/astral-sh/ruff/pull/19055))
- \[`flake8-datetimez`\] Make `DTZ901` example error out-of-the-box ([#19056](https://github.com/astral-sh/ruff/pull/19056))
- \[`flake8-pyi`\] Make `PYI032` example error out-of-the-box ([#19061](https://github.com/astral-sh/ruff/pull/19061))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI014`, `PYI015`) ([#19097](https://github.com/astral-sh/ruff/pull/19097))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI042`) ([#19101](https://github.com/astral-sh/ruff/pull/19101))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI059`) ([#19080](https://github.com/astral-sh/ruff/pull/19080))
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI062`) ([#19079](https://github.com/astral-sh/ruff/pull/19079))
- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT023`) ([#19104](https://github.com/astral-sh/ruff/pull/19104))
- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT030`) ([#19105](https://github.com/astral-sh/ruff/pull/19105))
- \[`flake8-quotes`\] Make example error out-of-the-box (`Q003`) ([#19106](https://github.com/astral-sh/ruff/pull/19106))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM110`) ([#19113](https://github.com/astral-sh/ruff/pull/19113))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM113`) ([#19109](https://github.com/astral-sh/ruff/pull/19109))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM401`) ([#19110](https://github.com/astral-sh/ruff/pull/19110))
- \[`pyflakes`\] Fix backslash in docs (`F621`) ([#19098](https://github.com/astral-sh/ruff/pull/19098))
- \[`pylint`\] Fix `PLC0415` example ([#18970](https://github.com/astral-sh/ruff/pull/18970))
-
-## 0.12.3
-
-### Preview features
-
- \[`flake8-bugbear`\] Support non-context-manager calls in `B017` ([#19063](https://github.com/astral-sh/ruff/pull/19063))
- \[`flake8-use-pathlib`\] Add autofixes for `PTH100`, `PTH106`, `PTH107`, `PTH108`, `PTH110`, `PTH111`, `PTH112`, `PTH113`, `PTH114`, `PTH115`, `PTH117`, `PTH119`, `PTH120` ([#19213](https://github.com/astral-sh/ruff/pull/19213))
- \[`flake8-use-pathlib`\] Add autofixes for `PTH203`, `PTH204`, `PTH205` ([#18922](https://github.com/astral-sh/ruff/pull/18922))
-
-### Bug fixes
-
- \[`flake8-return`\] Fix false-positive for variables used inside nested functions in `RET504` ([#18433](https://github.com/astral-sh/ruff/pull/18433))
- Treat form feed as valid whitespace before a line continuation ([#19220](https://github.com/astral-sh/ruff/pull/19220))
- \[`flake8-type-checking`\] Fix syntax error introduced by fix (`TC008`) ([#19150](https://github.com/astral-sh/ruff/pull/19150))
- \[`pyupgrade`\] Keyword arguments in `super` should suppress the `UP008` fix ([#19131](https://github.com/astral-sh/ruff/pull/19131))
-
-### Documentation
-
- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI007`, `PYI008`) ([#19103](https://github.com/astral-sh/ruff/pull/19103))
- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM116`) ([#19111](https://github.com/astral-sh/ruff/pull/19111))
- \[`flake8-type-checking`\] Make example error out-of-the-box (`TC001`) ([#19151](https://github.com/astral-sh/ruff/pull/19151))
- \[`flake8-use-pathlib`\] Make example error out-of-the-box (`PTH210`) ([#19189](https://github.com/astral-sh/ruff/pull/19189))
- \[`pycodestyle`\] Make example error out-of-the-box (`E272`) ([#19191](https://github.com/astral-sh/ruff/pull/19191))
- \[`pycodestyle`\] Make example not raise unnecessary `SyntaxError` (`E114`) ([#19190](https://github.com/astral-sh/ruff/pull/19190))
- \[`pydoclint`\] Make example error out-of-the-box (`DOC501`) ([#19218](https://github.com/astral-sh/ruff/pull/19218))
- \[`pylint`, `pyupgrade`\] Fix syntax errors in examples (`PLW1501`, `UP028`) ([#19127](https://github.com/astral-sh/ruff/pull/19127))
- \[`pylint`\] Update `missing-maxsplit-arg` docs and error to suggest proper usage (`PLC0207`) ([#18949](https://github.com/astral-sh/ruff/pull/18949))
- \[`flake8-bandit`\] Make example error out-of-the-box (`S412`) ([#19241](https://github.com/astral-sh/ruff/pull/19241))
-
-## 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.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.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.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.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.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.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.11
-
-### Preview features
-
- \[`airflow`\] Extend `AIR311` and `AIR312` rules ([#20082](https://github.com/astral-sh/ruff/pull/20082))
- \[`airflow`\] Replace wrong path `airflow.io.storage` with `airflow.io.store` (`AIR311`) ([#20081](https://github.com/astral-sh/ruff/pull/20081))
- \[`flake8-async`\] Implement `blocking-http-call-httpx-in-async-function` (`ASYNC212`) ([#20091](https://github.com/astral-sh/ruff/pull/20091))
- \[`flake8-logging-format`\] Add auto-fix for f-string logging calls (`G004`) ([#19303](https://github.com/astral-sh/ruff/pull/19303))
- \[`flake8-use-pathlib`\] Add autofix for `PTH211` ([#20009](https://github.com/astral-sh/ruff/pull/20009))
- \[`flake8-use-pathlib`\] Make `PTH100` fix unsafe because it can change behavior ([#20100](https://github.com/astral-sh/ruff/pull/20100))
-
-### Bug fixes
-
- \[`pyflakes`, `pylint`\] Fix false positives caused by `__class__` cell handling (`F841`, `PLE0117`) ([#20048](https://github.com/astral-sh/ruff/pull/20048))
- \[`pyflakes`\] Fix `allowed-unused-imports` matching for top-level modules (`F401`) ([#20115](https://github.com/astral-sh/ruff/pull/20115))
- \[`ruff`\] Fix false positive for t-strings in `default-factory-kwarg` (`RUF026`) ([#20032](https://github.com/astral-sh/ruff/pull/20032))
- \[`ruff`\] Preserve relative whitespace in multi-line expressions (`RUF033`) ([#19647](https://github.com/astral-sh/ruff/pull/19647))
-
-### Rule changes
-
- \[`ruff`\] Handle empty t-strings in `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#20045](https://github.com/astral-sh/ruff/pull/20045))
-
-### Documentation
-
- Fix incorrect `D413` links in docstrings convention FAQ ([#20089](https://github.com/astral-sh/ruff/pull/20089))
- \[`flake8-use-pathlib`\] Update links to the table showing the correspondence between `os` and `pathlib` ([#20103](https://github.com/astral-sh/ruff/pull/20103))
-
-## 0.12.12
-
-### Preview features
-
- Show fixes by default ([#19919](https://github.com/astral-sh/ruff/pull/19919))
- \[`airflow`\] Convert `DatasetOrTimeSchedule(datasets=...)` to `AssetOrTimeSchedule(assets=...)` (`AIR311`) ([#20202](https://github.com/astral-sh/ruff/pull/20202))
- \[`airflow`\] Improve the `AIR002` error message ([#20173](https://github.com/astral-sh/ruff/pull/20173))
- \[`airflow`\] Move `airflow.operators.postgres_operator.Mapping` from `AIR302` to `AIR301` ([#20172](https://github.com/astral-sh/ruff/pull/20172))
- \[`flake8-async`\] Implement `blocking-input` rule (`ASYNC250`) ([#20122](https://github.com/astral-sh/ruff/pull/20122))
- \[`flake8-use-pathlib`\] Make `PTH119` and `PTH120` fixes unsafe because they can change behavior ([#20118](https://github.com/astral-sh/ruff/pull/20118))
- \[`pylint`\] Add U+061C to `PLE2502` ([#20106](https://github.com/astral-sh/ruff/pull/20106))
- \[`ruff`\] Fix false negative for empty f-strings in `deque` calls (`RUF037`) ([#20109](https://github.com/astral-sh/ruff/pull/20109))
-
-### Bug fixes
-
- Less confidently mark f-strings as empty when inferring truthiness ([#20152](https://github.com/astral-sh/ruff/pull/20152))
- \[`fastapi`\] Fix false positive for paths with spaces around parameters (`FAST003`) ([#20077](https://github.com/astral-sh/ruff/pull/20077))
- \[`flake8-comprehensions`\] Skip `C417` when lambda contains `yield`/`yield from` ([#20201](https://github.com/astral-sh/ruff/pull/20201))
- \[`perflint`\] Handle tuples in dictionary comprehensions (`PERF403`) ([#19934](https://github.com/astral-sh/ruff/pull/19934))
-
-### Rule changes
-
- \[`pycodestyle`\] Preserve return type annotation for `ParamSpec` (`E731`) ([#20108](https://github.com/astral-sh/ruff/pull/20108))
-
-### Documentation
-
- Add fix safety sections to docs ([#17490](https://github.com/astral-sh/ruff/pull/17490),[#17499](https://github.com/astral-sh/ruff/pull/17499))
-
-[`boolean-type-hint-positional-argument`]: https://docs.astral.sh/ruff/rules/boolean-type-hint-positional-argument
-[`collection-literal-concatenation`]: https://docs.astral.sh/ruff/rules/collection-literal-concatenation
-[`if-else-block-instead-of-if-exp`]: https://docs.astral.sh/ruff/rules/if-else-block-instead-of-if-exp
-[`non-pep604-annotation-optional`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional
-[`non-pep604-annotation-union`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
-[`readlines-in-for`]: https://docs.astral.sh/ruff/rules/readlines-in-for
-[`subprocess-without-shell-equals-true`]: https://docs.astral.sh/ruff/rules/subprocess-without-shell-equals-true
-[`unused-noqa`]: https://docs.astral.sh/ruff/rules/unused-noqa
--- 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.13.1"
+version = "0.12.0"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -68,7 +68,6 @@ ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
 assert_fs = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"] }
-dunce = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
@@ -85,7 +84,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,24 @@ 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_diagnostics::Fix;
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::{VERSION, warn_user};
 use ruff_macros::CacheKey;
+use ruff_notebook::NotebookIndex;
+use ruff_source_file::SourceFileBuilder;
+use ruff_text_size::{Ranged, 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 +297,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 +338,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 messages = if lint.messages.is_empty() {
+                Vec::new()
+            } else {
+                let file = SourceFileBuilder::new(path.to_string_lossy(), &*lint.source).finish();
+                lint.messages
+                    .iter()
+                    .map(|msg| {
+                        Message::diagnostic(
+                            msg.body.clone(),
+                            msg.suggestion.clone(),
+                            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(messages, notebook_indexes)
+        })
    }
 }

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

@@ -369,6 +409,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_messages(
+        messages: &[Message],
+        notebook_index: Option<NotebookIndex>,
+    ) -> Self {
+        let source = if let Some(msg) = messages.first() {
+            msg.source_file().source_text().to_owned()
+        } else {
+            String::new() // No messages, no need to keep the source!
+        };
+
+        let messages = messages
+            .iter()
+            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
+            // this also serves to filter them out, but we shouldn't be caching files with syntax
+            // 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.source_file(),
+                    messages.first().unwrap().source_file(),
+                    "message uses a different source file"
+                );
+                CacheMessage {
+                    rule,
+                    body: msg.body().to_string(),
+                    suggestion: msg.suggestion().map(ToString::to_string),
+                    range: msg.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 +578,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;
@@ -486,17 +608,18 @@ mod tests {
    use anyhow::Result;
    use filetime::{FileTime, set_file_mtime};
    use itertools::Itertools;
+    use ruff_linter::settings::LinterSettings;
    use test_case::test_case;

    use ruff_cache::CACHE_DIR_NAME;
+    use ruff_linter::message::Message;
    use ruff_linter::package::PackageRoot;
-    use ruff_linter::settings::LinterSettings;
    use ruff_linter::settings::flags;
    use ruff_linter::settings::types::UnsafeFixes;
    use ruff_python_ast::{PySourceType, PythonVersion};
    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 +646,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 +670,7 @@ mod tests {
                    continue;
                }

-                let mut diagnostics = lint_path(
+                let diagnostics = lint_path(
                    &path,
                    Some(PackageRoot::root(&package_root)),
                    &settings.linter,
@@ -557,15 +680,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.messages.iter().any(Message::is_syntax_error) {
+                    parse_errors.push(path.clone());
                }
                paths.push(path);
                expected_diagnostics += diagnostics;
@@ -578,11 +694,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 +732,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 +756,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 +781,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 +811,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 +868,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 +921,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 +944,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 +978,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 +1028,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
@@ -6,20 +6,19 @@ use std::time::Instant;
 use anyhow::Result;
 use colored::Colorize;
 use ignore::Error;
-use log::{debug, warn};
+use log::{debug, error, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use rustc_hash::FxHashMap;

-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, Span, SubDiagnostic, SubDiagnosticSeverity,
-};
 use ruff_db::panic::catch_unwind;
+use ruff_linter::OldDiagnostic;
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
-use ruff_linter::{IOError, Violation, fs, warn_user_once};
+use ruff_linter::{IOError, fs, warn_user_once};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::resolver::{
@@ -131,7 +130,10 @@ pub(crate) fn check(
                        SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();

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

-    all_diagnostics
-        .inner
-        .sort_by(Diagnostic::ruff_start_ordering);
+    all_diagnostics.messages.sort();

    // Store the caches.
    caches.persist()?;
@@ -195,24 +195,21 @@ fn lint_path(
    match result {
        Ok(inner) => inner,
        Err(error) => {
-            let message = match error.payload.as_str() {
-                Some(summary) => format!("Fatal error while linting: {summary}"),
-                _ => "Fatal error while linting".to_owned(),
-            };
-            let mut diagnostic = Diagnostic::new(
-                DiagnosticId::Panic,
-                ruff_db::diagnostic::Severity::Fatal,
-                message,
+            let message = r"This indicates a bug in Ruff. If you could open an issue at:
+
+    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
+
+...with the relevant file contents, the `pyproject.toml` settings, and the following stack trace, we'd be very appreciative!
+";
+
+            error!(
+                "{}{}{} {message}\n{error}",
+                "Panicked while linting ".bold(),
+                fs::relativize_path(path).bold(),
+                ":".bold()
            );
-            let span = Span::from(SourceFileBuilder::new(path.to_string_lossy(), "").finish());
-            let mut annotation = Annotation::primary(span);
-            annotation.set_file_level(true);
-            diagnostic.annotate(annotation);
-            diagnostic.sub(SubDiagnostic::new(
-                SubDiagnosticSeverity::Info,
-                format!("{error}"),
-            ));
-            Ok(Diagnostics::new(vec![diagnostic], FxHashMap::default()))
+
+            Ok(Diagnostics::default())
        }
    }
 }
@@ -284,10 +281,9 @@ mod test {

        TextEmitter::default()
            .with_show_fix_status(true)
-            .with_color(false)
            .emit(
                &mut output,
-                &diagnostics.inner,
+                &diagnostics.messages,
                &EmitterContext::new(&FxHashMap::default()),
            )
            .unwrap();
--- a/crates/ruff/src/commands/check_stdin.rs
+++ b/crates/ruff/src/commands/check_stdin.rs
@@ -1,7 +1,6 @@
 use std::path::Path;

 use anyhow::Result;
-use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::packaging;
 use ruff_linter::settings::flags;
@@ -53,8 +52,6 @@ pub(crate) fn check_stdin(
        noqa,
        fix_mode,
    )?;
-    diagnostics
-        .inner
-        .sort_unstable_by(Diagnostic::ruff_start_ordering);
+    diagnostics.messages.sort_unstable();
    Ok(diagnostics)
 }
--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -10,45 +10,40 @@ use std::path::Path;
 use anyhow::{Context, Result};
 use colored::Colorize;
 use log::{debug, warn};
-use ruff_db::diagnostic::Diagnostic;
+use rustc_hash::FxHashMap;
+
+use ruff_linter::OldDiagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
-use ruff_linter::message::create_syntax_error_diagnostic;
+use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 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_linter::{IOError, fs};
+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>,
+    pub(crate) messages: Vec<Message>,
    pub(crate) fixed: FixMap,
    pub(crate) notebook_indexes: FxHashMap<String, NotebookIndex>,
 }

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

 impl AddAssign for Diagnostics {
    fn add_assign(&mut self, other: Self) {
-        self.inner.extend(other.inner);
+        self.messages.extend(other.messages);
        self.fixed += other.fixed;
        self.notebook_indexes.extend(other.notebook_indexes);
    }
@@ -199,9 +194,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.messages.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
@@ -217,7 +222,7 @@ pub(crate) fn lint_path(
        Some(source_type) => source_type,
        None => match SourceType::from(path) {
            SourceType::Toml(TomlSourceType::Pyproject) => {
-                let diagnostics = if settings
+                let messages = if settings
                    .rules
                    .iter_enabled()
                    .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
@@ -235,7 +240,7 @@ pub(crate) fn lint_path(
                    vec![]
                };
                return Ok(Diagnostics {
-                    inner: diagnostics,
+                    messages,
                    ..Diagnostics::default()
                });
            }
@@ -318,21 +323,31 @@ pub(crate) fn lint_path(
            (result, transformed, fixed)
        };

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

    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 => {
+                    messages.is_empty() && fixed.is_empty()
+                }
+            } {
+                cache.update_lint(
+                    relative_path.to_owned(),
+                    &key,
+                    LintCacheData::from_messages(
+                        &messages,
+                        transformed.as_ipy_notebook().map(Notebook::index).cloned(),
+                    ),
+                );
+            }
+        }
    }

    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {
@@ -342,7 +357,7 @@ pub(crate) fn lint_path(
    };

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

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

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

    Ok(Diagnostics {
-        inner: diagnostics,
+        messages,
        fixed: FixMap::from_iter([(
            fs::relativize_path(path.unwrap_or_else(|| Path::new("-"))),
            fixed,
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -9,11 +9,10 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use clap::CommandFactory;
 use colored::Colorize;
-use log::{error, warn};
+use log::warn;
 use notify::{RecursiveMode, Watcher, recommended_watcher};

 use args::{GlobalConfigArgs, ServerCommand};
-use ruff_db::diagnostic::{Diagnostic, Severity};
 use ruff_linter::logging::{LogLevel, set_up_logging};
 use ruff_linter::settings::flags::FixMode;
 use ruff_linter::settings::types::OutputFormat;
@@ -132,7 +131,6 @@ pub fn run(
    }: Args,
 ) -> Result<ExitStatus> {
    {
-        ruff_db::set_program_version(crate::version::version().to_string()).unwrap();
        let default_panic_hook = std::panic::take_hook();
        std::panic::set_hook(Box::new(move |info| {
            #[expect(clippy::print_stderr)]
@@ -365,7 +363,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
        Printer::clear_screen()?;
        printer.write_to_user("Starting linter in watch mode...\n");

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

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

-                    let diagnostics = commands::check::check(
+                    let messages = commands::check::check(
                        &files,
                        &pyproject_config,
                        &config_arguments,
@@ -403,7 +401,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                        fix_mode,
                        unsafe_fixes,
                    )?;
-                    printer.write_continuously(&mut writer, &diagnostics, preview)?;
+                    printer.write_continuously(&mut writer, &messages, preview)?;
                }
                Err(err) => return Err(err.into()),
            }
@@ -441,31 +439,10 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
        if cli.statistics {
            printer.write_statistics(&diagnostics, &mut summary_writer)?;
        } else {
-            printer.write_once(&diagnostics, &mut summary_writer, preview)?;
+            printer.write_once(&diagnostics, &mut summary_writer)?;
        }

        if !cli.exit_zero {
-            let max_severity = diagnostics
-                .inner
-                .iter()
-                .map(Diagnostic::severity)
-                .max()
-                .unwrap_or(Severity::Info);
-            if max_severity.is_fatal() {
-                // When a panic/fatal error is reported, prompt the user to open an issue on github.
-                // Diagnostics with severity `fatal` will be sorted to the bottom, and printing the
-                // message here instead of attaching it to the diagnostic ensures that we only print
-                // it once instead of repeating it for each diagnostic. Prints to stderr to prevent
-                // the message from being captured by tools parsing the normal output.
-                let message = "Panic during linting indicates a bug in Ruff. If you could open an issue at:
-
-https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
-";
-                error!("{message}");
-                return Ok(ExitStatus::Error);
-            }
            if cli.diff {
                // If we're printing a diff, we always want to exit non-zero if there are
                // any fixable violations (since we've printed the diff, but not applied the
@@ -486,11 +463,11 @@ https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
                // there are any violations, unless we're explicitly asked to exit zero on
                // fix.
                if cli.exit_non_zero_on_fix {
-                    if !diagnostics.fixed.is_empty() || !diagnostics.inner.is_empty() {
+                    if !diagnostics.fixed.is_empty() || !diagnostics.messages.is_empty() {
                        return Ok(ExitStatus::Failure);
                    }
                } else {
-                    if !diagnostics.inner.is_empty() {
+                    if !diagnostics.messages.is_empty() {
                        return Ok(ExitStatus::Failure);
                    }
                }
--- a/crates/ruff/src/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
@@ -6,16 +6,17 @@ use anyhow::Result;
 use bitflags::bitflags;
 use colored::Colorize;
 use itertools::{Itertools, iterate};
+use ruff_linter::codes::NoqaCode;
 use ruff_linter::linter::FixTable;
 use serde::Serialize;

-use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-    DisplayGithubDiagnostics, GithubRenderer, SecondaryCode,
-};
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{Emitter, EmitterContext, GroupedEmitter, SarifEmitter, TextEmitter};
+use ruff_linter::message::{
+    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
+    JsonEmitter, JsonLinesEmitter, JunitEmitter, Message, PylintEmitter, RdjsonEmitter,
+    SarifEmitter, TextEmitter,
+};
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
 use ruff_linter::settings::types::{OutputFormat, UnsafeFixes};
@@ -29,12 +30,14 @@ bitflags! {
        const SHOW_VIOLATIONS = 1 << 0;
        /// Whether to show a summary of the fixed violations when emitting diagnostics.
        const SHOW_FIX_SUMMARY = 1 << 1;
+        /// Whether to show a diff of each fixed violation when emitting diagnostics.
+        const SHOW_FIX_DIFF = 1 << 2;
    }
 }

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

            if self.flags.intersects(Flags::SHOW_VIOLATIONS) {
-                let remaining = diagnostics.inner.len();
+                let remaining = diagnostics.messages.len();
                let total = fixed + remaining;
                if fixed > 0 {
                    let s = if total == 1 { "" } else { "s" };
@@ -199,7 +202,6 @@ impl Printer {
        &self,
        diagnostics: &Diagnostics,
        writer: &mut dyn Write,
-        preview: bool,
    ) -> Result<()> {
        if matches!(self.log_level, LogLevel::Silent) {
            return Ok(());
@@ -225,37 +227,26 @@ impl Printer {
        let context = EmitterContext::new(&diagnostics.notebook_indexes);
        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);

-        let config = DisplayDiagnosticConfig::default().preview(preview);
-
        match self.format {
            OutputFormat::Json => {
-                let config = config.format(DiagnosticFormat::Json);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                JsonEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Rdjson => {
-                let config = config.format(DiagnosticFormat::Rdjson);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                RdjsonEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::JsonLines => {
-                let config = config.format(DiagnosticFormat::JsonLines);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                JsonLinesEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Junit => {
-                let config = config.format(DiagnosticFormat::Junit);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                JunitEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Concise | OutputFormat::Full => {
                TextEmitter::default()
                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_show_fix_diff(self.format == OutputFormat::Full && preview)
+                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                    .with_show_source(self.format == OutputFormat::Full)
-                    .with_fix_applicability(self.unsafe_fixes.required_applicability())
-                    .with_preview(preview)
-                    .emit(writer, &diagnostics.inner, &context)?;
+                    .with_unsafe_fixes(self.unsafe_fixes)
+                    .emit(writer, &diagnostics.messages, &context)?;

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

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                    if !diagnostics.fixed.is_empty() {
@@ -283,27 +274,19 @@ impl Printer {
                self.write_summary_text(writer, diagnostics)?;
            }
            OutputFormat::Github => {
-                let renderer = GithubRenderer::new(&context, "Ruff");
-                let value = DisplayGithubDiagnostics::new(&renderer, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GithubEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Gitlab => {
-                let config = config.format(DiagnosticFormat::Gitlab);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GitlabEmitter::default().emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Pylint => {
-                let config = config.format(DiagnosticFormat::Pylint);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                PylintEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Azure => {
-                let config = config.format(DiagnosticFormat::Azure);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                AzureEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
            OutputFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
+                SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
        }

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

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

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

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

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

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

@@ -57,40 +56,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,96 +196,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 -----
-        "#);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn string_detection_from_config() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    let root = ChildPath::new(tempdir.path());
-
-    // Configure string import detection with a lower min-dots via ruff.toml
-    root.child("ruff.toml").write_str(indoc::indoc! {r#"
-        [analyze]
-        detect-string-imports = true
-        string-imports-min-dots = 1
-    "#})?;
-
-    root.child("ruff").child("__init__.py").write_str("")?;
-    root.child("ruff")
-        .child("a.py")
-        .write_str(indoc::indoc! {r#"
-        import ruff.b
-    "#})?;
-    root.child("ruff")
-        .child("b.py")
-        .write_str(indoc::indoc! {r#"
-        import importlib
-
-        importlib.import_module("ruff.c")
-    "#})?;
-    root.child("ruff").child("c.py").write_str("")?;
-
-    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": []
-        }
-
-        ----- stderr -----
-        "#);
+            ----- stderr -----
+            "###);
    });

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

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

--- a/crates/ruff/tests/format.rs
+++ b/crates/ruff/tests/format.rs
@@ -120,7 +120,7 @@ fn nonexistent_config_file() {
 #[test]
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo = bar", "."]), @r"
+        .args(["format", "--config", "foo = bar", "."]), @r#"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -137,11 +137,12 @@ fn config_override_rejected_if_invalid_toml() {
    TOML parse error at line 1, column 7
      |
    1 | foo = bar
-      |       ^^^
-    string values must be quoted, expected literal string
+      |       ^
+    invalid string
+    expected `"`, `'`

    For more information, try '--help'.
-    ");
+    "#);
 }

 #[test]
@@ -500,35 +501,6 @@ OTHER = "OTHER"
    Ok(())
 }

-/// Regression test for <https://github.com/astral-sh/ruff/issues/20035>
-#[test]
-fn deduplicate_directory_and_explicit_file() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let root = tempdir.path();
-
-    let main = root.join("main.py");
-    fs::write(&main, "x   = 1\n")?;
-
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .current_dir(root)
-            .args(["format", "--no-cache", "--check"])
-            .arg(".")
-            .arg("main.py"),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    Would reformat: main.py
-    1 file would be reformatted
-
-    ----- stderr -----
-    "
-    );
-
-    Ok(())
-}
-
 #[test]
 fn syntax_error() -> Result<()> {
    let tempdir = TempDir::new()?;
--- 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.
@@ -1085,7 +1067,7 @@ fn show_statistics_syntax_errors() {
    success: false
    exit_code: 1
    ----- stdout -----
-    1		invalid-syntax
+    1		syntax-error
    Found 1 error.

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

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

    ----- stderr -----
@@ -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 -----
@@ -1489,8 +1465,6 @@ fn deprecated_direct() {

 #[test]
 fn deprecated_multiple_direct() {
-    // Multiple deprecated rules selected by exact code should be included
-    // but a warning should be displayed
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921"])
        .build();
@@ -1498,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 -----
@@ -1518,10 +1488,12 @@ fn deprecated_indirect() {
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
    assert_cmd_snapshot!(cmd, @r"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
    ----- stdout -----
-    All checks passed!
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
+    Found 2 errors.

    ----- stderr -----
    ");
@@ -1666,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(())
@@ -1698,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).

@@ -1720,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).

@@ -1740,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.

@@ -1764,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 -----
@@ -1783,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.

@@ -1809,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).
    ");
@@ -1848,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.
    ");
 }
@@ -1868,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.
    ");
 }
@@ -1887,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).
    ");
@@ -2025,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).

@@ -2061,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.

@@ -2099,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).

@@ -2139,22 +2074,14 @@ 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
-
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
-    Found 5 errors.
+    -: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).

    ----- stderr -----
@@ -2214,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
      |

@@ -2251,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).
@@ -2292,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.

@@ -2322,11 +2246,11 @@ 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: invalid table header
+    expected `.`, `]`
      |
    1 | [project
-      |         ^
+      |         ^ RUF200
      |

    Found 1 error.
@@ -2348,12 +2272,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.
@@ -2441,12 +2364,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
@@ -271,50 +271,6 @@ OTHER = "OTHER"
    Ok(())
 }

-/// Regression test for <https://github.com/astral-sh/ruff/issues/20035>
-#[test]
-fn deduplicate_directory_and_explicit_file() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let root = tempdir.path();
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-exclude = ["main.py"]
-"#,
-    )?;
-
-    let main = root.join("main.py");
-    fs::write(&main, "import os\n")?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME))
-                .current_dir(root)
-                .args(STDIN_BASE_OPTIONS)
-                .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
-                .arg(".")
-                // Explicitly pass main.py, should be linted regardless of it being excluded by lint.exclude
-                .arg("main.py"),
-            @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "
-        );
-    });
-
-    Ok(())
-}
-
 #[test]
 fn exclude_stdin() -> Result<()> {
    let tempdir = TempDir::new()?;
@@ -578,7 +534,7 @@ fn nonexistent_config_file() {
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @r"
+        .args(["--config", "foo = bar", "."]), @r#"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -595,11 +551,12 @@ fn config_override_rejected_if_invalid_toml() {
    TOML parse error at line 1, column 7
      |
    1 | foo = bar
-      |       ^^^
-    string values must be quoted, expected literal string
+      |       ^
+    invalid string
+    expected `"`, `'`

    For more information, try '--help'.
-    ");
+    "#);
 }

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

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

    fs::write(
        project_path.join("ruff.toml"),
@@ -776,8 +733,9 @@ select = [E501]
      Cause: TOML parse error at line 3, column 11
      |
    3 | select = [E501]
-      |           ^^^^
-    string values must be quoted, expected literal string
+      |           ^
+    invalid array
+    expected `]`
    ");
    });

@@ -918,7 +876,7 @@ fn each_toml_option_requires_a_new_flag_1() {
      |
    1 | extend-select=['F841'], line-length=90
      |                       ^
-    unexpected key or value, expected newline, `#`
+    expected newline, `#`

    For more information, try '--help'.
    ");
@@ -949,7 +907,7 @@ fn each_toml_option_requires_a_new_flag_2() {
      |
    1 | extend-select=['F841'] line-length=90
      |                        ^
-    unexpected key or value, expected newline, `#`
+    expected newline, `#`

    For more information, try '--help'.
    ");
@@ -1037,7 +995,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'.
    ");
@@ -2173,7 +2130,7 @@ select = ["UP006"]
 #[test]
 fn requires_python_no_tool() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2466,7 +2423,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 = {}

@@ -2484,7 +2441,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_target_version_override() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2778,7 +2735,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 = {}

@@ -2795,7 +2752,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_with_check() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("pyproject.toml");
    fs::write(
        &ruff_toml,
@@ -2840,7 +2797,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3142,7 +3099,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 = {}

@@ -3161,7 +3118,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3216,7 +3173,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let outer_pyproject = tempdir.path().join("pyproject.toml");
    fs::write(
        &outer_pyproject,
@@ -3243,7 +3200,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

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

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"(?m)^foo\\test","foo/test")]
@@ -3522,7 +3479,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 = {}

@@ -3542,7 +3499,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let outer_pyproject = tempdir.path().join("pyproject.toml");
    fs::write(
        &outer_pyproject,
@@ -3571,7 +3528,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

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

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"foo\\","foo/")]
@@ -3850,7 +3807,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 = {}

@@ -3870,7 +3827,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_above() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -3899,7 +3856,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

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

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
@@ -4178,7 +4135,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 = {}

@@ -4463,7 +4420,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 = {}

@@ -4484,7 +4441,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_extend_from_shared_config() -> Result<()> {
    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
    let ruff_toml = tempdir.path().join("ruff.toml");
    fs::write(
        &ruff_toml,
@@ -4522,7 +4479,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
    )?;

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

    insta::with_settings!({
        filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
@@ -4801,7 +4758,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 = {}

@@ -5040,37 +4997,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!(
@@ -5103,59 +5029,6 @@ fn flake8_import_convention_unused_aliased_import_no_conflict() {
    );
 }

-// https://github.com/astral-sh/ruff/issues/19842
-#[test]
-fn pyupgrade_up026_respects_isort_required_import_fix() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .arg("--isolated")
-            .arg("check")
-            .arg("-")
-            .args(["--select", "I002,UP026"])
-            .arg("--config")
-            .arg(r#"lint.isort.required-imports=["import mock"]"#)
-            .arg("--fix")
-            .arg("--no-cache")
-            .pass_stdin("1\n"),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    import mock
-    1
-
-    ----- stderr -----
-    Found 1 error (1 fixed, 0 remaining).
-    "
-    );
-}
-
-// https://github.com/astral-sh/ruff/issues/19842
-#[test]
-fn pyupgrade_up026_respects_isort_required_import_from_fix() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .arg("--isolated")
-            .arg("check")
-            .arg("-")
-            .args(["--select", "I002,UP026"])
-            .arg("--config")
-            .arg(r#"lint.isort.required-imports = ["from mock import mock"]"#)
-            .arg("--fix")
-            .arg("--no-cache")
-            .pass_stdin("from mock import mock\n"),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    from mock import mock
-
-    ----- stderr -----
-    All checks passed!
-    "
-    );
-}
-
 // See: https://github.com/astral-sh/ruff/issues/16177
 #[test]
 fn flake8_pyi_redundant_none_literal() {
@@ -5517,7 +5390,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 -----
@@ -5563,15 +5436,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
@@ -5592,7 +5465,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 -----
@@ -5620,7 +5493,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 -----
    "
@@ -5633,7 +5506,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 -----
    "
@@ -5685,15 +5558,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(())
@@ -5746,7 +5619,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 -----
@@ -5760,7 +5633,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 -----
@@ -5779,7 +5652,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 -----
@@ -5819,229 +5692,3 @@ class Foo:
    "
    );
 }
-
-#[test_case::test_case("concise")]
-#[test_case::test_case("full")]
-#[test_case::test_case("json")]
-#[test_case::test_case("json-lines")]
-#[test_case::test_case("junit")]
-#[test_case::test_case("grouped")]
-#[test_case::test_case("github")]
-#[test_case::test_case("gitlab")]
-#[test_case::test_case("pylint")]
-#[test_case::test_case("rdjson")]
-#[test_case::test_case("azure")]
-#[test_case::test_case("sarif")]
-fn output_format(output_format: &str) -> Result<()> {
-    const CONTENT: &str = "\
-import os  # F401
-x = y      # F821
-match 42:  # invalid-syntax
-    case _: ...
-";
-
-    let tempdir = TempDir::new()?;
-    let input = tempdir.path().join("input.py");
-    fs::write(&input, CONTENT)?;
-
-    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]"),
-        ]
-    }, {
-        assert_cmd_snapshot!(
-            snapshot,
-            Command::new(get_cargo_bin(BIN_NAME))
-                .args([
-                    "check",
-                    "--no-cache",
-                    "--output-format",
-                    output_format,
-                    "--select",
-                    "F401,F821",
-                    "--target-version",
-                    "py39",
-                    "input.py",
-                ])
-                .current_dir(&tempdir),
-        );
-    });
-
-    Ok(())
-}
-
-#[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.
-    ",
-    );
-}
-
-#[test]
-fn show_fixes_in_full_output_with_preview_enabled() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--no-cache", "--output-format", "full"])
-            .args(["--select", "F401"])
-            .arg("--preview")
-            .arg("-")
-            .pass_stdin("import math"),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    F401 [*] `math` imported but unused
-     --> -:1:8
-      |
-    1 | import math
-      |        ^^^^
-      |
-    help: Remove unused import: `math`
-      - import math
-
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ",
-    );
-}
-
-#[test]
-fn rule_panic_mixed_results_concise() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    // Create python files
-    let file_a_path = tempdir.path().join("normal.py");
-    let file_b_path = tempdir.path().join("panic.py");
-    fs::write(&file_a_path, b"import os")?;
-    fs::write(&file_b_path, b"print('hello, world!')")?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r"\\", r"/"),
-        ]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--select", "RUF9", "--preview", "--output-format=concise", "--no-cache"])
-            .args([file_a_path, file_b_path]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-    [TMP]/normal.py:1:1: RUF900 Hey this is a stable test rule.
-    [TMP]/normal.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
-    [TMP]/normal.py:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
-    [TMP]/normal.py:1:1: RUF903 Hey this is a stable test rule with a display only fix.
-    [TMP]/normal.py:1:1: RUF911 Hey this is a preview test rule.
-    [TMP]/normal.py:1:1: RUF950 Hey this is a test rule that was redirected from another.
-    [TMP]/panic.py: panic: Fatal error while linting: This is a fake panic for testing.
-    Found 7 errors.
-    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
-    ");
-    });
-    Ok(())
-}
-
-#[test]
-fn rule_panic_mixed_results_full() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    // Create python files
-    let file_a_path = tempdir.path().join("normal.py");
-    let file_b_path = tempdir.path().join("panic.py");
-    fs::write(&file_a_path, b"import os")?;
-    fs::write(&file_b_path, b"print('hello, world!')")?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r"\\", r"/"),
-        ]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--select", "RUF9", "--preview", "--output-format=full", "--no-cache"])
-            .args([file_a_path, file_b_path]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-    RUF900 Hey this is a stable test rule.
-    --> [TMP]/normal.py:1:1
-
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> [TMP]/normal.py:1:1
-    1 + # fix from stable-test-rule-safe-fix
-    2 | import os
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> [TMP]/normal.py:1:1
-
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> [TMP]/normal.py:1:1
-
-    RUF911 Hey this is a preview test rule.
-    --> [TMP]/normal.py:1:1
-
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> [TMP]/normal.py:1:1
-
-    panic: Fatal error while linting: This is a fake panic for testing.
-    --> [TMP]/panic.py:1:1
-    info: panicked at crates/ruff_linter/src/rules/ruff/rules/test_rules.rs:511:9:
-    This is a fake panic for testing.
-    run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-
-
-    Found 7 errors.
-    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
-    ");
-    });
-    Ok(())
-}
--- a/crates/ruff/tests/show_settings.rs
+++ b/crates/ruff/tests/show_settings.rs
@@ -12,8 +12,10 @@ fn display_default_settings() -> anyhow::Result<()> {

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

    std::fs::write(
        project_dir.join("pyproject.toml"),
--- a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
@@ -55,10 +55,6 @@ either a redundant alias or, if already present in the file, an `__all__` entry.
 to remove third-party and standard library imports -- the fix is unsafe because the module's
 interface changes.

-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 on how Ruff
-determines whether an import is first or third-party.
-
 ## Example

 ```python
@@ -87,6 +83,11 @@ else:
    print("numpy is not installed")
 ```

+## Preview
+When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
+the criterion for determining whether an import is first-party
+is 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.
+
 ## Options
 - `lint.ignore-init-module-imports`
 - `lint.pyflakes.allowed-unused-imports`
@@ -94,6 +95,6 @@ else:
 ## 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
@@ -1,23 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - azure
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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)
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_concise.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_concise.snap
@@ -1,25 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - concise
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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)
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_full.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_full.snap
@@ -1,52 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - full
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-F401 [*] `os` imported but unused
- --> input.py:1:8
-  |
-1 | import os  # F401
-  |        ^^
-2 | x = y      # F821
-3 | match 42:  # invalid-syntax
-  |
-help: Remove unused import: `os`
-
-F821 Undefined name `y`
- --> input.py:2:5
-  |
-1 | import os  # F401
-2 | x = y      # 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
-  |
-1 | import os  # F401
-2 | x = y      # F821
-3 | match 42:  # invalid-syntax
-  | ^^^^^
-4 |     case _: ...
-  |
-
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_github.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_github.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - github
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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)
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
@@ -1,78 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - gitlab
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-[
-  {
-    "check_name": "F401",
-    "description": "F401: `os` imported but unused",
-    "severity": "major",
-    "fingerprint": "4dbad37161e65c72",
-    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "line": 1,
-          "column": 8
-        },
-        "end": {
-          "line": 1,
-          "column": 10
-        }
-      }
-    }
-  },
-  {
-    "check_name": "F821",
-    "description": "F821: Undefined name `y`",
-    "severity": "major",
-    "fingerprint": "7af59862a085230",
-    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "line": 2,
-          "column": 5
-        },
-        "end": {
-          "line": 2,
-          "column": 6
-        }
-      }
-    }
-  },
-  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "severity": "major",
-    "fingerprint": "e558cec859bb66e8",
-    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "line": 3,
-          "column": 1
-        },
-        "end": {
-          "line": 3,
-          "column": 6
-        }
-      }
-    }
-  }
-]
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_grouped.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_grouped.snap
@@ -1,27 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - grouped
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-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)
-
-Found 3 errors.
-[*] 1 fixable with the `--fix` option.
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_json-lines.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_json-lines.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - json-lines
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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}
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_json.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_json.snap
@@ -1,88 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - json
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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
-  }
-]
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_junit.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_junit.snap
@@ -1,34 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - junit
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="[TMP]/input.py" tests="3" disabled="0" errors="0" failures="3" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="[TMP]/input" line="1" column="8">
-            <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
-        </testcase>
-        <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>
-    </testsuite>
-</testsuites>
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_pylint.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_pylint.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - pylint
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-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)
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_rdjson.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_rdjson.snap
@@ -1,102 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - rdjson
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-{
-  "diagnostics": [
-    {
-      "code": {
-        "url": "https://docs.astral.sh/ruff/rules/unused-import",
-        "value": "F401"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 10,
-            "line": 1
-          },
-          "start": {
-            "column": 8,
-            "line": 1
-          }
-        }
-      },
-      "message": "`os` imported but unused",
-      "suggestions": [
-        {
-          "range": {
-            "end": {
-              "column": 1,
-              "line": 2
-            },
-            "start": {
-              "column": 1,
-              "line": 1
-            }
-          },
-          "text": ""
-        }
-      ]
-    },
-    {
-      "code": {
-        "url": "https://docs.astral.sh/ruff/rules/undefined-name",
-        "value": "F821"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 6,
-            "line": 2
-          },
-          "start": {
-            "column": 5,
-            "line": 2
-          }
-        }
-      },
-      "message": "Undefined name `y`"
-    },
-    {
-      "code": {
-        "value": "invalid-syntax"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 6,
-            "line": 3
-          },
-          "start": {
-            "column": 1,
-            "line": 3
-          }
-        }
-      },
-      "message": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
-    }
-  ],
-  "severity": "WARNING",
-  "source": {
-    "name": "ruff",
-    "url": "https://docs.astral.sh/ruff"
-  }
-}
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
@@ -1,166 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - sarif
-    - "--select"
-    - "F401,F821"
-    - "--target-version"
-    - py39
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-{
-  "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
-  "runs": [
-    {
-      "results": [
-        {
-          "fixes": [
-            {
-              "artifactChanges": [
-                {
-                  "artifactLocation": {
-                    "uri": "[TMP]/input.py"
-                  },
-                  "replacements": [
-                    {
-                      "deletedRegion": {
-                        "endColumn": 1,
-                        "endLine": 2,
-                        "startColumn": 1,
-                        "startLine": 1
-                      }
-                    }
-                  ]
-                }
-              ],
-              "description": {
-                "text": "Remove unused import: `os`"
-              }
-            }
-          ],
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 10,
-                  "endLine": 1,
-                  "startColumn": 8,
-                  "startLine": 1
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "`os` imported but unused"
-          },
-          "ruleId": "F401"
-        },
-        {
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 6,
-                  "endLine": 2,
-                  "startColumn": 5,
-                  "startLine": 2
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "Undefined name `y`"
-          },
-          "ruleId": "F821"
-        },
-        {
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 6,
-                  "endLine": 3,
-                  "startColumn": 1,
-                  "startLine": 3
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
-          },
-          "ruleId": "invalid-syntax"
-        }
-      ],
-      "tool": {
-        "driver": {
-          "informationUri": "https://github.com/astral-sh/ruff",
-          "name": "ruff",
-          "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\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\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## 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"
-              },
-              "help": {
-                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
-              },
-              "helpUri": "https://docs.astral.sh/ruff/rules/unused-import",
-              "id": "F401",
-              "properties": {
-                "id": "F401",
-                "kind": "Pyflakes",
-                "name": "unused-import",
-                "problem.severity": "error"
-              },
-              "shortDescription": {
-                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
-              }
-            },
-            {
-              "fullDescription": {
-                "text": "## What it does\nChecks for uses of undefined names.\n\n## Why is this bad?\nAn undefined name is likely to raise `NameError` at runtime.\n\n## Example\n```python\ndef double():\n    return n * 2  # raises `NameError` if `n` is undefined when `double` is called\n```\n\nUse instead:\n```python\ndef double(n):\n    return n * 2\n```\n\n## Options\n- [`target-version`]: Can be used to configure which symbols Ruff will understand\n  as being available in the `builtins` namespace.\n\n## References\n- [Python documentation: Naming and binding](https://docs.python.org/3/reference/executionmodel.html#naming-and-binding)\n"
-              },
-              "help": {
-                "text": "Undefined name `{name}`. {tip}"
-              },
-              "helpUri": "https://docs.astral.sh/ruff/rules/undefined-name",
-              "id": "F821",
-              "properties": {
-                "id": "F821",
-                "kind": "Pyflakes",
-                "name": "undefined-name",
-                "problem.severity": "error"
-              },
-              "shortDescription": {
-                "text": "Undefined name `{name}`. {tip}"
-              }
-            }
-          ],
-          "version": "[VERSION]"
-        }
-      }
-    }
-  ],
-  "version": "2.1.0"
-}
----- stderr -----
--- 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/tests/version.rs
+++ b/crates/ruff/tests/version.rs
@@ -60,7 +60,7 @@ fn config_option_ignored_but_validated() {
        assert_cmd_snapshot!(
            Command::new(get_cargo_bin(BIN_NAME))
                .arg("version")
-                .args(["--config", "foo = bar"]), @r"
+                .args(["--config", "foo = bar"]), @r#"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -77,11 +77,12 @@ fn config_option_ignored_but_validated() {
        TOML parse error at line 1, column 7
          |
        1 | foo = bar
-          |       ^^^
-        string values must be quoted, expected literal string
+          |       ^
+        invalid string
+        expected `"`, `'`

        For more information, try '--help'.
-        "
+        "#
        );
    });
 }
--- 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(())
            }
@@ -409,7 +352,7 @@ impl DisplaySet<'_> {
                        // FIXME: `unicode_width` sometimes disagrees with terminals on how wide a `char`
                        // is. For now, just accept that sometimes the code line will be longer than
                        // desired.
-                        let next = char_width(ch).unwrap_or(1);
+                        let next = unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1);
                        if taken + next > right - left {
                            was_cut_right = true;
                            break;
@@ -434,7 +377,7 @@ impl DisplaySet<'_> {
                    let left: usize = text
                        .chars()
                        .take(left)
-                        .map(|ch| char_width(ch).unwrap_or(1))
+                        .map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
                        .sum();

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

    fn takes_space(&self) -> bool {
@@ -891,13 +837,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 +845,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 +924,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 +1019,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 +1064,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 +1088,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 +1122,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 +1130,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 +1150,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 +1173,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,
        }));
    }
@@ -1509,7 +1393,6 @@ fn format_body<'m>(
        let line_length: usize = line.len();
        let line_range = (current_index, current_index + line_length);
        let end_line_size = end_line.len();
-
        body.push(DisplayLine::Source {
            lineno: Some(current_line),
            inline_marks: vec![],
@@ -1569,12 +1452,12 @@ fn format_body<'m>(
                        let annotation_start_col = line
                            [0..(start - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        let mut annotation_end_col = line
                            [0..(end - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        if annotation_start_col == annotation_end_col {
                            // At least highlight something
@@ -1592,7 +1475,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),
@@ -1617,7 +1499,7 @@ fn format_body<'m>(
                        let annotation_start_col = line
                            [0..(start - line_start_index).min(line_length)]
                            .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                            .sum::<usize>();
                        let annotation_end_col = annotation_start_col + 1;

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

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


 [renderer]
--- a/crates/ruff_benchmark/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
@@ -2,7 +2,6 @@
 use ruff_benchmark::criterion;
 use ruff_benchmark::real_world_projects::{InstalledProject, RealWorldProject};

-use std::fmt::Write;
 use std::ops::Range;

 use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
@@ -18,7 +17,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 +101,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();
@@ -143,7 +141,7 @@ fn benchmark_incremental(criterion: &mut Criterion) {
                &case.file_path,
                format!(
                    "{}\n# A comment\n",
-                    source_text(&case.db, case.file).as_str()
+                    source_text(&case.db, case.file).load(&case.db).as_str()
                ),
            )
            .unwrap();
@@ -238,7 +236,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,212 +348,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();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_1]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression benchmark for https://github.com/astral-sh/ty/issues/627.
-                // Before this was fixed, the following sample would take >1s to type check.
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert!(!result.is_empty());
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is is similar to the case above, but now the attributes are actually defined.
-                // https://github.com/astral-sh/ty/issues/711
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-
-                            self.a = ""
-                            self.b = ""
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_3(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_3]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression test for https://github.com/astral-sh/ty/issues/758
-                setup_micro_case(
-                    r#"
-                    class GridOut:
-                        def __init__(self: "GridOut") -> None:
-                            self._buffer = b""
-
-                        def _read_size_or_line(self: "GridOut", size: int = -1):
-                            if size > self._position:
-                                size = self._position
-                                pass
-                            if size == 0:
-                                return bytes()
-
-                            while size > 0:
-                                if self._buffer:
-                                    buf = self._buffer
-                                    self._buffer = b""
-                                else:
-                                    buf = b""
-
-                                if len(buf) > size:
-                                    self._buffer = buf
-                                    self._position -= len(self._buffer)
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_many_enum_members(criterion: &mut Criterion) {
-    const NUM_ENUM_MEMBERS: usize = 512;
-
-    setup_rayon();
-
-    let mut code = String::new();
-    writeln!(&mut code, "from enum import Enum").ok();
-
-    writeln!(&mut code, "class E(Enum):").ok();
-    for i in 0..NUM_ENUM_MEMBERS {
-        writeln!(&mut code, "    m{i} = {i}").ok();
-    }
-    writeln!(&mut code).ok();
-
-    for i in 0..NUM_ENUM_MEMBERS {
-        writeln!(&mut code, "print(E.m{i})").ok();
-    }
-
-    criterion.bench_function("ty_micro[many_enum_members]", |b| {
-        b.iter_batched_ref(
-            || setup_micro_case(&code),
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 struct ProjectBenchmark<'a> {
    project: InstalledProject<'a>,
    fs: MemoryFileSystem,
@@ -586,7 +377,8 @@ impl<'a> ProjectBenchmark<'a> {
        metadata.apply_options(Options {
            environment: Some(EnvironmentOptions {
                python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                ..EnvironmentOptions::default()
            }),
            ..Options::default()
@@ -609,21 +401,17 @@ 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 > 1 && diagnostics <= max_diagnostics,
+            "Expected between {} and {} diagnostics but got {}",
+            1,
+            max_diagnostics,
+            diagnostics
+        );
    }

    setup_rayon();
@@ -633,7 +421,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,
        );
    });
@@ -690,33 +478,11 @@ fn anyio(criterion: &mut Criterion) {
    bench_project(&benchmark, criterion);
 }

-fn datetype(criterion: &mut Criterion) {
-    let benchmark = ProjectBenchmark::new(
-        RealWorldProject {
-            name: "DateType",
-            repository: "https://github.com/glyph/DateType",
-            commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: vec![SystemPath::new("src")],
-            dependencies: vec![],
-            max_dep_date: "2025-07-04",
-            python_version: PythonVersion::PY313,
-        },
-        2,
-    );
-
-    bench_project(&benchmark, criterion);
-}
-
 criterion_group!(check_file, benchmark_cold, benchmark_incremental);
 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_complex_constrained_attributes_3,
-    benchmark_many_enum_members,
 );
-criterion_group!(project, anyio, attrs, hydra, datetype);
+criterion_group!(project, anyio, attrs, hydra);
 criterion_main!(check_file, micro, project);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -36,7 +36,8 @@ impl<'a> Benchmark<'a> {
        metadata.apply_options(Options {
            environment: Some(EnvironmentOptions {
                python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                ..EnvironmentOptions::default()
            }),
            ..Options::default()
@@ -203,41 +204,8 @@ static SYMPY: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new
    )
 });

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

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

 #[bench(args=[&*SYMPY], sample_size=1, sample_count=2)]
 fn large(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
-}
-
-#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=8)]
-fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
-    let thread_pool = ThreadPoolBuilder::new().build().unwrap();
-
    bencher
        .with_inputs(|| benchmark.setup_iteration())
-        .bench_local_values(|db| {
-            thread_pool.install(|| {
-                check_project(&db, benchmark.max_diagnostics);
-                db
-            })
+        .bench_local_refs(|db| {
+            check_project(db, benchmark.max_diagnostics);
        });
 }

 fn main() {
+    let filter =
+        std::env::var("TY_LOG").unwrap_or("ty_walltime=info,ruff_benchmark=info".to_string());
+
+    let _logging = setup_logging_with_filter(&filter).expect("Filter to be valid");
+
+    // Disable multithreading for now due to
+    // https://github.com/salsa-rs/salsa/issues/918.
+    //
+    // Salsa has a fast-path for the first db when looking up ingredients.
+    // It seems that this fast-path becomes extremely slow for all db's other
+    // than the first one, especially when using multithreading (10x slower than the first run).
    ThreadPoolBuilder::new()
        .num_threads(1)
        .use_current_thread()
        .build_global()
        .unwrap();

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

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

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

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

-    if checkout.project().dependencies.is_empty() {
-        tracing::debug!(
-            "No dependencies to install for project '{}'",
-            checkout.project().name
-        );
-        return Ok(());
-    }
-
    // Install dependencies with date constraint in the isolated environment
    let mut cmd = Command::new("uv");
    cmd.args([
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -13,38 +13,31 @@ license = { workspace = true }
 [dependencies]
 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_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
-ruff_source_file = { workspace = true, features = ["get-size"] }
+ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
-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 }
-get-size2 = { workspace = true }
 glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
-path-slash = { workspace = true }
-pathdiff = { workspace = true }
-quick-junit = { workspace = true, optional = true }
-rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
-serde_json = { workspace = true, optional = true }
-similar = { workspace = true }
+path-slash = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
+rustc-hash = { workspace = true }
 zip = { workspace = true }

 [target.'cfg(target_arch="wasm32")'.dependencies]
@@ -54,18 +47,12 @@ web-time = { version = "1.1.0" }
 etcetera = { workspace = true, optional = true }

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

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

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

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

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

 mod render;
@@ -22,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)]
 pub struct Diagnostic {
    /// The actual diagnostic.
    ///
@@ -65,37 +62,10 @@ impl Diagnostic {
            message: message.into_diagnostic_message(),
            annotations: vec![],
            subs: vec![],
-            fix: None,
-            parent: None,
-            noqa_offset: None,
-            secondary_code: None,
        });
        Diagnostic { inner }
    }

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

-    /// Returns a reference to the primary span of this diagnostic.
-    pub fn primary_span_ref(&self) -> Option<&Span> {
-        self.primary_annotation().map(|ann| &ann.span)
-    }
-
    /// Returns the tags from the primary annotation of this diagnostic if it exists.
    pub fn primary_tags(&self) -> Option<&[DiagnosticTag]> {
        self.primary_annotation().map(|ann| ann.tags.as_slice())
@@ -315,216 +268,15 @@ impl Diagnostic {
    pub fn sub_diagnostics(&self) -> &[SubDiagnostic] {
        &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!(
-            self.primary_span().is_some(),
-            "Expected a source file for a diagnostic with a fix"
-        );
-        Arc::make_mut(&mut self.inner).fix = Some(fix);
-    }
-
-    /// Remove the fix for this diagnostic.
-    pub fn remove_fix(&mut self) {
-        Arc::make_mut(&mut self.inner).fix = None;
-    }
-
-    /// Returns `true` if the diagnostic contains a [`Fix`].
-    pub fn fixable(&self) -> bool {
-        self.fix().is_some()
-    }
-
-    /// Returns `true` if the diagnostic is [`fixable`](Diagnostic::fixable) and applies at the
-    /// configured applicability level.
-    pub fn has_applicable_fix(&self, config: &DisplayDiagnosticConfig) -> bool {
-        self.fix()
-            .is_some_and(|fix| fix.applies(config.fix_applicability))
-    }
-
-    /// Returns the offset of the parent statement for this diagnostic if it exists.
-    ///
-    /// This is primarily used for checking noqa/secondary code suppressions.
-    pub fn parent(&self) -> Option<TextSize> {
-        self.inner.parent
-    }
-
-    /// Set the offset of the diagnostic's parent statement.
-    pub fn set_parent(&mut self, parent: TextSize) {
-        Arc::make_mut(&mut self.inner).parent = Some(parent);
-    }
-
-    /// Returns the remapped offset for a suppression comment if it exists.
-    ///
-    /// Like [`Diagnostic::parent`], this is used for noqa code suppression comments in Ruff.
-    pub fn noqa_offset(&self) -> Option<TextSize> {
-        self.inner.noqa_offset
-    }
-
-    /// Set the remapped offset for a suppression comment.
-    pub fn set_noqa_offset(&mut self, noqa_offset: TextSize) {
-        Arc::make_mut(&mut self.inner).noqa_offset = Some(noqa_offset);
-    }
-
-    /// Returns the secondary code for the diagnostic if it exists.
-    ///
-    /// The "primary" code for the diagnostic is its lint name. Diagnostics in ty don't have
-    /// secondary codes (yet), but in Ruff the noqa code is used.
-    pub fn secondary_code(&self) -> Option<&SecondaryCode> {
-        self.inner.secondary_code.as_ref()
-    }
-
-    /// 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);
-    }
-
-    /// Returns the name used to represent the diagnostic.
-    pub fn name(&self) -> &'static str {
-        self.id().as_str()
-    }
-
-    /// Returns `true` if `self` is a syntax error message.
-    pub fn is_invalid_syntax(&self) -> bool {
-        self.id().is_invalid_syntax()
-    }
-
-    /// Returns the message body to display to the user.
-    pub fn body(&self) -> &str {
-        self.primary_message()
-    }
-
-    /// Returns the 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 URL for the rule documentation, if it exists.
-    pub fn to_ruff_url(&self) -> Option<String> {
-        if self.is_invalid_syntax() {
-            None
-        } else {
-            Some(format!(
-                "{}/rules/{}",
-                env!("CARGO_PKG_HOMEPAGE"),
-                self.name()
-            ))
-        }
-    }
-
-    /// Returns the filename for the message.
-    ///
-    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn expect_ruff_filename(&self) -> String {
-        self.expect_primary_span()
-            .expect_ruff_file()
-            .name()
-            .to_string()
-    }
-
-    /// Computes the start source location for the message.
-    ///
-    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
-    /// or if the span has no range.
-    pub fn ruff_start_location(&self) -> Option<LineColumn> {
-        Some(
-            self.ruff_source_file()?
-                .to_source_code()
-                .line_column(self.range()?.start()),
-        )
-    }
-
-    /// Computes the end source location for the message.
-    ///
-    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
-    /// or if the span has no range.
-    pub fn ruff_end_location(&self) -> Option<LineColumn> {
-        Some(
-            self.ruff_source_file()?
-                .to_source_code()
-                .line_column(self.range()?.end()),
-        )
-    }
-
-    /// Returns the [`SourceFile`] which the message belongs to.
-    pub fn ruff_source_file(&self) -> Option<&SourceFile> {
-        self.primary_span_ref()?.as_ruff_file()
-    }
-
-    /// Returns the [`SourceFile`] which the message belongs to.
-    ///
-    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn expect_ruff_source_file(&self) -> &SourceFile {
-        self.ruff_source_file()
-            .expect("Expected a ruff source file")
-    }
-
-    /// Returns the [`TextRange`] for the diagnostic.
-    pub fn range(&self) -> Option<TextRange> {
-        self.primary_span()?.range()
-    }
-
-    /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
-    ///
-    /// Panics if either diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn ruff_start_ordering(&self, other: &Self) -> std::cmp::Ordering {
-        let a = (
-            self.severity().is_fatal(),
-            self.expect_ruff_source_file(),
-            self.range().map(|r| r.start()),
-        );
-        let b = (
-            other.severity().is_fatal(),
-            other.expect_ruff_source_file(),
-            other.range().map(|r| r.start()),
-        );
-
-        a.cmp(&b)
-    }
 }

-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct DiagnosticInner {
    id: DiagnosticId,
    severity: Severity,
    message: DiagnosticMessage,
    annotations: Vec<Annotation>,
    subs: Vec<SubDiagnostic>,
-    fix: Option<Fix>,
-    parent: Option<TextSize>,
-    noqa_offset: Option<TextSize>,
-    secondary_code: Option<SecondaryCode>,
 }

 struct RenderingSortKey<'a> {
@@ -590,7 +342,7 @@ impl Eq for RenderingSortKey<'_> {}
 /// Currently, the order in which sub-diagnostics are rendered relative to one
 /// another (for a single parent diagnostic) is the order in which they were
 /// attached to the diagnostic.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct SubDiagnostic {
    /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
    /// pointer-sized.
@@ -615,10 +367,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(),
@@ -646,11 +395,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.
    ///
@@ -684,7 +428,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()
@@ -699,9 +443,9 @@ impl SubDiagnostic {
    }
 }

-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct SubDiagnosticInner {
-    severity: SubDiagnosticSeverity,
+    severity: Severity,
    message: DiagnosticMessage,
    annotations: Vec<Annotation>,
 }
@@ -727,7 +471,7 @@ struct SubDiagnosticInner {
 ///
 /// Messages attached to annotations should also be as brief and specific as
 /// possible. Long messages could negative impact the quality of rendering.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Annotation {
    /// The span of this annotation, corresponding to some subsequence of the
    /// user's input that we want to highlight.
@@ -742,11 +486,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 {
@@ -765,7 +504,6 @@ impl Annotation {
            message: None,
            is_primary: true,
            tags: Vec::new(),
-            is_file_level: false,
        }
    }

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

@@ -848,28 +585,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)]
 pub enum DiagnosticTag {
    /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
    Unnecessary,
@@ -883,7 +605,7 @@ pub enum DiagnosticTag {
 /// be in kebab case, e.g. `no-foo` (all lower case).
 ///
 /// Rules use kebab case, e.g. `no-foo`.
-#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub struct LintName(&'static str);

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

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

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

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

@@ -1078,7 +796,7 @@ impl std::fmt::Display for DiagnosticId {
 ///
 /// This enum presents a unified interface to these two types for the sake of creating [`Span`]s and
 /// emitting diagnostics from both ty and ruff.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum UnifiedFile {
    Ty(File),
    Ruff(SourceFile),
@@ -1092,18 +810,6 @@ impl UnifiedFile {
        }
    }

-    /// Return the file's path relative to the current working directory.
-    pub fn relative_path<'a>(&'a self, resolver: &'a dyn FileResolver) -> &'a Path {
-        let cwd = resolver.current_directory();
-        let path = Path::new(self.path(resolver));
-
-        if let Ok(path) = path.strip_prefix(cwd) {
-            return path;
-        }
-
-        path
-    }
-
    fn diagnostic_source(&self, resolver: &dyn FileResolver) -> DiagnosticSource {
        match self {
            UnifiedFile::Ty(file) => DiagnosticSource::Ty(resolver.input(*file)),
@@ -1129,7 +835,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()),
@@ -1142,7 +848,7 @@ impl DiagnosticSource {
 /// It consists of a `File` and an optional range into that file. When the
 /// range isn't present, it semantically implies that the diagnostic refers to
 /// the entire file. For example, when the file should be executable but isn't.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Span {
    file: UnifiedFile,
    range: Option<TextRange>,
@@ -1187,15 +893,9 @@ impl Span {
    ///
    /// Panics if the file is a [`UnifiedFile::Ty`] instead of a [`UnifiedFile::Ruff`].
    pub fn expect_ruff_file(&self) -> &SourceFile {
-        self.as_ruff_file()
-            .expect("Expected a ruff `SourceFile`, found a ty `File`")
-    }
-
-    /// Returns the [`SourceFile`] attached to this [`Span`].
-    pub fn as_ruff_file(&self) -> Option<&SourceFile> {
        match &self.file {
-            UnifiedFile::Ty(_) => None,
-            UnifiedFile::Ruff(file) => Some(file),
+            UnifiedFile::Ty(_) => panic!("Expected a ruff `SourceFile`, found a ty `File`"),
+            UnifiedFile::Ruff(file) => file,
        }
    }
 }
@@ -1220,7 +920,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)]
 pub enum Severity {
    Info,
    Warning,
@@ -1250,32 +950,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 {
@@ -1296,25 +970,6 @@ pub struct DisplayDiagnosticConfig {
    /// here for now as the most "sensible" place for it to live until
    /// we had more concrete use cases. ---AG
    context: usize,
-    /// Whether to use preview formatting for Ruff diagnostics.
-    #[allow(
-        dead_code,
-        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 {
@@ -1335,51 +990,6 @@ impl DisplayDiagnosticConfig {
            ..self
        }
    }
-
-    /// Whether to enable preview behavior or not.
-    pub fn preview(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            preview: yes,
-            ..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 {
@@ -1388,11 +998,6 @@ impl Default for DisplayDiagnosticConfig {
            format: DiagnosticFormat::default(),
            color: false,
            context: 2,
-            preview: false,
-            hide_severity: false,
-            show_fix_status: false,
-            show_fix_diff: false,
-            fix_applicability: Applicability::Safe,
        }
    }
 }
@@ -1420,41 +1025,6 @@ pub enum DiagnosticFormat {
    ///
    /// This may use color when printing to a `tty`.
    Concise,
-    /// Print diagnostics in the [Azure Pipelines] format.
-    ///
-    /// [Azure Pipelines]: https://learn.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#logissue-log-an-error-or-warning
-    Azure,
-    /// Print diagnostics in JSON format.
-    ///
-    /// Unlike `json-lines`, this prints all of the diagnostics as a JSON array.
-    #[cfg(feature = "serde")]
-    Json,
-    /// Print diagnostics in JSON format, one per line.
-    ///
-    /// This will print each diagnostic as a separate JSON object on its own line. See the `json`
-    /// format for an array of all diagnostics. See <https://jsonlines.org/> for more details.
-    #[cfg(feature = "serde")]
-    JsonLines,
-    /// Print diagnostics in the JSON format expected by [reviewdog].
-    ///
-    /// [reviewdog]: https://github.com/reviewdog/reviewdog
-    #[cfg(feature = "serde")]
-    Rdjson,
-    /// Print diagnostics in the format emitted by Pylint.
-    Pylint,
-    /// Print diagnostics in the format expected by JUnit.
-    #[cfg(feature = "junit")]
-    Junit,
-    /// Print diagnostics in the JSON format used by GitLab [Code Quality] reports.
-    ///
-    /// [Code Quality]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
-    #[cfg(feature = "serde")]
-    Gitlab,
-
-    /// Print diagnostics in the format used by [GitHub Actions] workflow error annotations.
-    ///
-    /// [GitHub Actions]: https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#setting-an-error-message
-    Github,
 }

 /// A representation of the kinds of messages inside a diagnostic.
@@ -1513,7 +1083,7 @@ impl std::fmt::Display for ConciseMessage<'_> {
 /// In most cases, callers shouldn't need to use this. Instead, there is
 /// a blanket trait implementation for `IntoDiagnosticMessage` for
 /// anything that implements `std::fmt::Display`.
-#[derive(Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DiagnosticMessage(Box<str>);

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

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

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

-impl std::ops::Deref for SecondaryCode {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl PartialEq<&str> for SecondaryCode {
-    fn eq(&self, other: &&str) -> bool {
-        self.0 == *other
-    }
-}
-
-impl PartialEq<SecondaryCode> for &str {
-    fn eq(&self, other: &SecondaryCode) -> bool {
-        other.eq(self)
-    }
-}
-
-// for `hashbrown::EntryRef`
-impl From<&SecondaryCode> for SecondaryCode {
-    fn from(value: &SecondaryCode) -> Self {
-        value.clone()
-    }
+/// Creates a `Diagnostic` from a semantic syntax error.
+///
+/// See [`create_parse_diagnostic`] for more details.
+pub fn create_semantic_syntax_diagnostic(
+    file: File,
+    err: &ruff_python_parser::semantic_errors::SemanticSyntaxError,
+) -> Diagnostic {
+    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
+    let span = Span::from(file).with_range(err.range);
+    diag.annotate(Annotation::primary(span).message(err.to_string()));
+    diag
 }
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -1,81 +0,0 @@
-use ruff_source_file::LineColumn;
-
-use crate::diagnostic::{Diagnostic, Severity};
-
-use super::FileResolver;
-
-pub(super) struct AzureRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-}
-
-impl<'a> AzureRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
-        Self { resolver }
-    }
-}
-
-impl AzureRenderer<'_> {
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        for diag in diagnostics {
-            let severity = match diag.severity() {
-                Severity::Info | Severity::Warning => "warning",
-                Severity::Error | Severity::Fatal => "error",
-            };
-            write!(f, "##vso[task.logissue type={severity};")?;
-            if let Some(span) = diag.primary_span() {
-                let filename = span.file().path(self.resolver);
-                write!(f, "sourcepath={filename};")?;
-                if let Some(range) = span.range() {
-                    let location = if self.resolver.notebook_index(span.file()).is_some() {
-                        // We can't give a reasonable location for the structured formats,
-                        // so we show one that's clearly a fallback
-                        LineColumn::default()
-                    } else {
-                        span.file()
-                            .diagnostic_source(self.resolver)
-                            .as_source_code()
-                            .line_column(range.start())
-                    };
-                    write!(
-                        f,
-                        "linenumber={line};columnnumber={col};",
-                        line = location.line,
-                        col = location.column,
-                    )?;
-                }
-            }
-            writeln!(
-                f,
-                "code={code};]{body}",
-                code = diag.secondary_code_or_id(),
-                body = diag.body(),
-            )?;
-        }
-
-        Ok(())
-    }
-}
-
-#[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::Azure);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Azure);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -1,199 +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 {
-                    // Do not display an indicator for inapplicable fixes
-                    if diag.has_applicable_fix(self.config) {
-                        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,966 +0,0 @@
-use std::borrow::Cow;
-use std::num::NonZeroUsize;
-
-use similar::{ChangeTag, TextDiff};
-
-use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-use ruff_diagnostics::{Applicability, Fix};
-use ruff_notebook::NotebookIndex;
-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()))?;
-            }
-
-            if self.config.show_fix_diff
-                && diag.has_applicable_fix(self.config)
-                && let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver)
-            {
-                write!(f, "{diff}")?;
-            }
-
-            writeln!(f)?;
-        }
-
-        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 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 grouped_ops = diff.grouped_ops(3);
-
-            // Find the new line number with the largest number of digits to align all of the line
-            // number separators.
-            let last_op = grouped_ops.last().and_then(|group| group.last());
-            let largest_new = last_op.map(|op| op.new_range().end).unwrap_or_default();
-
-            let digit_with = OneIndexed::new(largest_new).unwrap_or_default().digits();
-
-            if let Some(cell) = cell {
-                // Room for 1 digit, 1 space, 1 `|`, and 1 more following space. This centers the
-                // three colons on the pipe.
-                writeln!(f, "{:>1$} cell {cell}", ":::", digit_with.get() + 3)?;
-            }
-
-            for (idx, group) in grouped_ops.iter().enumerate() {
-                if idx > 0 {
-                    writeln!(f, "{:-^1$}", "-", 80)?;
-                }
-                for op in group {
-                    for change in diff.iter_inline_changes(op) {
-                        let (sign, style, line_no_style, index) = match change.tag() {
-                            ChangeTag::Delete => (
-                                "-",
-                                self.stylesheet.deletion,
-                                self.stylesheet.deletion_line_no,
-                                None,
-                            ),
-                            ChangeTag::Insert => (
-                                "+",
-                                self.stylesheet.insertion,
-                                self.stylesheet.insertion_line_no,
-                                change.new_index(),
-                            ),
-                            ChangeTag::Equal => (
-                                "|",
-                                self.stylesheet.none,
-                                self.stylesheet.line_no,
-                                change.new_index(),
-                            ),
-                        };
-
-                        let line = Line {
-                            index: index.map(OneIndexed::from_zero_indexed),
-                            width: digit_with,
-                        };
-
-                        write!(
-                            f,
-                            "{line} {sign} ",
-                            line = fmt_styled(line, self.stylesheet.line_no),
-                            sign = fmt_styled(sign, line_no_style),
-                        )?;
-
-                        for (emphasized, value) in change.iter_strings_lossy() {
-                            let value = show_nonprinting(&value);
-                            let styled = fmt_styled(value, style);
-                            if emphasized {
-                                write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?;
-                            } else {
-                                write!(f, "{styled}")?;
-                            }
-                        }
-                        if change.missing_newline() {
-                            writeln!(f)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        match self.fix.applicability() {
-            Applicability::Safe => {}
-            Applicability::Unsafe => {
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.warning),
-                    msg = fmt_styled(
-                        "This is an unsafe fix and may change runtime behavior",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-            Applicability::DisplayOnly => {
-                // Note that this is still only used in tests. There's no `--display-only-fixes`
-                // analog to `--unsafe-fixes` for users to activate this or see the styling.
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.error),
-                    msg = fmt_styled(
-                        "This is a display-only fix and is likely to be incorrect",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-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, Edit, 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);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        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`
-         ::: cell 1
-        1 | # cell 1
-          - 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`
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        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`
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
-    #[test]
-    fn notebook_output_with_diff_spanning_cells() {
-        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        // 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`
-         ::: cell 1
-        1 | # cell 1
-          - import os
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        3 | print('hello world')
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
-    /// 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
-          |               ^
-          |
-        ");
-    }
-
-    /// Test that we handle the width calculation for the line number correctly even for context
-    /// lines at the end of a diff. For example, we want it to render like this:
-    ///
-    /// ```
-    /// 8  |
-    /// 9  |
-    /// 10 |
-    /// ```
-    ///
-    /// and not like this:
-    ///
-    /// ```
-    /// 8 |
-    /// 9 |
-    /// 10 |
-    /// ```
-    #[test]
-    fn longer_line_number_end_of_context() {
-        let mut env = TestEnvironment::new();
-        let contents = "\
-line 1
-line 2
-line 3
-line 4
-line 5
-line 6
-line 7
-line 8
-line 9
-line 10
-        ";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build();
-        diagnostic.help("Start of diff:");
-        let target = "line 7";
-        let line9 = contents.find(target).unwrap();
-        let range = TextRange::at(TextSize::try_from(line9).unwrap(), target.text_len());
-        diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
-            format!("fixed {target}"),
-            range,
-        )));
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic][*]: main diagnostic message
-         --> example.py:3:1
-          |
-        1 | line 1
-        2 | line 2
-        3 | line 3
-          | ^^^^^^ label
-        4 | line 4
-        5 | line 5
-          |
-        help: Start of diff:
-        4  | line 4
-        5  | line 5
-        6  | line 6
-           - line 7
-        7  + fixed line 7
-        8  | line 8
-        9  | line 9
-        10 | line 10
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibraheem Ahmed	541b2096b6	wip	2025-06-19 21:58:29 -04:00
Ibraheem Ahmed	d1f16703ab	clear source texts	2025-06-18 23:10:17 -04:00