[ty] implement typing.NewType

2025-08-27 23:58:46 -07:00
1707 changed files with 105000 additions and 120371 deletions
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -39,11 +39,11 @@ 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"
@@ -68,11 +68,11 @@ 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
@@ -110,11 +110,11 @@ 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
@@ -166,11 +166,11 @@ 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 }}
@@ -219,11 +219,11 @@ 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
@@ -296,11 +296,11 @@ jobs:
            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"
@@ -361,11 +361,11 @@ 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
@@ -427,11 +427,11 @@ 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"
--- 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/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -113,7 +113,7 @@ 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-*
@@ -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@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
    steps:
      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

-      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -256,7 +256,7 @@ 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-*
@@ -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@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,7 +43,7 @@ jobs:
      # 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
@@ -88,6 +88,7 @@ jobs:
            ':!crates/ruff_python_formatter/**' \
            ':!crates/ruff_formatter/**' \
            ':!crates/ruff_dev/**' \
+            ':!crates/ruff_db/**' \
            ':scripts/*' \
            ':python/**' \
            ':.github/workflows/ci.yaml' \
@@ -208,7 +209,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 +223,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: |
          rustup component add clippy
@@ -242,26 +243,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
        with:
          tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-        with:
-          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
        if: ${{ needs.determine_changes.outputs.ty == 'true' }}
        env:
@@ -304,26 +301,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
        with:
          tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-        with:
-          enable-cache: "true"
      - name: "Run tests"
        shell: bash
        env:
@@ -337,20 +330,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
        with:
          tool: cargo-nextest
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-        with:
-          enable-cache: "true"
      - name: "Run tests"
        shell: bash
        env:
@@ -368,15 +357,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - 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 +386,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -415,7 +404,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,13 +412,13 @@ jobs:
        with:
          file: "Cargo.toml"
          field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        env:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
      - name: "Build tests"
        shell: bash
        env:
@@ -443,16 +432,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "fuzz -> target"
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
+        uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
+        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
@@ -469,11 +460,11 @@ jobs:
    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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
        with:
@@ -503,10 +494,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -533,14 +524,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:
@@ -657,10 +648,10 @@ jobs:
    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') }}
    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 +664,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -700,10 +691,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@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
+      - uses: cargo-bins/cargo-binstall@0dca8cf8dfb40cb77a29cece06933ce674674523 # v1.15.1
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -713,14 +704,14 @@ 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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
@@ -740,12 +731,12 @@ 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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
      - name: "Cache pre-commit"
@@ -771,13 +762,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -786,7 +777,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.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 +804,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Run checks"
@@ -839,18 +830,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 +872,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
          cache: "npm"
@@ -906,73 +897,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

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

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

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

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
+        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
-        with:
-          tool: cargo-codspeed
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench ty
-
-      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
-        with:
-          mode: instrumentation
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}

@@ -985,18 +937,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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

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

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

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

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
-        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@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - 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
@@ -32,16 +32,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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "ruff"

@@ -75,16 +75,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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "ruff"

--- 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@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0

      - 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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.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/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -50,12 +50,12 @@ jobs:
    permissions:
      contents: 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,7 +65,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -112,12 +112,12 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -150,12 +150,12 @@ jobs:
      contents: write
      pull-requests: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -192,7 +192,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/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -26,16 +26,16 @@ jobs:
    timeout-minutes: 20
    if: contains(github.event.label.name, 'ecosystem-analyzer')
    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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "ruff"

@@ -64,12 +64,11 @@ jobs:

          cd ..

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

          ecosystem-analyzer \
            --repository ruff \
            diff \
-            --profile=release \
            --projects-old ruff/projects_old.txt \
            --projects-new ruff/projects_new.txt \
            --old old_commit \
@@ -95,14 +94,6 @@ jobs:
            --new-name "$REF_NAME" \
            --output diff-statistics.md

-          ecosystem-analyzer \
-            generate-timing-diff \
-            diagnostics-old.json \
-            diagnostics-new.json \
-            --old-name "main (merge base)" \
-            --new-name "$REF_NAME" \
-            --output-html dist/timing.html
-
          echo '## `ecosystem-analyzer` results' > comment.md
          echo >> comment.md
          cat diff-statistics.md >> comment.md
@@ -126,7 +117,7 @@ jobs:
          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
        run: |
          echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
+          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)**" >> comment.md

      - name: Upload comment
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -145,9 +136,3 @@ jobs:
        with:
          name: diff.html
          path: dist/diff.html
-
-      - name: Upload timing diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: timing.html
-          path: dist/timing.html
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -22,16 +22,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@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0

-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "ruff"

@@ -49,13 +49,12 @@ jobs:

          cd ..

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

          ecosystem-analyzer \
            --verbose \
            --repository ruff \
            analyze \
-            --profile=release \
            --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
            --output ecosystem-diagnostics.json

@@ -63,7 +62,7 @@ jobs:

          ecosystem-analyzer \
            generate-report \
-            --max-diagnostics-per-project=1000 \
+            --max-diagnostics-per-project=1200 \
            ecosystem-diagnostics.json \
            --output dist/index.html

--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -32,20 +32,20 @@ jobs:
    runs-on: depot-ubuntu-22.04-32
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          repository: python/typing
          ref: ${{ env.CONFORMANCE_SUITE_COMMIT }}
          path: typing
          persist-credentials: false

-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          workspaces: "ruff"

--- 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,270 +1,490 @@
 # Changelog

-## 0.13.3
-
-Released on 2025-10-02.
+## 0.12.10

 ### Preview features

- Display diffs for `ruff format --check` and add support for different output formats ([#20443](https://github.com/astral-sh/ruff/pull/20443))
- \[`pyflakes`\] Handle some common submodule import situations for `unused-import` (`F401`) ([#20200](https://github.com/astral-sh/ruff/pull/20200))
- \[`ruff`\] Do not flag `%r` + `repr()` combinations (`RUF065`) ([#20600](https://github.com/astral-sh/ruff/pull/20600))
+- \[`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

- \[`cli`\] Add conflict between `--add-noqa` and `--diff` options ([#20642](https://github.com/astral-sh/ruff/pull/20642))
- \[`pylint`\] Exempt required imports from `PLR0402` ([#20381](https://github.com/astral-sh/ruff/pull/20381))
- \[`pylint`\] Fix missing `max-nested-blocks` in settings display ([#20574](https://github.com/astral-sh/ruff/pull/20574))
- \[`pyupgrade`\] Prevent infinite loop with `I002` and `UP026` ([#20634](https://github.com/astral-sh/ruff/pull/20634))
+- \[`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

- \[`flake8-simplify`\] Improve help message clarity (`SIM105`) ([#20548](https://github.com/astral-sh/ruff/pull/20548))
+- \[`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

- Add the *The Basics* title back to CONTRIBUTING.md ([#20624](https://github.com/astral-sh/ruff/pull/20624))
- Fixed documentation for try_consider_else ([#20587](https://github.com/astral-sh/ruff/pull/20587))
- \[`isort`\] Clarify dependency between `order-by-type` and `case-sensitive` settings ([#20559](https://github.com/astral-sh/ruff/pull/20559))
- \[`pylint`\] Clarify fix safety to include left-hand hashability (`PLR6201`) ([#20518](https://github.com/astral-sh/ruff/pull/20518))
+- 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))

-### Other changes
-
- \[`playground`\] Fix quick fixes for empty ranges in playground ([#20599](https://github.com/astral-sh/ruff/pull/20599))
-
-### Contributors
-
- [@TaKO8Ki](https://github.com/TaKO8Ki)
- [@ntBre](https://github.com/ntBre)
- [@dylwil3](https://github.com/dylwil3)
- [@MichaReiser](https://github.com/MichaReiser)
- [@danparizher](https://github.com/danparizher)
- [@LilMonk](https://github.com/LilMonk)
- [@mgiovani](https://github.com/mgiovani)
- [@IDrokin117](https://github.com/IDrokin117)
-
-## 0.13.2
-
-Released on 2025-09-25.
+## 0.12.9

 ### Preview features

- \[`flake8-async`\] Implement `blocking-path-method` (`ASYNC240`) ([#20264](https://github.com/astral-sh/ruff/pull/20264))
- \[`flake8-bugbear`\] Implement `map-without-explicit-strict` (`B912`) ([#20429](https://github.com/astral-sh/ruff/pull/20429))
- \[`flake8-bultins`\] Detect class-scope builtin shadowing in decorators, default args, and attribute initializers (`A003`) ([#20178](https://github.com/astral-sh/ruff/pull/20178))
- \[`ruff`\] Implement `logging-eager-conversion` (`RUF065`) ([#19942](https://github.com/astral-sh/ruff/pull/19942))
- Include `.pyw` files by default when linting and formatting ([#20458](https://github.com/astral-sh/ruff/pull/20458))
+- \[`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

- Deduplicate input paths ([#20105](https://github.com/astral-sh/ruff/pull/20105))
- \[`flake8-comprehensions`\] Preserve trailing commas for single-element lists (`C409`) ([#19571](https://github.com/astral-sh/ruff/pull/19571))
- \[`flake8-pyi`\] Avoid syntax error from conflict with `PIE790` (`PYI021`) ([#20010](https://github.com/astral-sh/ruff/pull/20010))
- \[`flake8-simplify`\] Correct fix for positive `maxsplit` without separator (`SIM905`) ([#20056](https://github.com/astral-sh/ruff/pull/20056))
- \[`pyupgrade`\] Fix `UP008` not to apply when `__class__` is a local variable ([#20497](https://github.com/astral-sh/ruff/pull/20497))
- \[`ruff`\] Fix `B004` to skip invalid `hasattr`/`getattr` calls ([#20486](https://github.com/astral-sh/ruff/pull/20486))
- \[`ruff`\] Replace `-nan` with `nan` when using the value to construct a `Decimal` (`FURB164` ) ([#20391](https://github.com/astral-sh/ruff/pull/20391))
-
-### Documentation
-
- Add 'Finding ways to help' to CONTRIBUTING.md ([#20567](https://github.com/astral-sh/ruff/pull/20567))
- Update import path to `ruff-wasm-web` ([#20539](https://github.com/astral-sh/ruff/pull/20539))
- \[`flake8-bandit`\] Clarify the supported hashing functions (`S324`) ([#20534](https://github.com/astral-sh/ruff/pull/20534))
-
-### Other changes
-
- \[`playground`\] Allow hover quick fixes to appear for overlapping diagnostics ([#20527](https://github.com/astral-sh/ruff/pull/20527))
- \[`playground`\] Fix non‑BMP code point handling in quick fixes and markers ([#20526](https://github.com/astral-sh/ruff/pull/20526))
-
-### Contributors
-
- [@BurntSushi](https://github.com/BurntSushi)
- [@mtshiba](https://github.com/mtshiba)
- [@second-ed](https://github.com/second-ed)
- [@danparizher](https://github.com/danparizher)
- [@ShikChen](https://github.com/ShikChen)
- [@PieterCK](https://github.com/PieterCK)
- [@GDYendell](https://github.com/GDYendell)
- [@RazerM](https://github.com/RazerM)
- [@TaKO8Ki](https://github.com/TaKO8Ki)
- [@amyreese](https://github.com/amyreese)
- [@ntbre](https://github.com/ntBre)
- [@MichaReiser](https://github.com/MichaReiser)
-
-## 0.13.1
-
-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))
+- \[`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

- \[`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))
+- \[`pylint`\] Use lowercase hex characters to match the formatter (`PLE2513`) ([#19808](https://github.com/astral-sh/ruff/pull/19808))

 ### 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))
+- Fix `lint.future-annotations` link ([#19876](https://github.com/astral-sh/ruff/pull/19876))

 ### 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))
+- Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))

-### Contributors
+- Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))

- [@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)
+- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))

-## 0.13.0
+    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):

-Check out the [blog post](https://astral.sh/blog/ruff-v0.13.0) for a migration
+    ```diff
+    -unused.py:8:19: F401 [*] `pathlib` imported but unused
+    +F401 [*] `pathlib` imported but unused
+    +  --> unused.py:8:19
+        |
+      7 | # Unused, _not_ marked as required (due to the alias).
+      8 | import pathlib as non_alias
+    -   |                   ^^^^^^^^^ F401
+    +   |                   ^^^^^^^^^
+      9 |
+     10 | # Unused, marked as required.
+        |
+    -   = help: Remove unused import: `pathlib`
+    +help: Remove unused import: `pathlib`
+    ```
+
+    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
+
+## 0.12.8
+
+### Preview features
+
+- \[`flake8-use-pathlib`\] Expand `PTH201` to check all `PurePath` subclasses ([#19440](https://github.com/astral-sh/ruff/pull/19440))
+
+### Bug fixes
+
+- \[`flake8-blind-except`\] Change `BLE001` to correctly parse exception tuples ([#19747](https://github.com/astral-sh/ruff/pull/19747))
+- \[`flake8-errmsg`\] Exclude `typing.cast` from `EM101` ([#19656](https://github.com/astral-sh/ruff/pull/19656))
+- \[`flake8-simplify`\] Fix raw string handling in `SIM905` for embedded quotes ([#19591](https://github.com/astral-sh/ruff/pull/19591))
+- \[`flake8-import-conventions`\] Avoid false positives for NFKC-normalized `__debug__` import aliases in `ICN001` ([#19411](https://github.com/astral-sh/ruff/pull/19411))
+- \[`isort`\] Fix syntax error after docstring ending with backslash (`I002`) ([#19505](https://github.com/astral-sh/ruff/pull/19505))
+- \[`pylint`\] Mark `PLC0207` fixes as unsafe when `*args` unpacking is present ([#19679](https://github.com/astral-sh/ruff/pull/19679))
+- \[`pyupgrade`\] Prevent infinite loop with `I002` (`UP010`, `UP035`) ([#19413](https://github.com/astral-sh/ruff/pull/19413))
+- \[`ruff`\] Parenthesize generator expressions in f-strings (`RUF010`) ([#19434](https://github.com/astral-sh/ruff/pull/19434))
+
+### Rule changes
+
+- \[`eradicate`\] Don't flag `pyrefly` pragmas as unused code (`ERA001`) ([#19731](https://github.com/astral-sh/ruff/pull/19731))
+
+### Documentation
+
+- Replace "associative" with "commutative" in docs for `RUF036` ([#19706](https://github.com/astral-sh/ruff/pull/19706))
+- Fix copy and line separator colors in dark mode ([#19630](https://github.com/astral-sh/ruff/pull/19630))
+- Fix link to `typing` documentation ([#19648](https://github.com/astral-sh/ruff/pull/19648))
+- \[`refurb`\] Make more examples error out-of-the-box ([#19695](https://github.com/astral-sh/ruff/pull/19695),[#19673](https://github.com/astral-sh/ruff/pull/19673),[#19672](https://github.com/astral-sh/ruff/pull/19672))
+
+### Other changes
+
+- Include column numbers in GitLab output format ([#19708](https://github.com/astral-sh/ruff/pull/19708))
+- Always expand tabs to four spaces in diagnostics ([#19618](https://github.com/astral-sh/ruff/pull/19618))
+- Update pre-commit's `ruff` id ([#19654](https://github.com/astral-sh/ruff/pull/19654))
+
+## 0.12.7
+
+This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
+
+## 0.12.6
+
+### Preview features
+
+- \[`flake8-commas`\] Add support for trailing comma checks in type parameter lists (`COM812`, `COM819`) ([#19390](https://github.com/astral-sh/ruff/pull/19390))
+- \[`pylint`\] Implement auto-fix for `missing-maxsplit-arg` (`PLC0207`) ([#19387](https://github.com/astral-sh/ruff/pull/19387))
+- \[`ruff`\] Offer fixes for `RUF039` in more cases ([#19065](https://github.com/astral-sh/ruff/pull/19065))
+
+### Bug fixes
+
+- Support `.pyi` files in ruff analyze graph ([#19611](https://github.com/astral-sh/ruff/pull/19611))
+- \[`flake8-pyi`\] Preserve inline comment in ellipsis removal (`PYI013`) ([#19399](https://github.com/astral-sh/ruff/pull/19399))
+- \[`perflint`\] Ignore rule if target is `global` or `nonlocal` (`PERF401`) ([#19539](https://github.com/astral-sh/ruff/pull/19539))
+- \[`pyupgrade`\] Fix `UP030` to avoid modifying double curly braces in format strings ([#19378](https://github.com/astral-sh/ruff/pull/19378))
+- \[`refurb`\] Ignore decorated functions for `FURB118` ([#19339](https://github.com/astral-sh/ruff/pull/19339))
+- \[`refurb`\] Mark `int` and `bool` cases for `Decimal.from_float` as safe fixes (`FURB164`) ([#19468](https://github.com/astral-sh/ruff/pull/19468))
+- \[`ruff`\] Fix `RUF033` for named default expressions ([#19115](https://github.com/astral-sh/ruff/pull/19115))
+
+### Rule changes
+
+- \[`flake8-blind-except`\] Change `BLE001` to permit `logging.critical(..., exc_info=True)` ([#19520](https://github.com/astral-sh/ruff/pull/19520))
+
+### Performance
+
+- Add support for specifying minimum dots in detected string imports ([#19538](https://github.com/astral-sh/ruff/pull/19538))
+
+## 0.12.5
+
+### Preview features
+
+- \[`flake8-use-pathlib`\] Add autofix for `PTH101`, `PTH104`, `PTH105`, `PTH121` ([#19404](https://github.com/astral-sh/ruff/pull/19404))
+- \[`ruff`\] Support byte strings (`RUF055`) ([#18926](https://github.com/astral-sh/ruff/pull/18926))
+
+### Bug fixes
+
+- Fix `unreachable` panic in parser ([#19183](https://github.com/astral-sh/ruff/pull/19183))
+- \[`flake8-pyi`\] Skip fix if all `Union` members are `None` (`PYI016`) ([#19416](https://github.com/astral-sh/ruff/pull/19416))
+- \[`perflint`\] Parenthesize generator expressions (`PERF401`) ([#19325](https://github.com/astral-sh/ruff/pull/19325))
+- \[`pylint`\] Handle empty comments after line continuation (`PLR2044`) ([#19405](https://github.com/astral-sh/ruff/pull/19405))
+
+### Rule changes
+
+- \[`pep8-naming`\] Fix `N802` false positives for `CGIHTTPRequestHandler` and `SimpleHTTPRequestHandler` ([#19432](https://github.com/astral-sh/ruff/pull/19432))
+
+## 0.12.4
+
+### Preview features
+
+- \[`flake8-type-checking`, `pyupgrade`, `ruff`\] Add `from __future__ import annotations` when it would allow new fixes (`TC001`, `TC002`, `TC003`, `UP037`, `RUF013`) ([#19100](https://github.com/astral-sh/ruff/pull/19100))
+- \[`flake8-use-pathlib`\] Add autofix for `PTH109` ([#19245](https://github.com/astral-sh/ruff/pull/19245))
+- \[`pylint`\] Detect indirect `pathlib.Path` usages for `unspecified-encoding` (`PLW1514`) ([#19304](https://github.com/astral-sh/ruff/pull/19304))
+
+### Bug fixes
+
+- \[`flake8-bugbear`\] Fix `B017` false negatives for keyword exception arguments ([#19217](https://github.com/astral-sh/ruff/pull/19217))
+- \[`flake8-use-pathlib`\] Fix false negative on direct `Path()` instantiation (`PTH210`) ([#19388](https://github.com/astral-sh/ruff/pull/19388))
+- \[`flake8-django`\] Fix `DJ008` false positive for abstract models with type-annotated `abstract` field ([#19221](https://github.com/astral-sh/ruff/pull/19221))
+- \[`isort`\] Fix `I002` import insertion after docstring with multiple string statements ([#19222](https://github.com/astral-sh/ruff/pull/19222))
+- \[`isort`\] Treat form feed as valid whitespace before a semicolon ([#19343](https://github.com/astral-sh/ruff/pull/19343))
+- \[`pydoclint`\] Fix `SyntaxError` from fixes with line continuations (`D201`, `D202`) ([#19246](https://github.com/astral-sh/ruff/pull/19246))
+- \[`refurb`\] `FURB164` fix should validate arguments and should usually be marked unsafe ([#19136](https://github.com/astral-sh/ruff/pull/19136))
+
+### Rule changes
+
+- \[`flake8-use-pathlib`\] Skip single dots for `invalid-pathlib-with-suffix` (`PTH210`) on versions >= 3.14 ([#19331](https://github.com/astral-sh/ruff/pull/19331))
+- \[`pep8_naming`\] Avoid false positives on standard library functions with uppercase names (`N802`) ([#18907](https://github.com/astral-sh/ruff/pull/18907))
+- \[`pycodestyle`\] Handle brace escapes for t-strings in logical lines ([#19358](https://github.com/astral-sh/ruff/pull/19358))
+- \[`pylint`\] Extend invalid string character rules to include t-strings ([#19355](https://github.com/astral-sh/ruff/pull/19355))
+- \[`ruff`\] Allow `strict` kwarg when checking for `starmap-zip` (`RUF058`) in Python 3.14+ ([#19333](https://github.com/astral-sh/ruff/pull/19333))
+
+### Documentation
+
+- \[`flake8-type-checking`\] Make `TC010` docs example more realistic ([#19356](https://github.com/astral-sh/ruff/pull/19356))
+- Make more documentation examples error out-of-the-box ([#19288](https://github.com/astral-sh/ruff/pull/19288),[#19272](https://github.com/astral-sh/ruff/pull/19272),[#19291](https://github.com/astral-sh/ruff/pull/19291),[#19296](https://github.com/astral-sh/ruff/pull/19296),[#19292](https://github.com/astral-sh/ruff/pull/19292),[#19295](https://github.com/astral-sh/ruff/pull/19295),[#19297](https://github.com/astral-sh/ruff/pull/19297),[#19309](https://github.com/astral-sh/ruff/pull/19309))
+
+## 0.12.3
+
+### Preview features
+
+- \[`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.2
+
+### Preview features
+
+- \[`flake8-pyi`\] Expand `Optional[A]` to `A | None` (`PYI016`) ([#18572](https://github.com/astral-sh/ruff/pull/18572))
+- \[`pyupgrade`\] Mark `UP008` fix safe if no comments are in range ([#18683](https://github.com/astral-sh/ruff/pull/18683))
+
+### Bug fixes
+
+- \[`flake8-comprehensions`\] Fix `C420` to prepend whitespace when needed ([#18616](https://github.com/astral-sh/ruff/pull/18616))
+- \[`perflint`\] Fix `PERF403` panic on attribute or subscription loop variable ([#19042](https://github.com/astral-sh/ruff/pull/19042))
+- \[`pydocstyle`\] Fix `D413` infinite loop for parenthesized docstring ([#18930](https://github.com/astral-sh/ruff/pull/18930))
+- \[`pylint`\] Fix `PLW0108` autofix introducing a syntax error when the lambda's body contains an assignment expression ([#18678](https://github.com/astral-sh/ruff/pull/18678))
+- \[`refurb`\] Fix false positive on empty tuples (`FURB168`) ([#19058](https://github.com/astral-sh/ruff/pull/19058))
+- \[`ruff`\] Allow more `field` calls from `attrs` (`RUF009`) ([#19021](https://github.com/astral-sh/ruff/pull/19021))
+- \[`ruff`\] Fix syntax error introduced for an empty string followed by a u-prefixed string (`UP025`) ([#18899](https://github.com/astral-sh/ruff/pull/18899))
+
+### Rule changes
+
+- \[`flake8-executable`\] Allow `uvx` in shebang line (`EXE003`) ([#18967](https://github.com/astral-sh/ruff/pull/18967))
+- \[`pandas`\] Avoid flagging `PD002` if `pandas` is not imported ([#18963](https://github.com/astral-sh/ruff/pull/18963))
+- \[`pyupgrade`\] Avoid PEP-604 unions with `typing.NamedTuple` (`UP007`, `UP045`) ([#18682](https://github.com/astral-sh/ruff/pull/18682))
+
+### Documentation
+
+- Document link between `import-outside-top-level (PLC0415)` and `lint.flake8-tidy-imports.banned-module-level-imports` ([#18733](https://github.com/astral-sh/ruff/pull/18733))
+- Fix description of the `format.skip-magic-trailing-comma` example ([#19095](https://github.com/astral-sh/ruff/pull/19095))
+- \[`airflow`\] Make `AIR302` example error out-of-the-box ([#18988](https://github.com/astral-sh/ruff/pull/18988))
+- \[`airflow`\] Make `AIR312` example error out-of-the-box ([#18989](https://github.com/astral-sh/ruff/pull/18989))
+- \[`flake8-annotations`\] Make `ANN401` example error out-of-the-box ([#18974](https://github.com/astral-sh/ruff/pull/18974))
+- \[`flake8-async`\] Make `ASYNC100` example error out-of-the-box ([#18993](https://github.com/astral-sh/ruff/pull/18993))
+- \[`flake8-async`\] Make `ASYNC105` example error out-of-the-box ([#19002](https://github.com/astral-sh/ruff/pull/19002))
+- \[`flake8-async`\] Make `ASYNC110` example error out-of-the-box ([#18975](https://github.com/astral-sh/ruff/pull/18975))
+- \[`flake8-async`\] Make `ASYNC210` example error out-of-the-box ([#18977](https://github.com/astral-sh/ruff/pull/18977))
+- \[`flake8-async`\] Make `ASYNC220`, `ASYNC221`, and `ASYNC222` examples error out-of-the-box ([#18978](https://github.com/astral-sh/ruff/pull/18978))
+- \[`flake8-async`\] Make `ASYNC251` example error out-of-the-box ([#18990](https://github.com/astral-sh/ruff/pull/18990))
+- \[`flake8-bandit`\] Make `S201` example error out-of-the-box ([#19017](https://github.com/astral-sh/ruff/pull/19017))
+- \[`flake8-bandit`\] Make `S604` and `S609` examples error out-of-the-box ([#19049](https://github.com/astral-sh/ruff/pull/19049))
+- \[`flake8-bugbear`\] Make `B028` example error out-of-the-box ([#19054](https://github.com/astral-sh/ruff/pull/19054))
+- \[`flake8-bugbear`\] Make `B911` example error out-of-the-box ([#19051](https://github.com/astral-sh/ruff/pull/19051))
+- \[`flake8-datetimez`\] Make `DTZ011` example error out-of-the-box ([#19055](https://github.com/astral-sh/ruff/pull/19055))
+- \[`flake8-datetimez`\] Make `DTZ901` example error out-of-the-box ([#19056](https://github.com/astral-sh/ruff/pull/19056))
+- \[`flake8-pyi`\] Make `PYI032` example error out-of-the-box ([#19061](https://github.com/astral-sh/ruff/pull/19061))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI014`, `PYI015`) ([#19097](https://github.com/astral-sh/ruff/pull/19097))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI042`) ([#19101](https://github.com/astral-sh/ruff/pull/19101))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI059`) ([#19080](https://github.com/astral-sh/ruff/pull/19080))
+- \[`flake8-pyi`\] Make example error out-of-the-box (`PYI062`) ([#19079](https://github.com/astral-sh/ruff/pull/19079))
+- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT023`) ([#19104](https://github.com/astral-sh/ruff/pull/19104))
+- \[`flake8-pytest-style`\] Make example error out-of-the-box (`PT030`) ([#19105](https://github.com/astral-sh/ruff/pull/19105))
+- \[`flake8-quotes`\] Make example error out-of-the-box (`Q003`) ([#19106](https://github.com/astral-sh/ruff/pull/19106))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM110`) ([#19113](https://github.com/astral-sh/ruff/pull/19113))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM113`) ([#19109](https://github.com/astral-sh/ruff/pull/19109))
+- \[`flake8-simplify`\] Make example error out-of-the-box (`SIM401`) ([#19110](https://github.com/astral-sh/ruff/pull/19110))
+- \[`pyflakes`\] Fix backslash in docs (`F621`) ([#19098](https://github.com/astral-sh/ruff/pull/19098))
+- \[`pylint`\] Fix `PLC0415` example ([#18970](https://github.com/astral-sh/ruff/pull/18970))
+
+## 0.12.1
+
+### Preview features
+
+- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
+- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
+- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
+- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
+- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
+- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
+
+### Bug fixes
+
+- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
+- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
+- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
+- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
+- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
+- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
+- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
+- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
+- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
+- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
+- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
+- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
+- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
+- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
+- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
+- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
+- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
+- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
+- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
+- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
+- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
+- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
+
+### Rule changes
+
+- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
+- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
+- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
+- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
+- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
+- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
+- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
+- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
+- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
+- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
+- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
+- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
+- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
+- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
+- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
+- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
+
+### Server
+
+- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
+
+### Documentation
+
+- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
+- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
+- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
+- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
+- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
+- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
+- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
+- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
+
+### Other changes
+
+- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
+- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
+- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
+
+## 0.12.0
+
+Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
 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`] (`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

@@ -309,3 +529,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
@@ -7,38 +7,22 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
 > This guide is for Ruff. If you're looking to contribute to ty, please see [the ty contributing
 > guide](https://github.com/astral-sh/ruff/blob/main/crates/ty/CONTRIBUTING.md).

-## Finding ways to help
-
-We label issues that would be good for a first time contributor as
-[`good first issue`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
-These usually do not require significant experience with Rust or the Ruff code base.
-
-We label issues that we think are a good opportunity for subsequent contributions as
-[`help wanted`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
-These require varying levels of experience with Rust and Ruff. Often, we want to accomplish these
-tasks but do not have the resources to do so ourselves.
-
-You don't need our permission to start on an issue we have labeled as appropriate for community
-contribution as described above. However, it's a good idea to indicate that you are going to work on
-an issue to avoid concurrent attempts to solve the same problem.
-
-Please check in with us before starting work on an issue that has not been labeled as appropriate
-for community contribution. We're happy to receive contributions for other issues, but it's
-important to make sure we have consensus on the solution to the problem first.
-
-Outside of issues with the labels above, issues labeled as
-[`bug`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22bug%22) are the
-best candidates for contribution. In contrast, issues labeled with `needs-decision` or
-`needs-design` are _not_ good candidates for contribution. Please do not open pull requests for
-issues with these labels.
-
-Please do not open pull requests for new features without prior discussion. While we appreciate
-exploration of new features, we will often close these pull requests immediately. Adding a
-new feature to ruff creates a long-term maintenance burden and requires strong consensus from the ruff
-team before it is appropriate to begin work on an implementation.
-
 ## The Basics

+Ruff welcomes contributions in the form of pull requests.
+
+For small changes (e.g., bug fixes), feel free to submit a PR.
+
+For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
+creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
+You can also join us on [Discord](https://discord.com/invite/astral-sh) to discuss your idea with the
+community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
+in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
+and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
+that are ready for contributions.
+
+If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
+
 ### Prerequisites

 Ruff is written in Rust. You'll need to install the
--- 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.87"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -29,7 +29,6 @@ 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" }
@@ -86,7 +85,7 @@ etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.7.0", features = [
+get-size2 = { version = "0.6.2", features = [
    "derive",
    "smallvec",
    "hashbrown",
@@ -95,7 +94,7 @@ get-size2 = { version = "0.7.0", features = [
 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",
@@ -116,7 +115,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,7 +143,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "29ab321b45d00daa4315fa2a06f7207759a8c87e", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
@@ -203,7 +202,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]
@@ -252,14 +251,6 @@ 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"
--- 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.3/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.13.3/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.10/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.10/install.ps1 | iex"
 ```

 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.3
+  rev: v0.12.10
  hooks:
    # Run the linter.
    - id: ruff-check
@@ -421,7 +421,7 @@ 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))
--- a/_typos.toml
+++ b/_typos.toml
@@ -31,7 +31,6 @@ extend-ignore-re = [
    "typ",
    # TODO: Remove this once the `TYP` redirects are removed from `rule_redirects.rs`
    "TYP",
-    "ntBre"
 ]

 [default.extend-identifiers]
--- 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/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.13.3"
+version = "0.12.10"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff/src/args.rs
+++ b/crates/ruff/src/args.rs
@@ -416,7 +416,6 @@ pub struct CheckCommand {
        conflicts_with = "stdin_filename",
        conflicts_with = "watch",
        conflicts_with = "fix",
-        conflicts_with = "diff",
    )]
    pub add_noqa: bool,
    /// See the files Ruff will be run against with the current settings.
@@ -538,14 +537,6 @@ pub struct FormatCommand {
    /// Exit with a non-zero status code if any files were modified via format, even if all files were formatted successfully.
    #[arg(long, help_heading = "Miscellaneous", alias = "exit-non-zero-on-fix")]
    pub exit_non_zero_on_format: bool,
-
-    /// Output serialization format for violations, when used with `--check`.
-    /// The default serialization format is "full".
-    ///
-    /// Note that this option is currently only respected in preview mode. A warning will be emitted
-    /// if this flag is used on stable.
-    #[arg(long, value_enum, env = "RUFF_OUTPUT_FORMAT")]
-    pub output_format: Option<OutputFormat>,
 }

 #[derive(Copy, Clone, Debug, clap::Parser)]
@@ -793,7 +784,6 @@ impl FormatCommand {
            target_version: self.target_version.map(ast::PythonVersion::from),
            cache_dir: self.cache_dir,
            extension: self.extension,
-            output_format: self.output_format,
            ..ExplicitConfigOverrides::default()
        };

--- a/crates/ruff/src/commands/check.rs
+++ b/crates/ruff/src/commands/check.rs
@@ -6,10 +6,9 @@ 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 ruff_linter::message::create_panic_diagnostic;
 use rustc_hash::FxHashMap;

 use ruff_db::diagnostic::Diagnostic;
@@ -194,8 +193,21 @@ fn lint_path(
    match result {
        Ok(inner) => inner,
        Err(error) => {
-            let diagnostic = create_panic_diagnostic(&error, Some(path));
-            Ok(Diagnostics::new(vec![diagnostic], FxHashMap::default()))
+            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()
+            );
+
+            Ok(Diagnostics::default())
        }
    }
 }
@@ -210,8 +222,7 @@ mod test {
    use rustc_hash::FxHashMap;
    use tempfile::TempDir;

-    use ruff_db::diagnostic::{DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics};
-    use ruff_linter::message::EmitterContext;
+    use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
    use ruff_linter::registry::Rule;
    use ruff_linter::settings::types::UnsafeFixes;
    use ruff_linter::settings::{LinterSettings, flags};
@@ -264,16 +275,19 @@ mod test {
            UnsafeFixes::Enabled,
        )
        .unwrap();
+        let mut output = Vec::new();

-        let config = DisplayDiagnosticConfig::default()
-            .format(DiagnosticFormat::Concise)
-            .hide_severity(true);
-        let messages = DisplayDiagnostics::new(
-            &EmitterContext::new(&FxHashMap::default()),
-            &config,
-            &diagnostics.inner,
-        )
-        .to_string();
+        TextEmitter::default()
+            .with_show_fix_status(true)
+            .with_color(false)
+            .emit(
+                &mut output,
+                &diagnostics.inner,
+                &EmitterContext::new(&FxHashMap::default()),
+            )
+            .unwrap();
+
+        let messages = String::from_utf8(output).unwrap();

        insta::with_settings!({
            omit_expression => true,
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -11,19 +11,13 @@ use itertools::Itertools;
 use log::{error, warn};
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, DisplayDiagnosticConfig, Severity, Span,
-};
-use ruff_linter::message::{EmitterContext, create_panic_diagnostic, render_diagnostics};
-use ruff_linter::settings::types::OutputFormat;
-use ruff_notebook::NotebookIndex;
 use ruff_python_parser::ParseError;
-use rustc_hash::{FxHashMap, FxHashSet};
+use rustc_hash::FxHashSet;
 use thiserror::Error;
 use tracing::debug;

 use ruff_db::panic::{PanicError, catch_unwind};
-use ruff_diagnostics::{Edit, Fix, SourceMap};
+use ruff_diagnostics::SourceMap;
 use ruff_linter::fs;
 use ruff_linter::logging::{DisplayParseError, LogLevel};
 use ruff_linter::package::PackageRoot;
@@ -33,15 +27,14 @@ use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_python_formatter::{FormatModuleError, QuoteStyle, format_module_source, format_range};
-use ruff_source_file::{LineIndex, LineRanges, OneIndexed, SourceFileBuilder};
+use ruff_source_file::LineIndex;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{
-    PyprojectConfig, ResolvedFile, Resolver, match_exclusion, python_files_in_path,
-};
+use ruff_workspace::resolver::{ResolvedFile, Resolver, match_exclusion, python_files_in_path};

 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
 use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
+use crate::resolve::resolve;
 use crate::{ExitStatus, resolve_default_files};

 #[derive(Debug, Copy, Clone, is_macro::Is)]
@@ -70,14 +63,11 @@ impl FormatMode {
 pub(crate) fn format(
    cli: FormatArguments,
    config_arguments: &ConfigArguments,
-    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
+    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
    let mode = FormatMode::from_cli(&cli);
    let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, pyproject_config, config_arguments)?;
-
-    let output_format = pyproject_config.settings.output_format;
-    let preview = pyproject_config.settings.formatter.preview;
+    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;

    if paths.is_empty() {
        warn_user_once!("No Python files found under the given path(s)");
@@ -194,26 +184,17 @@ pub(crate) fn format(
    caches.persist()?;

    // Report on any errors.
-    //
-    // We only convert errors to `Diagnostic`s in `Check` mode with preview enabled, otherwise we
-    // fall back on printing simple messages.
-    if !(preview.is_enabled() && mode.is_check()) {
-        errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
+    errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));

-        for error in &errors {
-            error!("{error}");
-        }
+    for error in &errors {
+        error!("{error}");
    }

    let results = FormatResults::new(results.as_slice(), mode);
    match mode {
        FormatMode::Write => {}
        FormatMode::Check => {
-            if preview.is_enabled() {
-                results.write_changed_preview(&mut stdout().lock(), output_format, &errors)?;
-            } else {
-                results.write_changed(&mut stdout().lock())?;
-            }
+            results.write_changed(&mut stdout().lock())?;
        }
        FormatMode::Diff => {
            results.write_diff(&mut stdout().lock())?;
@@ -225,7 +206,7 @@ pub(crate) fn format(
        if mode.is_diff() {
            // Allow piping the diff to e.g. a file by writing the summary to stderr
            results.write_summary(&mut stderr().lock())?;
-        } else if !preview.is_enabled() || output_format.is_human_readable() {
+        } else {
            results.write_summary(&mut stdout().lock())?;
        }
    }
@@ -314,7 +295,8 @@ pub(crate) fn format_path(

                FormatResult::Formatted
            }
-            FormatMode::Check | FormatMode::Diff => FormatResult::Diff {
+            FormatMode::Check => FormatResult::Formatted,
+            FormatMode::Diff => FormatResult::Diff {
                unformatted,
                formatted,
            },
@@ -347,7 +329,7 @@ pub(crate) enum FormattedSource {
 impl From<FormattedSource> for FormatResult {
    fn from(value: FormattedSource) -> Self {
        match value {
-            FormattedSource::Formatted { .. } => FormatResult::Formatted,
+            FormattedSource::Formatted(_) => FormatResult::Formatted,
            FormattedSource::Unchanged => FormatResult::Unchanged,
        }
    }
@@ -495,10 +477,10 @@ pub(crate) fn format_source(
 /// The result of an individual formatting operation.
 #[derive(Debug, Clone, is_macro::Is)]
 pub(crate) enum FormatResult {
-    /// The file was formatted and written back to disk.
+    /// The file was formatted.
    Formatted,

-    /// The file needs to be formatted, as the `formatted` and `unformatted` contents differ.
+    /// The file was formatted, [`SourceKind`] contains the formatted code
    Diff {
        unformatted: SourceKind,
        formatted: SourceKind,
@@ -570,7 +552,7 @@ impl<'a> FormatResults<'a> {
            .results
            .iter()
            .filter_map(|result| {
-                if result.result.is_diff() {
+                if result.result.is_formatted() {
                    Some(result.path.as_path())
                } else {
                    None
@@ -584,30 +566,6 @@ impl<'a> FormatResults<'a> {
        Ok(())
    }

-    /// Write a list of the files that would be changed and any errors to the given writer.
-    fn write_changed_preview(
-        &self,
-        f: &mut impl Write,
-        output_format: OutputFormat,
-        errors: &[FormatCommandError],
-    ) -> io::Result<()> {
-        let mut notebook_index = FxHashMap::default();
-        let diagnostics: Vec<_> = errors
-            .iter()
-            .map(Diagnostic::from)
-            .chain(self.to_diagnostics(&mut notebook_index))
-            .sorted_unstable_by(Diagnostic::ruff_start_ordering)
-            .collect();
-
-        let context = EmitterContext::new(&notebook_index);
-        let config = DisplayDiagnosticConfig::default()
-            .hide_severity(true)
-            .show_fix_diff(true)
-            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize());
-
-        render_diagnostics(f, output_format, config, &context, &diagnostics)
-    }
-
    /// Write a summary of the formatting results to the given writer.
    fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
        // Compute the number of changed and unchanged files.
@@ -670,155 +628,6 @@ impl<'a> FormatResults<'a> {
            Ok(())
        }
    }
-
-    /// Convert formatted files into [`Diagnostic`]s.
-    fn to_diagnostics(
-        &self,
-        notebook_index: &mut FxHashMap<String, NotebookIndex>,
-    ) -> impl Iterator<Item = Diagnostic> {
-        /// The number of unmodified context lines rendered in diffs.
-        ///
-        /// Note that this should be kept in sync with the argument to `TextDiff::grouped_ops` in
-        /// the diff rendering in `ruff_db` (currently 3). The `similar` crate uses two times that
-        /// argument as a cutoff for rendering unmodified lines.
-        const CONTEXT_LINES: u32 = 6;
-
-        self.results.iter().filter_map(|result| {
-            let (unformatted, formatted) = match &result.result {
-                FormatResult::Skipped | FormatResult::Unchanged => return None,
-                FormatResult::Diff {
-                    unformatted,
-                    formatted,
-                } => (unformatted, formatted),
-                FormatResult::Formatted => {
-                    debug_assert!(
-                        false,
-                        "Expected `FormatResult::Diff` for changed files in check mode"
-                    );
-                    return None;
-                }
-            };
-
-            let mut diagnostic = Diagnostic::new(
-                DiagnosticId::Unformatted,
-                Severity::Error,
-                "File would be reformatted",
-            );
-
-            // Locate the first and last characters that differ to use as the diagnostic
-            // range and to narrow the `Edit` range.
-            let modified_range = ModifiedRange::new(unformatted, formatted);
-
-            let path = result.path.to_string_lossy();
-            // For scripts, this is a single `Edit` using the `ModifiedRange` above, but notebook
-            // edits must be split by cell in order to render them as diffs.
-            //
-            // We also attempt to estimate the line number width for aligning the
-            // annotate-snippets header. This is only an estimate because we don't actually know
-            // if the maximum line number present in the document will be rendered as part of
-            // the diff, either as a changed line or as an unchanged context line. For
-            // notebooks, we refine our estimate by checking the number of lines in each cell
-            // individually, otherwise we could use `formatted.source_code().count_lines(...)`
-            // in both cases.
-            let (fix, line_count) = if let SourceKind::IpyNotebook(formatted) = formatted
-                && let SourceKind::IpyNotebook(unformatted) = unformatted
-            {
-                notebook_index.insert(path.to_string(), unformatted.index().clone());
-
-                let mut edits = formatted
-                    .cell_offsets()
-                    .ranges()
-                    .zip(unformatted.cell_offsets().ranges())
-                    .filter_map(|(formatted_range, unformatted_range)| {
-                        // Filter out cells that weren't modified. We use `intersect` instead of
-                        // `contains_range` because the full modified range might start or end in
-                        // the middle of a cell:
-                        //
-                        // ```
-                        // | cell 1 | cell 2 | cell 3 |
-                        //     |----------------| modified range
-                        // ```
-                        //
-                        // The intersection will be `Some` for all three cells in this case.
-                        if modified_range
-                            .unformatted
-                            .intersect(unformatted_range)
-                            .is_some()
-                        {
-                            let formatted = &formatted.source_code()[formatted_range];
-                            let edit = if formatted.is_empty() {
-                                Edit::range_deletion(unformatted_range)
-                            } else {
-                                Edit::range_replacement(formatted.to_string(), unformatted_range)
-                            };
-                            Some(edit)
-                        } else {
-                            None
-                        }
-                    });
-
-                let fix = Fix::safe_edits(
-                    edits
-                        .next()
-                        .expect("Formatted files must have at least one edit"),
-                    edits,
-                );
-                let source = formatted.source_code();
-                let line_count = formatted
-                    .cell_offsets()
-                    .ranges()
-                    .filter_map(|range| {
-                        if modified_range.formatted.contains_range(range) {
-                            Some(source.count_lines(range))
-                        } else {
-                            None
-                        }
-                    })
-                    .max()
-                    .unwrap_or_default();
-                (fix, line_count)
-            } else {
-                let formatted_code = &formatted.source_code()[modified_range.formatted];
-                let edit = if formatted_code.is_empty() {
-                    Edit::range_deletion(modified_range.unformatted)
-                } else {
-                    Edit::range_replacement(formatted_code.to_string(), modified_range.unformatted)
-                };
-                let fix = Fix::safe_edit(edit);
-                let line_count = formatted
-                    .source_code()
-                    .count_lines(TextRange::up_to(modified_range.formatted.end()));
-                (fix, line_count)
-            };
-
-            let source_file = SourceFileBuilder::new(path, unformatted.source_code()).finish();
-            let span = Span::from(source_file).with_range(modified_range.unformatted);
-            let mut annotation = Annotation::primary(span);
-            annotation.hide_snippet(true);
-            diagnostic.annotate(annotation);
-            diagnostic.set_fix(fix);
-
-            // TODO(brent) this offset is a hack to get the header of the diagnostic message, which
-            // is rendered by our fork of `annotate-snippets`, to align with our manually-rendered
-            // diff. `annotate-snippets` computes the alignment of the arrow in the header based on
-            // the maximum line number width in its rendered snippet. However, we don't have a
-            // reasonable range to underline in an annotation, so we don't send `annotate-snippets`
-            // a snippet to measure. If we commit to staying on our fork, a more robust way of
-            // handling this would be to move the diff rendering in
-            // `ruff_db::diagnostic::render::full` into `annotate-snippets`, likely as another
-            // `DisplayLine` variant and update the `lineno_width` calculation in
-            // `DisplayList::fmt`. That would handle this offset "automatically."
-            let line_count = (line_count + CONTEXT_LINES).min(
-                formatted
-                    .source_code()
-                    .count_lines(TextRange::up_to(formatted.source_code().text_len())),
-            );
-            let lines = OneIndexed::new(line_count as usize).unwrap_or_default();
-            diagnostic.set_header_offset(lines.digits().get());
-
-            Some(diagnostic)
-        })
-    }
 }

 /// An error that can occur while formatting a set of files.
@@ -830,6 +639,7 @@ pub(crate) enum FormatCommandError {
    Read(Option<PathBuf>, SourceError),
    Format(Option<PathBuf>, FormatModuleError),
    Write(Option<PathBuf>, SourceError),
+    Diff(Option<PathBuf>, io::Error),
    RangeFormatNotebook(Option<PathBuf>),
 }

@@ -848,65 +658,12 @@ impl FormatCommandError {
            | Self::Read(path, _)
            | Self::Format(path, _)
            | Self::Write(path, _)
+            | Self::Diff(path, _)
            | Self::RangeFormatNotebook(path) => path.as_deref(),
        }
    }
 }

-impl From<&FormatCommandError> for Diagnostic {
-    fn from(error: &FormatCommandError) -> Self {
-        let annotation = error.path().map(|path| {
-            let file = SourceFileBuilder::new(path.to_string_lossy(), "").finish();
-            let span = Span::from(file);
-            let mut annotation = Annotation::primary(span);
-            annotation.hide_snippet(true);
-            annotation
-        });
-
-        let mut diagnostic = match error {
-            FormatCommandError::Ignore(error) => {
-                Diagnostic::new(DiagnosticId::Io, Severity::Error, error)
-            }
-            FormatCommandError::Parse(display_parse_error) => Diagnostic::new(
-                DiagnosticId::InvalidSyntax,
-                Severity::Error,
-                &display_parse_error.error().error,
-            ),
-            FormatCommandError::Panic(path, panic_error) => {
-                return create_panic_diagnostic(panic_error, path.as_deref());
-            }
-            FormatCommandError::Read(_, source_error)
-            | FormatCommandError::Write(_, source_error) => {
-                Diagnostic::new(DiagnosticId::Io, Severity::Error, source_error)
-            }
-            FormatCommandError::Format(_, format_module_error) => match format_module_error {
-                FormatModuleError::ParseError(parse_error) => Diagnostic::new(
-                    DiagnosticId::InternalError,
-                    Severity::Error,
-                    &parse_error.error,
-                ),
-                FormatModuleError::FormatError(format_error) => {
-                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, format_error)
-                }
-                FormatModuleError::PrintError(print_error) => {
-                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, print_error)
-                }
-            },
-            FormatCommandError::RangeFormatNotebook(_) => Diagnostic::new(
-                DiagnosticId::InvalidCliOption,
-                Severity::Error,
-                "Range formatting isn't supported for notebooks.",
-            ),
-        };
-
-        if let Some(annotation) = annotation {
-            diagnostic.annotate(annotation);
-        }
-
-        diagnostic
-    }
-}
-
 impl Display for FormatCommandError {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        match self {
@@ -974,6 +731,23 @@ impl Display for FormatCommandError {
                    write!(f, "{header} {err}", header = "Failed to format:".bold())
                }
            }
+            Self::Diff(path, err) => {
+                if let Some(path) = path {
+                    write!(
+                        f,
+                        "{}{}{} {err}",
+                        "Failed to generate diff for ".bold(),
+                        fs::relativize_path(path).bold(),
+                        ":".bold()
+                    )
+                } else {
+                    write!(
+                        f,
+                        "{header} {err}",
+                        header = "Failed to generate diff:".bold(),
+                    )
+                }
+            }
            Self::RangeFormatNotebook(path) => {
                if let Some(path) = path {
                    write!(
@@ -1018,54 +792,6 @@ impl Display for FormatCommandError {
    }
 }

-#[derive(Debug)]
-struct ModifiedRange {
-    unformatted: TextRange,
-    formatted: TextRange,
-}
-
-impl ModifiedRange {
-    /// Determine the range that differs between `unformatted` and `formatted`.
-    ///
-    /// If the two inputs are equal, the returned ranges will be empty.
-    fn new(unformatted: &SourceKind, formatted: &SourceKind) -> Self {
-        let unformatted = unformatted.source_code();
-        let formatted = formatted.source_code();
-
-        let mut prefix_length = TextSize::ZERO;
-        for (unformatted, formatted) in unformatted.chars().zip(formatted.chars()) {
-            if unformatted != formatted {
-                break;
-            }
-            prefix_length += unformatted.text_len();
-        }
-
-        // For the ends of the ranges, track the length of the common suffix and then subtract that
-        // from each total text length. Unlike for `start`, the character offsets are very unlikely
-        // to be equal, so they need to be treated separately.
-        let mut suffix_length = TextSize::ZERO;
-        for (old, new) in unformatted[prefix_length.to_usize()..]
-            .chars()
-            .rev()
-            .zip(formatted[prefix_length.to_usize()..].chars().rev())
-        {
-            if old != new {
-                break;
-            }
-            suffix_length += old.text_len();
-        }
-
-        let unformatted_range =
-            TextRange::new(prefix_length, unformatted.text_len() - suffix_length);
-        let formatted_range = TextRange::new(prefix_length, formatted.text_len() - suffix_length);
-
-        Self {
-            unformatted: unformatted_range,
-            formatted: formatted_range,
-        }
-    }
-}
-
 pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
    // First, collect all rules that are incompatible regardless of the linter-specific settings.
    let mut incompatible_rules = FxHashSet::default();
@@ -1237,144 +963,3 @@ pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::io;
-    use std::ops::Range;
-    use std::path::PathBuf;
-
-    use ignore::Error;
-    use insta::assert_snapshot;
-
-    use ruff_db::panic::catch_unwind;
-    use ruff_linter::logging::DisplayParseError;
-    use ruff_linter::source_kind::{SourceError, SourceKind};
-    use ruff_python_formatter::FormatModuleError;
-    use ruff_python_parser::{ParseError, ParseErrorType};
-    use ruff_text_size::{TextRange, TextSize};
-    use test_case::test_case;
-
-    use crate::commands::format::{FormatCommandError, FormatMode, FormatResults, ModifiedRange};
-
-    #[test]
-    fn error_diagnostics() -> anyhow::Result<()> {
-        let path = PathBuf::from("test.py");
-        let source_kind = SourceKind::Python("1".to_string());
-
-        let panic_error = catch_unwind(|| {
-            panic!("Test panic for FormatCommandError");
-        })
-        .unwrap_err();
-
-        let errors = [
-            FormatCommandError::Ignore(Error::WithPath {
-                path: path.clone(),
-                err: Box::new(Error::Io(io::Error::new(
-                    io::ErrorKind::PermissionDenied,
-                    "Permission denied",
-                ))),
-            }),
-            FormatCommandError::Parse(DisplayParseError::from_source_kind(
-                ParseError {
-                    error: ParseErrorType::UnexpectedIndentation,
-                    location: TextRange::default(),
-                },
-                Some(path.clone()),
-                &source_kind,
-            )),
-            FormatCommandError::Panic(Some(path.clone()), Box::new(panic_error)),
-            FormatCommandError::Read(
-                Some(path.clone()),
-                SourceError::Io(io::Error::new(io::ErrorKind::NotFound, "File not found")),
-            ),
-            FormatCommandError::Format(
-                Some(path.clone()),
-                FormatModuleError::ParseError(ParseError {
-                    error: ParseErrorType::EmptySlice,
-                    location: TextRange::default(),
-                }),
-            ),
-            FormatCommandError::Write(
-                Some(path.clone()),
-                SourceError::Io(io::Error::new(
-                    io::ErrorKind::PermissionDenied,
-                    "Cannot write to file",
-                )),
-            ),
-            FormatCommandError::RangeFormatNotebook(Some(path)),
-        ];
-
-        let results = FormatResults::new(&[], FormatMode::Check);
-        let mut buf = Vec::new();
-        results.write_changed_preview(
-            &mut buf,
-            ruff_linter::settings::types::OutputFormat::Full,
-            &errors,
-        )?;
-
-        let mut settings = insta::Settings::clone_current();
-        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
-        let _s = settings.bind_to_scope();
-
-        assert_snapshot!(str::from_utf8(&buf)?, @r"
-        io: test.py: Permission denied
-        --> test.py:1:1
-
-        invalid-syntax: Unexpected indentation
-        --> test.py:1:1
-
-        io: File not found
-        --> test.py:1:1
-
-        internal-error: Expected index or slice expression
-        --> test.py:1:1
-
-        io: Cannot write to file
-        --> test.py:1:1
-
-        invalid-cli-option: Range formatting isn't supported for notebooks.
-        --> test.py:1:1
-
-        panic: Panicked at <location> when checking `test.py`: `Test panic for FormatCommandError`
-        --> test.py:1:1
-        info: This indicates a bug in Ruff.
-        info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
-        info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information
-        ");
-
-        Ok(())
-    }
-
-    #[test_case("abcdef", "abcXYdef", 3..3, 3..5; "insertion")]
-    #[test_case("abcXYdef", "abcdef", 3..5, 3..3; "deletion")]
-    #[test_case("abcXdef", "abcYdef", 3..4, 3..4; "modification")]
-    #[test_case("abc", "abcX", 3..3, 3..4; "strict_prefix")]
-    #[test_case("", "", 0..0, 0..0; "empty")]
-    #[test_case("abc", "abc", 3..3, 3..3; "equal")]
-    fn modified_range(
-        unformatted: &str,
-        formatted: &str,
-        expect_unformatted: Range<u32>,
-        expect_formatted: Range<u32>,
-    ) {
-        let mr = ModifiedRange::new(
-            &SourceKind::Python(unformatted.to_string()),
-            &SourceKind::Python(formatted.to_string()),
-        );
-        assert_eq!(
-            mr.unformatted,
-            TextRange::new(
-                TextSize::new(expect_unformatted.start),
-                TextSize::new(expect_unformatted.end)
-            )
-        );
-        assert_eq!(
-            mr.formatted,
-            TextRange::new(
-                TextSize::new(expect_formatted.start),
-                TextSize::new(expect_formatted.end)
-            )
-        );
-    }
-}
--- a/crates/ruff/src/commands/format_stdin.rs
+++ b/crates/ruff/src/commands/format_stdin.rs
@@ -4,10 +4,10 @@ use std::path::Path;
 use anyhow::Result;
 use log::error;

-use ruff_linter::source_kind::{SourceError, SourceKind};
+use ruff_linter::source_kind::SourceKind;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{PyprojectConfig, Resolver, match_exclusion, python_file_at_path};
+use ruff_workspace::resolver::{Resolver, match_exclusion, python_file_at_path};

 use crate::ExitStatus;
 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
@@ -15,15 +15,17 @@ use crate::commands::format::{
    FormatCommandError, FormatMode, FormatResult, FormattedSource, format_source,
    warn_incompatible_formatter_settings,
 };
+use crate::resolve::resolve;
 use crate::stdin::{parrot_stdin, read_from_stdin};

 /// Run the formatter over a single file, read from `stdin`.
 pub(crate) fn format_stdin(
    cli: &FormatArguments,
    config_arguments: &ConfigArguments,
-    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
-    let mut resolver = Resolver::new(pyproject_config);
+    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
+
+    let mut resolver = Resolver::new(&pyproject_config);
    warn_incompatible_formatter_settings(&resolver);

    let mode = FormatMode::from_cli(cli);
@@ -122,9 +124,7 @@ fn format_source_code(
                    "{}",
                    source_kind.diff(formatted, path).unwrap()
                )
-                .map_err(|err| {
-                    FormatCommandError::Write(path.map(Path::to_path_buf), SourceError::Io(err))
-                })?;
+                .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
            }
        },
        FormattedSource::Unchanged => {
--- 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;
@@ -205,18 +204,12 @@ pub fn run(
 }

 fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
-    let cli_output_format_set = args.output_format.is_some();
    let (cli, config_arguments) = args.partition(global_options)?;
-    let pyproject_config = resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
-    if cli_output_format_set && !pyproject_config.settings.formatter.preview.is_enabled() {
-        warn_user_once!(
-            "The --output-format flag for the formatter is unstable and requires preview mode to use."
-        );
-    }
+
    if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
-        commands::format_stdin::format_stdin(&cli, &config_arguments, &pyproject_config)
+        commands::format_stdin::format_stdin(&cli, &config_arguments)
    } else {
-        commands::format::format(cli, &config_arguments, &pyproject_config)
+        commands::format::format(cli, &config_arguments)
    }
 }

@@ -451,27 +444,6 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
        }

        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
--- a/crates/ruff/src/main.rs
+++ b/crates/ruff/src/main.rs
@@ -1,7 +1,6 @@
 use std::io::Write;
 use std::process::ExitCode;

-use anyhow::Context;
 use clap::Parser;
 use colored::Colorize;

@@ -40,46 +39,39 @@ pub fn main() -> ExitCode {
    }

    let args = wild::args_os();
-    let args = match argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX)
-        .context("Failed to read CLI arguments from files")
-    {
-        Ok(args) => args,
-        Err(err) => return report_error(&err),
-    };
+    let args = argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX).unwrap();

    let args = Args::parse_from(args);

    match run(args) {
        Ok(code) => code.into(),
-        Err(err) => report_error(&err),
-    }
-}
+        Err(err) => {
+            {
+                // Exit "gracefully" on broken pipe errors.
+                //
+                // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
+                for cause in err.chain() {
+                    if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
+                        if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
+                            return ExitCode::from(0);
+                        }
+                    }
+                }

-fn report_error(err: &anyhow::Error) -> ExitCode {
-    {
-        // Exit "gracefully" on broken pipe errors.
-        //
-        // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
-        for cause in err.chain() {
-            if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
-                if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
-                    return ExitCode::from(0);
+                // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
+                let mut stderr = std::io::stderr().lock();
+
+                // This communicates that this isn't a linter error but ruff itself hard-errored for
+                // some reason (e.g. failed to resolve the configuration)
+                writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
+                // Currently we generally only see one error, but e.g. with io errors when resolving
+                // the configuration it is help to chain errors ("resolving configuration failed" ->
+                // "failed to read file: subdir/pyproject.toml")
+                for cause in err.chain() {
+                    writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
                }
            }
-        }
-
-        // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
-        let mut stderr = std::io::stderr().lock();
-
-        // This communicates that this isn't a linter error but ruff itself hard-errored for
-        // some reason (e.g. failed to resolve the configuration)
-        writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
-        // Currently we generally only see one error, but e.g. with io errors when resolving
-        // the configuration it is help to chain errors ("resolving configuration failed" ->
-        // "failed to read file: subdir/pyproject.toml")
-        for cause in err.chain() {
-            writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
+            ExitStatus::Error.into()
        }
    }
-    ExitStatus::Error.into()
 }
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -14,7 +14,10 @@ use ruff_db::diagnostic::{
 };
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{EmitterContext, render_diagnostics};
+use ruff_linter::message::{
+    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, SarifEmitter,
+    TextEmitter,
+};
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
 use ruff_linter::settings::types::{OutputFormat, UnsafeFixes};
@@ -28,6 +31,8 @@ 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;
    }
 }

@@ -224,28 +229,92 @@ impl Printer {
        let context = EmitterContext::new(&diagnostics.notebook_indexes);
        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);

-        let config = DisplayDiagnosticConfig::default()
-            .preview(preview)
-            .hide_severity(true)
-            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
-            .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-            .with_fix_applicability(self.unsafe_fixes.required_applicability())
-            .show_fix_diff(preview);
-
-        render_diagnostics(writer, self.format, config, &context, &diagnostics.inner)?;
-
-        if matches!(
-            self.format,
-            OutputFormat::Full | OutputFormat::Concise | OutputFormat::Grouped
-        ) {
-            if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                if !diagnostics.fixed.is_empty() {
-                    writeln!(writer)?;
-                    print_fix_summary(writer, &diagnostics.fixed)?;
-                    writeln!(writer)?;
-                }
+        match self.format {
+            OutputFormat::Json => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Json)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::Rdjson => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Rdjson)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::JsonLines => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::JsonLines)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::Junit => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Junit)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::Concise | OutputFormat::Full => {
+                TextEmitter::default()
+                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
+                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
+                    .with_show_source(self.format == OutputFormat::Full)
+                    .with_unsafe_fixes(self.unsafe_fixes)
+                    .with_preview(preview)
+                    .emit(writer, &diagnostics.inner, &context)?;
+
+                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
+                    if !diagnostics.fixed.is_empty() {
+                        writeln!(writer)?;
+                        print_fix_summary(writer, &diagnostics.fixed)?;
+                        writeln!(writer)?;
+                    }
+                }
+
+                self.write_summary_text(writer, diagnostics)?;
+            }
+            OutputFormat::Grouped => {
+                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)?;
+
+                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
+                    if !diagnostics.fixed.is_empty() {
+                        writeln!(writer)?;
+                        print_fix_summary(writer, &diagnostics.fixed)?;
+                        writeln!(writer)?;
+                    }
+                }
+                self.write_summary_text(writer, diagnostics)?;
+            }
+            OutputFormat::Github => {
+                GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
+            }
+            OutputFormat::Gitlab => {
+                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
+            }
+            OutputFormat::Pylint => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Pylint)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::Azure => {
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Azure)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
+            }
+            OutputFormat::Sarif => {
+                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
-            self.write_summary_text(writer, diagnostics)?;
        }

        writer.flush()?;
@@ -389,22 +458,11 @@ impl Printer {
            }

            let context = EmitterContext::new(&diagnostics.notebook_indexes);
-            let format = if preview {
-                DiagnosticFormat::Full
-            } else {
-                DiagnosticFormat::Concise
-            };
-            let config = DisplayDiagnosticConfig::default()
-                .hide_severity(true)
-                .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
+            TextEmitter::default()
                .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                .format(format)
-                .with_fix_applicability(self.unsafe_fixes.required_applicability());
-            write!(
-                writer,
-                "{}",
-                DisplayDiagnostics::new(&context, &config, &diagnostics.inner)
-            )?;
+                .with_show_source(preview)
+                .with_unsafe_fixes(self.unsafe_fixes)
+                .emit(writer, &diagnostics.inner, &context)?;
        }
        writer.flush()?;

--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -246,59 +246,6 @@ fn string_detection() -> Result<()> {
    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 -----
-        "#);
-    });
-
-    Ok(())
-}
-
 #[test]
 fn globs() -> Result<()> {
    let tempdir = TempDir::new()?;
--- a/crates/ruff/tests/format.rs
+++ b/crates/ruff/tests/format.rs
@@ -12,8 +12,8 @@ use tempfile::TempDir;

 const BIN_NAME: &str = "ruff";

-fn tempdir_filter(path: impl AsRef<Path>) -> String {
-    format!(r"{}\\?/?", escape(path.as_ref().to_str().unwrap()))
+fn tempdir_filter(tempdir: &TempDir) -> String {
+    format!(r"{}\\?/?", escape(tempdir.path().to_str().unwrap()))
 }

 #[test]
@@ -500,35 +500,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()?;
@@ -609,112 +580,6 @@ if __name__ == "__main__":
    Ok(())
 }

-#[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 = r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#;
-
-    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([
-                    "format",
-                    "--no-cache",
-                    "--output-format",
-                    output_format,
-                    "--preview",
-                    "--check",
-                    "input.py",
-                ])
-                .current_dir(&tempdir),
-        );
-    });
-
-    Ok(())
-}
-
-#[test]
-fn output_format_notebook() {
-    let args = ["format", "--no-cache", "--isolated", "--preview", "--check"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let path = fixtures.join("unformatted.ipynb");
-    insta::with_settings!({filters => vec![
-        // Replace windows paths
-        (r"\\", "/"),
-    ]}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).args(args).arg(path),
-            @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        unformatted: File would be reformatted
-          --> resources/test/fixtures/unformatted.ipynb:cell 1:1:1
-         ::: cell 1
-        1 | import numpy
-          - maths = (numpy.arange(100)**2).sum()
-          - stats= numpy.asarray([1,2,3,4]).median()
-        2 + 
-        3 + maths = (numpy.arange(100) ** 2).sum()
-        4 + stats = numpy.asarray([1, 2, 3, 4]).median()
-         ::: cell 3
-        1 | # A cell with IPython escape command
-        2 | def some_function(foo, bar):
-        3 |     pass
-        4 + 
-        5 + 
-        6 | %matplotlib inline
-          ::: cell 4
-        1  | foo = %pwd
-           - def some_function(foo,bar,):
-        2  + 
-        3  + 
-        4  + def some_function(
-        5  +     foo,
-        6  +     bar,
-        7  + ):
-        8  |     # Another cell with IPython escape command
-        9  |     foo = %pwd
-        10 |     print(foo)
-
-        1 file would be reformatted
-
-        ----- stderr -----
-        ");
-    });
-}
-
 #[test]
 fn exit_non_zero_on_format() -> Result<()> {
    let tempdir = TempDir::new()?;
@@ -2461,21 +2326,3 @@ fn cookiecutter_globbing() -> Result<()> {

    Ok(())
 }
-
-#[test]
-fn stable_output_format_warning() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["format", "--output-format=full", "-"])
-            .pass_stdin("1"),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1
-
-    ----- stderr -----
-    warning: The --output-format flag for the formatter is unstable and requires preview mode to use.
-    ",
-    );
-}
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -1489,8 +1489,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();
@@ -1518,10 +1516,16 @@ 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!
+    RUF920 Hey this is a deprecated test rule.
+    --> -:1:1
+
+    RUF921 Hey this is another deprecated test rule.
+    --> -:1:1
+
+    Found 2 errors.

    ----- stderr -----
    ");
@@ -1688,27 +1692,6 @@ fn check_input_from_argfile() -> Result<()> {
    Ok(())
 }

-#[test]
-// Regression test for https://github.com/astral-sh/ruff/issues/20655
-fn missing_argfile_reports_error() {
-    let mut cmd = RuffCheck::default().filename("@!.txt").build();
-    insta::with_settings!({filters => vec![
-        ("The system cannot find the file specified.", "No such file or directory")
-    ]}, {
-        assert_cmd_snapshot!(cmd, @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Failed to read CLI arguments from files
-      Cause: failed to open file `!.txt`
-      Cause: No such file or directory (os error 2)
-    ");
-    });
-}
-
 #[test]
 fn check_hints_hidden_unsafe_fixes() {
    let mut cmd = RuffCheck::default()
@@ -2172,10 +2155,16 @@ extend-safe-fixes = ["RUF9"]
    RUF903 Hey this is a stable test rule with a display only fix.
    --> -:1:1

+    RUF920 Hey this is a deprecated test rule.
+    --> -:1:1
+
+    RUF921 Hey this is another deprecated test rule.
+    --> -:1:1
+
    RUF950 Hey this is a test rule that was redirected from another.
    --> -:1:1

-    Found 5 errors.
+    Found 7 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).

    ----- stderr -----
--- 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()?;
@@ -2445,7 +2401,6 @@ requires-python = ">= 3.11"
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -2477,320 +2432,6 @@ requires-python = ">= 3.11"
    Ok(())
 }

-/// ```
-/// tmp
-/// ├── pyproject.toml #<--- no `[tool.ruff]`
-/// └── test.py
-/// ```
-#[test]
-fn requires_python_no_tool_preview_enabled() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
-    let ruff_toml = tempdir.path().join("pyproject.toml");
-    fs::write(
-        &ruff_toml,
-        r#"[project]
-requires-python = ">= 3.11"
-"#,
-    )?;
-
-    let testpy = tempdir.path().join("test.py");
-    fs::write(
-        &testpy,
-        r#"from typing import Union;foo: Union[int, str] = 1"#,
-    )?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--preview")
-            .arg("--show-settings")
-            .args(["--select","UP007"])
-            .arg("test.py")
-            .arg("-")
-            .current_dir(project_dir)
-            , @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        Resolved settings for: "[TMP]/test.py"
-
-        # General Settings
-        cache_dir = "[TMP]/.ruff_cache"
-        fix = false
-        fix_only = false
-        output_format = concise
-        show_fixes = false
-        unsafe_fixes = hint
-
-        # File Resolver Settings
-        file_resolver.exclude = [
-        	".bzr",
-        	".direnv",
-        	".eggs",
-        	".git",
-        	".git-rewrite",
-        	".hg",
-        	".ipynb_checkpoints",
-        	".mypy_cache",
-        	".nox",
-        	".pants.d",
-        	".pyenv",
-        	".pytest_cache",
-        	".pytype",
-        	".ruff_cache",
-        	".svn",
-        	".tox",
-        	".venv",
-        	".vscode",
-        	"__pypackages__",
-        	"_build",
-        	"buck-out",
-        	"dist",
-        	"node_modules",
-        	"site-packages",
-        	"venv",
-        ]
-        file_resolver.extend_exclude = []
-        file_resolver.force_exclude = false
-        file_resolver.include = [
-        	"*.py",
-        	"*.pyi",
-        	"*.pyw",
-        	"*.ipynb",
-        	"**/pyproject.toml",
-        ]
-        file_resolver.extend_include = []
-        file_resolver.respect_gitignore = true
-        file_resolver.project_root = "[TMP]/"
-
-        # Linter Settings
-        linter.exclude = []
-        linter.project_root = "[TMP]/"
-        linter.rules.enabled = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.rules.should_fix = [
-        	non-pep604-annotation-union (UP007),
-        ]
-        linter.per_file_ignores = {}
-        linter.safety_table.forced_safe = []
-        linter.safety_table.forced_unsafe = []
-        linter.unresolved_target_version = 3.11
-        linter.per_file_target_version = {}
-        linter.preview = enabled
-        linter.explicit_preview_rules = false
-        linter.extension = ExtensionMapping({})
-        linter.allowed_confusables = []
-        linter.builtins = []
-        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
-        linter.external = []
-        linter.ignore_init_module_imports = true
-        linter.logger_objects = []
-        linter.namespace_packages = []
-        linter.src = [
-        	"[TMP]/",
-        	"[TMP]/src",
-        ]
-        linter.tab_size = 4
-        linter.line_length = 88
-        linter.task_tags = [
-        	TODO,
-        	FIXME,
-        	XXX,
-        ]
-        linter.typing_modules = []
-        linter.typing_extensions = true
-
-        # Linter Plugins
-        linter.flake8_annotations.mypy_init_return = false
-        linter.flake8_annotations.suppress_dummy_args = false
-        linter.flake8_annotations.suppress_none_returning = false
-        linter.flake8_annotations.allow_star_arg_any = false
-        linter.flake8_annotations.ignore_fully_untyped = false
-        linter.flake8_bandit.hardcoded_tmp_directory = [
-        	/tmp,
-        	/var/tmp,
-        	/dev/shm,
-        ]
-        linter.flake8_bandit.check_typed_exception = false
-        linter.flake8_bandit.extend_markup_names = []
-        linter.flake8_bandit.allowed_markup_calls = []
-        linter.flake8_bugbear.extend_immutable_calls = []
-        linter.flake8_builtins.allowed_modules = []
-        linter.flake8_builtins.ignorelist = []
-        linter.flake8_builtins.strict_checking = false
-        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
-        linter.flake8_copyright.author = none
-        linter.flake8_copyright.min_file_size = 0
-        linter.flake8_errmsg.max_string_length = 0
-        linter.flake8_gettext.functions_names = [
-        	_,
-        	gettext,
-        	ngettext,
-        ]
-        linter.flake8_implicit_str_concat.allow_multiline = true
-        linter.flake8_import_conventions.aliases = {
-        	altair = alt,
-        	holoviews = hv,
-        	matplotlib = mpl,
-        	matplotlib.pyplot = plt,
-        	networkx = nx,
-        	numpy = np,
-        	numpy.typing = npt,
-        	pandas = pd,
-        	panel = pn,
-        	plotly.express = px,
-        	polars = pl,
-        	pyarrow = pa,
-        	seaborn = sns,
-        	tensorflow = tf,
-        	tkinter = tk,
-        	xml.etree.ElementTree = ET,
-        }
-        linter.flake8_import_conventions.banned_aliases = {}
-        linter.flake8_import_conventions.banned_from = []
-        linter.flake8_pytest_style.fixture_parentheses = false
-        linter.flake8_pytest_style.parametrize_names_type = tuple
-        linter.flake8_pytest_style.parametrize_values_type = list
-        linter.flake8_pytest_style.parametrize_values_row_type = tuple
-        linter.flake8_pytest_style.raises_require_match_for = [
-        	BaseException,
-        	Exception,
-        	ValueError,
-        	OSError,
-        	IOError,
-        	EnvironmentError,
-        	socket.error,
-        ]
-        linter.flake8_pytest_style.raises_extend_require_match_for = []
-        linter.flake8_pytest_style.mark_parentheses = false
-        linter.flake8_quotes.inline_quotes = double
-        linter.flake8_quotes.multiline_quotes = double
-        linter.flake8_quotes.docstring_quotes = double
-        linter.flake8_quotes.avoid_escape = true
-        linter.flake8_self.ignore_names = [
-        	_make,
-        	_asdict,
-        	_replace,
-        	_fields,
-        	_field_defaults,
-        	_name_,
-        	_value_,
-        ]
-        linter.flake8_tidy_imports.ban_relative_imports = "parents"
-        linter.flake8_tidy_imports.banned_api = {}
-        linter.flake8_tidy_imports.banned_module_level_imports = []
-        linter.flake8_type_checking.strict = false
-        linter.flake8_type_checking.exempt_modules = [
-        	typing,
-        	typing_extensions,
-        ]
-        linter.flake8_type_checking.runtime_required_base_classes = []
-        linter.flake8_type_checking.runtime_required_decorators = []
-        linter.flake8_type_checking.quote_annotations = false
-        linter.flake8_unused_arguments.ignore_variadic_names = false
-        linter.isort.required_imports = []
-        linter.isort.combine_as_imports = false
-        linter.isort.force_single_line = false
-        linter.isort.force_sort_within_sections = false
-        linter.isort.detect_same_package = true
-        linter.isort.case_sensitive = false
-        linter.isort.force_wrap_aliases = false
-        linter.isort.force_to_top = []
-        linter.isort.known_modules = {}
-        linter.isort.order_by_type = true
-        linter.isort.relative_imports_order = furthest_to_closest
-        linter.isort.single_line_exclusions = []
-        linter.isort.split_on_trailing_comma = true
-        linter.isort.classes = []
-        linter.isort.constants = []
-        linter.isort.variables = []
-        linter.isort.no_lines_before = []
-        linter.isort.lines_after_imports = -1
-        linter.isort.lines_between_types = 0
-        linter.isort.forced_separate = []
-        linter.isort.section_order = [
-        	known { type = future },
-        	known { type = standard_library },
-        	known { type = third_party },
-        	known { type = first_party },
-        	known { type = local_folder },
-        ]
-        linter.isort.default_section = known { type = third_party }
-        linter.isort.no_sections = false
-        linter.isort.from_first = false
-        linter.isort.length_sort = false
-        linter.isort.length_sort_straight = false
-        linter.mccabe.max_complexity = 10
-        linter.pep8_naming.ignore_names = [
-        	setUp,
-        	tearDown,
-        	setUpClass,
-        	tearDownClass,
-        	setUpModule,
-        	tearDownModule,
-        	asyncSetUp,
-        	asyncTearDown,
-        	setUpTestData,
-        	failureException,
-        	longMessage,
-        	maxDiff,
-        ]
-        linter.pep8_naming.classmethod_decorators = []
-        linter.pep8_naming.staticmethod_decorators = []
-        linter.pycodestyle.max_line_length = 88
-        linter.pycodestyle.max_doc_length = none
-        linter.pycodestyle.ignore_overlong_task_comments = false
-        linter.pyflakes.extend_generics = []
-        linter.pyflakes.allowed_unused_imports = []
-        linter.pylint.allow_magic_value_types = [
-        	str,
-        	bytes,
-        ]
-        linter.pylint.allow_dunder_method_names = []
-        linter.pylint.max_args = 5
-        linter.pylint.max_positional_args = 5
-        linter.pylint.max_returns = 6
-        linter.pylint.max_bool_expr = 5
-        linter.pylint.max_branches = 12
-        linter.pylint.max_statements = 50
-        linter.pylint.max_public_methods = 20
-        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
-        linter.pyupgrade.keep_runtime_typing = false
-        linter.ruff.parenthesize_tuple_in_subscript = false
-
-        # Formatter Settings
-        formatter.exclude = []
-        formatter.unresolved_target_version = 3.11
-        formatter.per_file_target_version = {}
-        formatter.preview = enabled
-        formatter.line_width = 88
-        formatter.line_ending = auto
-        formatter.indent_style = space
-        formatter.indent_width = 4
-        formatter.quote_style = double
-        formatter.magic_trailing_comma = respect
-        formatter.docstring_code_format = disabled
-        formatter.docstring_code_line_width = dynamic
-
-        # Analyze Settings
-        analyze.exclude = []
-        analyze.preview = enabled
-        analyze.target_version = 3.11
-        analyze.string_imports = disabled
-        analyze.extension = ExtensionMapping({})
-        analyze.include_dependencies = {}
-
-        ----- stderr -----
-        "#);
-    });
-    Ok(())
-}
-
 /// ```
 /// tmp
 /// ├── pyproject.toml #<--- no `[tool.ruff]`
@@ -3072,7 +2713,6 @@ requires-python = ">= 3.11"
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -3437,7 +3077,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -3818,7 +3457,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4147,7 +3785,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4476,7 +4113,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4762,7 +4398,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -5101,7 +4736,6 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
-        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -5425,59 +5059,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() {
@@ -6199,34 +5780,26 @@ match 42:  # invalid-syntax
    Ok(())
 }

-#[test_case::test_case("concise"; "concise_show_fixes")]
-#[test_case::test_case("full"; "full_show_fixes")]
-#[test_case::test_case("grouped"; "grouped_show_fixes")]
-fn output_format_show_fixes(output_format: &str) -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let input = tempdir.path().join("input.py");
-    fs::write(&input, "import os  # F401")?;
-
-    let snapshot = format!("output_format_show_fixes_{output_format}");
-
+#[test]
+fn future_annotations_preview_warning() {
    assert_cmd_snapshot!(
-        snapshot,
        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "check",
-                "--no-cache",
-                "--output-format",
-                output_format,
-                "--select",
-                "F401",
-                "--fix",
-                "--show-fixes",
-                "input.py",
-            ])
-            .current_dir(&tempdir),
-    );
+            .args(STDIN_BASE_OPTIONS)
+            .args(["--config", "lint.future-annotations = true"])
+            .args(["--select", "F"])
+            .arg("--no-preview")
+            .arg("-")
+            .pass_stdin("1"),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!

-    Ok(())
+    ----- stderr -----
+    warning: The `lint.future-annotations` setting will have no effect because `preview` is disabled
+    ",
+    );
 }

 #[test]
@@ -6257,341 +5830,3 @@ nested_optional: Optional[Optional[Optional[str]]] = None
    ",
    );
 }
-
-#[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"/"),
-            (r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>")
-        ]
-    }, {
-    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: Panicked at <location> when checking `[TMP]/panic.py`: `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"/"),
-            (r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>"),
-        ]
-    }, {
-    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: Panicked at <location> when checking `[TMP]/panic.py`: `This is a fake panic for testing.`
-    --> [TMP]/panic.py:1:1
-    info: This indicates a bug in Ruff.
-    info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
-    info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information
-
-    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 that the same rule fires across all supported extensions, but not on unsupported files
-#[test]
-fn supported_file_extensions() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let inner_dir = tempdir.path().join("src");
-    fs::create_dir(&inner_dir)?;
-
-    // Create files of various types
-    // text file
-    fs::write(inner_dir.join("thing.txt"), b"hello world\n")?;
-    // regular python
-    fs::write(
-        inner_dir.join("thing.py"),
-        b"import os\nprint('hello world')\n",
-    )?;
-    // python typestub
-    fs::write(
-        inner_dir.join("thing.pyi"),
-        b"import os\nclass foo:\n  ...\n",
-    )?;
-    // windows gui
-    fs::write(
-        inner_dir.join("thing.pyw"),
-        b"import os\nprint('hello world')\n",
-    )?;
-    // cython
-    fs::write(
-        inner_dir.join("thing.pyx"),
-        b"import os\ncdef int add(int a, int b):\n  return a + b\n",
-    )?;
-    // notebook
-    fs::write(
-        inner_dir.join("thing.ipynb"),
-        r#"
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.0"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#,
-    )?;
-
-    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", "F401", "--output-format=concise", "--no-cache"])
-            .args([inner_dir]),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    [TMP]/src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
-    [TMP]/src/thing.py:1:8: F401 [*] `os` imported but unused
-    [TMP]/src/thing.pyi:1:8: F401 [*] `os` imported but unused
-    Found 3 errors.
-    [*] 3 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-    Ok(())
-}
-
-/// Test that the same rule fires across all supported extensions, but not on unsupported files
-#[test]
-fn supported_file_extensions_preview_enabled() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let inner_dir = tempdir.path().join("src");
-    fs::create_dir(&inner_dir)?;
-
-    // Create files of various types
-    // text file
-    fs::write(inner_dir.join("thing.txt"), b"hello world\n")?;
-    // regular python
-    fs::write(
-        inner_dir.join("thing.py"),
-        b"import os\nprint('hello world')\n",
-    )?;
-    // python typestub
-    fs::write(
-        inner_dir.join("thing.pyi"),
-        b"import os\nclass foo:\n  ...\n",
-    )?;
-    // windows gui
-    fs::write(
-        inner_dir.join("thing.pyw"),
-        b"import os\nprint('hello world')\n",
-    )?;
-    // cython
-    fs::write(
-        inner_dir.join("thing.pyx"),
-        b"import os\ncdef int add(int a, int b):\n  return a + b\n",
-    )?;
-    // notebook
-    fs::write(
-        inner_dir.join("thing.ipynb"),
-        r#"
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.0"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#,
-    )?;
-
-    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", "F401", "--preview", "--output-format=concise", "--no-cache"])
-            .args([inner_dir]),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    [TMP]/src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
-    [TMP]/src/thing.py:1:8: F401 [*] `os` imported but unused
-    [TMP]/src/thing.pyi:1:8: F401 [*] `os` imported but unused
-    [TMP]/src/thing.pyw:1:8: F401 [*] `os` imported but unused
-    Found 4 errors.
-    [*] 4 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-    });
-    Ok(())
-}
--- a/crates/ruff/tests/snapshots/format__output_format_azure.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_azure.snap
@@ -1,19 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - azure
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=1;code=unformatted;]File would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_concise.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_concise.snap
@@ -1,20 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - concise
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-input.py:1:1: unformatted: File would be reformatted
-1 file would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_full.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_full.snap
@@ -1,26 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - full
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-unformatted: File would be reformatted
- --> input.py:1:1
-  - 
-1 | from test import say_hy
-2 | 
-3 | if __name__ == "__main__":
-
-1 file would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_github.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_github.snap
@@ -1,19 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - github
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_gitlab.snap
@@ -1,38 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - gitlab
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-[
-  {
-    "check_name": "unformatted",
-    "description": "unformatted: File would be reformatted",
-    "severity": "major",
-    "fingerprint": "d868d7da11a65fcf",
-    "location": {
-      "path": "input.py",
-      "positions": {
-        "begin": {
-          "line": 1,
-          "column": 1
-        },
-        "end": {
-          "line": 2,
-          "column": 1
-        }
-      }
-    }
-  }
-]
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_grouped.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_grouped.snap
@@ -1,21 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - grouped
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-input.py:
-  1:1 unformatted: File would be reformatted
-
-1 file would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_json-lines.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_json-lines.snap
@@ -1,19 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - json-lines
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-{"cell":null,"code":"unformatted","end_location":{"column":1,"row":2},"filename":"[TMP]/input.py","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":null},"location":{"column":1,"row":1},"message":"File would be reformatted","noqa_row":null,"url":null}
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_json.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_json.snap
@@ -1,52 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - json
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-[
-  {
-    "cell": null,
-    "code": "unformatted",
-    "end_location": {
-      "column": 1,
-      "row": 2
-    },
-    "filename": "[TMP]/input.py",
-    "fix": {
-      "applicability": "safe",
-      "edits": [
-        {
-          "content": "",
-          "end_location": {
-            "column": 1,
-            "row": 2
-          },
-          "location": {
-            "column": 1,
-            "row": 1
-          }
-        }
-      ],
-      "message": null
-    },
-    "location": {
-      "column": 1,
-      "row": 1
-    },
-    "message": "File would be reformatted",
-    "noqa_row": null,
-    "url": null
-  }
-]
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_junit.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_junit.snap
@@ -1,26 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - junit
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="ruff" tests="1" failures="1" errors="0">
-    <testsuite name="[TMP]/input.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
-        <testcase name="org.ruff.unformatted" classname="[TMP]/input" line="1" column="1">
-            <failure message="File would be reformatted">line 1, col 1, File would be reformatted</failure>
-        </testcase>
-    </testsuite>
-</testsuites>
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_pylint.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_pylint.snap
@@ -1,18 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - pylint
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-input.py:1: [unformatted] File would be reformatted
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_rdjson.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_rdjson.snap
@@ -1,60 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - rdjson
-    - "--preview"
-    - "--check"
-    - input.py
---
-success: false
-exit_code: 1
----- stdout -----
-{
-  "diagnostics": [
-    {
-      "code": {
-        "value": "unformatted"
-      },
-      "location": {
-        "path": "[TMP]/input.py",
-        "range": {
-          "end": {
-            "column": 1,
-            "line": 2
-          },
-          "start": {
-            "column": 1,
-            "line": 1
-          }
-        }
-      },
-      "message": "File would be reformatted",
-      "suggestions": [
-        {
-          "range": {
-            "end": {
-              "column": 1,
-              "line": 2
-            },
-            "start": {
-              "column": 1,
-              "line": 1
-            }
-          },
-          "text": ""
-        }
-      ]
-    }
-  ],
-  "severity": "WARNING",
-  "source": {
-    "name": "ruff",
-    "url": "https://docs.astral.sh/ruff"
-  }
-}
----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_sarif.snap
@@ -1,81 +0,0 @@
---
-source: crates/ruff/tests/format.rs
-info:
-  program: ruff
-  args:
-    - format
-    - "--no-cache"
-    - "--output-format"
-    - sarif
-    - "--preview"
-    - "--check"
-    - 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": null
-              }
-            }
-          ],
-          "level": "error",
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "[TMP]/input.py"
-                },
-                "region": {
-                  "endColumn": 1,
-                  "endLine": 2,
-                  "startColumn": 1,
-                  "startLine": 1
-                }
-              }
-            }
-          ],
-          "message": {
-            "text": "File would be reformatted"
-          },
-          "ruleId": "unformatted"
-        }
-      ],
-      "tool": {
-        "driver": {
-          "informationUri": "https://github.com/astral-sh/ruff",
-          "name": "ruff",
-          "rules": [],
-          "version": "[VERSION]"
-        }
-      }
-    }
-  ],
-  "version": "2.1.0"
-}
----- stderr -----
--- a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
@@ -44,43 +44,6 @@ import some_module
 __all__ = ["some_module"]
 ```

-## Preview
-When [preview] is enabled (and certain simplifying assumptions
-are met), we analyze all import statements for a given module
-when determining whether an import is used, rather than simply
-the last of these statements. This can result in both different and
-more import statements being marked as unused.
-
-For example, if a module consists of
-
-```python
-import a
-import a.b
-```
-
-then both statements are marked as unused under [preview], whereas
-only the second is marked as unused under stable behavior.
-
-As another example, if a module consists of
-
-```python
-import a.b
-import a
-
-a.b.foo()
-```
-
-then a diagnostic will only be emitted for the first line under [preview],
-whereas a diagnostic would only be emitted for the second line under
-stable behavior.
-
-Note that this behavior is somewhat subjective and is designed
-to conform to the developer's intuition rather than Python's actual
-execution. To wit, the statement `import a.b` automatically executes
-`import a`, so in some sense `import a` is _always_ redundant
-in the presence of `import a.b`.
-
-
 ## Fix safety

 Fixes to remove unused imports are safe, except in `__init__.py` files.
@@ -92,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
@@ -124,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`
@@ -133,6 +97,4 @@ else:
 - [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)

-[preview]: https://docs.astral.sh/ruff/preview/
-
 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_gitlab.snap
@@ -20,59 +20,59 @@ exit_code: 1
  {
    "check_name": "F401",
    "description": "F401: `os` imported but unused",
-    "severity": "major",
    "fingerprint": "4dbad37161e65c72",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 1,
-          "column": 8
+          "column": 8,
+          "line": 1
        },
        "end": {
-          "line": 1,
-          "column": 10
+          "column": 10,
+          "line": 1
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "F821",
    "description": "F821: Undefined name `y`",
-    "severity": "major",
    "fingerprint": "7af59862a085230",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 2,
-          "column": 5
+          "column": 5,
+          "line": 2
        },
        "end": {
-          "line": 2,
-          "column": 6
+          "column": 6,
+          "line": 2
        }
      }
-    }
+    },
+    "severity": "major"
  },
  {
    "check_name": "invalid-syntax",
    "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "severity": "major",
    "fingerprint": "e558cec859bb66e8",
    "location": {
      "path": "input.py",
      "positions": {
        "begin": {
-          "line": 3,
-          "column": 1
+          "column": 1,
+          "line": 3
        },
        "end": {
-          "line": 3,
-          "column": 6
+          "column": 6,
+          "line": 3
        }
      }
-    }
+    },
+    "severity": "major"
  }
 ]
 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
@@ -22,30 +22,6 @@ exit_code: 1
    {
      "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": [
            {
@@ -119,7 +95,7 @@ exit_code: 1
          "rules": [
            {
              "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\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\n[preview]: https://docs.astral.sh/ruff/preview/\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/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"
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_concise.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_concise.snap
@@ -1,26 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - concise
-    - "--select"
-    - F401
-    - "--fix"
-    - "--show-fixes"
-    - input.py
---
-success: true
-exit_code: 0
----- stdout -----
-
-Fixed 1 error:
- input.py:
-    1 × F401 (unused-import)
-
-Found 1 error (1 fixed, 0 remaining).
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_full.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_full.snap
@@ -1,26 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - full
-    - "--select"
-    - F401
-    - "--fix"
-    - "--show-fixes"
-    - input.py
---
-success: true
-exit_code: 0
----- stdout -----
-
-Fixed 1 error:
- input.py:
-    1 × F401 (unused-import)
-
-Found 1 error (1 fixed, 0 remaining).
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_grouped.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_grouped.snap
@@ -1,26 +0,0 @@
---
-source: crates/ruff/tests/lint.rs
-info:
-  program: ruff
-  args:
-    - check
-    - "--no-cache"
-    - "--output-format"
-    - grouped
-    - "--select"
-    - F401
-    - "--fix"
-    - "--show-fixes"
-    - input.py
---
-success: true
-exit_code: 0
----- stdout -----
-
-Fixed 1 error:
- input.py:
-    1 × F401 (unused-import)
-
-Found 1 error (1 fixed, 0 remaining).
-
----- stderr -----
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -371,7 +371,6 @@ linter.pylint.max_branches = 12
 linter.pylint.max_statements = 50
 linter.pylint.max_public_methods = 20
 linter.pylint.max_locals = 15
-linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false

--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -56,7 +56,6 @@ pub(crate) struct DisplayList<'a> {
    pub(crate) stylesheet: &'a Stylesheet,
    pub(crate) anonymized_line_numbers: bool,
    pub(crate) cut_indicator: &'static str,
-    pub(crate) lineno_offset: usize,
 }

 impl PartialEq for DisplayList<'_> {
@@ -82,14 +81,13 @@ impl Display for DisplayList<'_> {
                _ => max,
            })
        });
-        let lineno_width = self.lineno_offset
-            + if lineno_width == 0 {
-                lineno_width
-            } else if self.anonymized_line_numbers {
-                ANONYMIZED_LINE_NUM.len()
-            } else {
-                ((lineno_width as f64).log10().floor() as usize) + 1
-            };
+        let lineno_width = if lineno_width == 0 {
+            lineno_width
+        } else if self.anonymized_line_numbers {
+            ANONYMIZED_LINE_NUM.len()
+        } else {
+            ((lineno_width as f64).log10().floor() as usize) + 1
+        };

        let multiline_depth = self.body.iter().fold(0, |max, set| {
            set.display_lines.iter().fold(max, |max2, line| match line {
@@ -126,7 +124,6 @@ impl<'a> DisplayList<'a> {
        term_width: usize,
        cut_indicator: &'static str,
    ) -> DisplayList<'a> {
-        let lineno_offset = message.lineno_offset;
        let body = format_message(
            message,
            term_width,
@@ -140,7 +137,6 @@ impl<'a> DisplayList<'a> {
            stylesheet,
            anonymized_line_numbers,
            cut_indicator,
-            lineno_offset,
        }
    }

@@ -1092,7 +1088,6 @@ fn format_message<'m>(
        footer,
        snippets,
        is_fixable,
-        lineno_offset: _,
    } = message;

    let mut sets = vec![];
--- a/crates/ruff_annotate_snippets/src/snippet.rs
+++ b/crates/ruff_annotate_snippets/src/snippet.rs
@@ -23,7 +23,6 @@ pub struct Message<'a> {
    pub(crate) snippets: Vec<Snippet<'a>>,
    pub(crate) footer: Vec<Message<'a>>,
    pub(crate) is_fixable: bool,
-    pub(crate) lineno_offset: usize,
 }

 impl<'a> Message<'a> {
@@ -60,16 +59,6 @@ impl<'a> Message<'a> {
        self.is_fixable = yes;
        self
    }
-
-    /// Add an offset used for aligning the header sigil (`-->`) with the line number separators.
-    ///
-    /// For normal diagnostics this is computed automatically based on the lines to be rendered.
-    /// This is intended only for use in the formatter, where we don't render a snippet directly but
-    /// still want the header to align with the diff.
-    pub fn lineno_offset(mut self, offset: usize) -> Self {
-        self.lineno_offset = offset;
-        self
-    }
 }

 /// Structure containing the slice of text to be annotated and
@@ -155,7 +144,7 @@ impl<'a> Annotation<'a> {
        self
    }

-    pub fn hide_snippet(mut self, yes: bool) -> Self {
+    pub fn is_file_level(mut self, yes: bool) -> Self {
        self.is_file_level = yes;
        self
    }
@@ -184,7 +173,6 @@ impl Level {
            snippets: vec![],
            footer: vec![],
            is_fixable: false,
-            lineno_offset: 0,
        }
    }

--- 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,7 +1,7 @@
 <svg width="740px" height="146px" 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_long_line.svg
+++ b/crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg
@@ -1,7 +1,7 @@
 <svg width="1196px" 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/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 {
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -444,12 +444,15 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
    criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
        b.iter_batched_ref(
            || {
-                // This is similar to the case above, but now the attributes are actually defined.
+                // This is is similar to the case above, but now the attributes are actually defined.
                // https://github.com/astral-sh/ty/issues/711
                setup_micro_case(
                    r#"
                    class C:
                        def f(self: "C"):
+                            self.a = ""
+                            self.b = ""
+
                            if isinstance(self.a, str):
                                return

@@ -463,56 +466,6 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                                return
                            if isinstance(self.b, str):
                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-
-                            self.a = ""
-                            self.b = ""
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_3(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_3]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression test for https://github.com/astral-sh/ty/issues/758
-                setup_micro_case(
-                    r#"
-                    class GridOut:
-                        def __init__(self: "GridOut") -> None:
-                            self._buffer = b""
-
-                        def _read_size_or_line(self: "GridOut", size: int = -1):
-                            if size > self._position:
-                                size = self._position
-                                pass
-                            if size == 0:
-                                return bytes()
-
-                            while size > 0:
-                                if self._buffer:
-                                    buf = self._buffer
-                                    self._buffer = b""
-                                else:
-                                    buf = b""
-
-                                if len(buf) > size:
-                                    self._buffer = buf
-                                    self._position -= len(self._buffer)
                    "#,
                )
            },
@@ -715,7 +668,6 @@ criterion_group!(
    benchmark_tuple_implicit_instance_attributes,
    benchmark_complex_constrained_attributes_1,
    benchmark_complex_constrained_attributes_2,
-    benchmark_complex_constrained_attributes_3,
    benchmark_many_enum_members,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -117,7 +117,7 @@ static COLOUR_SCIENCE: std::sync::LazyLock<Benchmark<'static>> = std::sync::Lazy
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY310,
        },
-        600,
+        477,
    )
 });

@@ -232,7 +232,7 @@ static STATIC_FRAME: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLo
            max_dep_date: "2025-08-09",
            python_version: PythonVersion::PY311,
        },
-        600,
+        500,
    )
 });

--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -34,7 +34,6 @@ 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 }
@@ -54,7 +53,7 @@ web-time = { version = "1.1.0" }
 etcetera = { workspace = true, optional = true }

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

 [features]
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -8,7 +8,6 @@ use ruff_text_size::{Ranged, TextRange, TextSize};

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

@@ -69,7 +68,6 @@ impl Diagnostic {
            parent: None,
            noqa_offset: None,
            secondary_code: None,
-            header_offset: 0,
        });
        Diagnostic { inner }
    }
@@ -351,13 +349,6 @@ impl Diagnostic {
        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.
@@ -433,23 +424,14 @@ impl Diagnostic {

    /// Returns the URL for the rule documentation, if it exists.
    pub fn to_ruff_url(&self) -> Option<String> {
-        match self.id() {
-            DiagnosticId::Panic
-            | DiagnosticId::Io
-            | DiagnosticId::InvalidSyntax
-            | DiagnosticId::RevealedType
-            | DiagnosticId::UnknownRule
-            | DiagnosticId::InvalidGlob
-            | DiagnosticId::EmptyInclude
-            | DiagnosticId::UnnecessaryOverridesSection
-            | DiagnosticId::UselessOverridesSection
-            | DiagnosticId::DeprecatedSetting
-            | DiagnosticId::Unformatted
-            | DiagnosticId::InvalidCliOption
-            | DiagnosticId::InternalError => None,
-            DiagnosticId::Lint(lint_name) => {
-                Some(format!("{}/rules/{lint_name}", env!("CARGO_PKG_HOMEPAGE")))
-            }
+        if self.is_invalid_syntax() {
+            None
+        } else {
+            Some(format!(
+                "{}/rules/{}",
+                env!("CARGO_PKG_HOMEPAGE"),
+                self.name()
+            ))
        }
    }

@@ -465,26 +447,24 @@ impl Diagnostic {

    /// 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()),
-        )
+    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
+    /// span has no range.
+    pub fn expect_ruff_start_location(&self) -> LineColumn {
+        self.expect_primary_span()
+            .expect_ruff_file()
+            .to_source_code()
+            .line_column(self.expect_range().start())
    }

    /// Computes the end source location for the message.
    ///
-    /// 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()),
-        )
+    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
+    /// span has no range.
+    pub fn expect_ruff_end_location(&self) -> LineColumn {
+        self.expect_primary_span()
+            .expect_ruff_file()
+            .to_source_code()
+            .line_column(self.expect_range().end())
    }

    /// Returns the [`SourceFile`] which the message belongs to.
@@ -505,27 +485,22 @@ impl Diagnostic {
        self.primary_span()?.range()
    }

-    /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
+    /// Returns the [`TextRange`] for the diagnostic.
    ///
-    /// 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)
+    /// Panics if the diagnostic has no primary span or if the span has no range.
+    pub fn expect_range(&self) -> TextRange {
+        self.range().expect("Expected a range for the primary span")
    }

-    /// Add an offset for aligning the header sigil with the line number separators in a diff.
-    pub fn set_header_offset(&mut self, offset: usize) {
-        Arc::make_mut(&mut self.inner).header_offset = offset;
+    /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
+    ///
+    /// Panics if either diagnostic has no primary span, if the span has no range, or if its file is
+    /// not a `SourceFile`.
+    pub fn ruff_start_ordering(&self, other: &Self) -> std::cmp::Ordering {
+        (self.expect_ruff_source_file(), self.expect_range().start()).cmp(&(
+            other.expect_ruff_source_file(),
+            other.expect_range().start(),
+        ))
    }
 }

@@ -540,7 +515,6 @@ struct DiagnosticInner {
    parent: Option<TextSize>,
    noqa_offset: Option<TextSize>,
    secondary_code: Option<SecondaryCode>,
-    header_offset: usize,
 }

 struct RenderingSortKey<'a> {
@@ -758,11 +732,11 @@ pub struct Annotation {
    is_primary: bool,
    /// The diagnostic tags associated with this annotation.
    tags: Vec<DiagnosticTag>,
-    /// Whether the snippet for this annotation should be hidden.
+    /// 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.
-    hide_snippet: bool,
+    is_file_level: bool,
 }

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

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

@@ -865,20 +839,19 @@ impl Annotation {
        self.tags.push(tag);
    }

-    /// Set whether or not the snippet on this annotation should be suppressed when rendering.
+    /// Set whether or not this annotation is file-level.
    ///
-    /// Such annotations are only rendered with their file name and range, if available. This is
-    /// intended for backwards compatibility with Ruff diagnostics, which historically used
+    /// 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. As of 2025-09-26 we also use this to suppress snippet rendering for formatter
-    /// diagnostics, which also need to have a range, so we probably can't eliminate this entirely.
-    pub fn hide_snippet(&mut self, yes: bool) {
-        self.hide_snippet = yes;
+    /// details.
+    pub fn set_file_level(&mut self, yes: bool) {
+        self.is_file_level = yes;
    }
 }

@@ -1033,17 +1006,6 @@ pub enum DiagnosticId {

    /// Use of a deprecated setting.
    DeprecatedSetting,
-
-    /// The code needs to be formatted.
-    Unformatted,
-
-    /// Use of an invalid command-line option.
-    InvalidCliOption,
-
-    /// An internal assumption was violated.
-    ///
-    /// This indicates a bug in the program rather than a user error.
-    InternalError,
 }

 impl DiagnosticId {
@@ -1083,9 +1045,6 @@ impl DiagnosticId {
            DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
            DiagnosticId::UselessOverridesSection => "useless-overrides-section",
            DiagnosticId::DeprecatedSetting => "deprecated-setting",
-            DiagnosticId::Unformatted => "unformatted",
-            DiagnosticId::InvalidCliOption => "invalid-cli-option",
-            DiagnosticId::InternalError => "internal-error",
        }
    }

@@ -1384,7 +1343,7 @@ impl DisplayDiagnosticConfig {
    }

    /// Whether to show a fix's availability or not.
-    pub fn with_show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
+    pub fn show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
        DisplayDiagnosticConfig {
            show_fix_status: yes,
            ..self
@@ -1405,20 +1364,12 @@ impl DisplayDiagnosticConfig {
    /// availability for unsafe or display-only fixes.
    ///
    /// Note that this option is currently ignored when `hide_severity` is false.
-    pub fn with_fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
+    pub fn fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
        DisplayDiagnosticConfig {
            fix_applicability: applicability,
            ..self
        }
    }
-
-    pub fn show_fix_status(&self) -> bool {
-        self.show_fix_status
-    }
-
-    pub fn fix_applicability(&self) -> Applicability {
-        self.fix_applicability
-    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1484,16 +1435,6 @@ pub enum DiagnosticFormat {
    /// Print diagnostics in the format expected by JUnit.
    #[cfg(feature = "junit")]
    Junit,
-    /// Print diagnostics in the JSON format used by GitLab [Code Quality] reports.
-    ///
-    /// [Code Quality]: https://docs.gitlab.com/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.
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -15,6 +15,7 @@ use crate::{
    Db,
    files::File,
    source::{SourceText, line_index, source_text},
+    system::SystemPath,
 };

 use super::{
@@ -24,15 +25,11 @@ use super::{

 use azure::AzureRenderer;
 use concise::ConciseRenderer;
-use github::GithubRenderer;
 use pylint::PylintRenderer;

 mod azure;
 mod concise;
 mod full;
-pub mod github;
-#[cfg(feature = "serde")]
-mod gitlab;
 #[cfg(feature = "serde")]
 mod json;
 #[cfg(feature = "serde")]
@@ -139,13 +136,6 @@ impl std::fmt::Display for DisplayDiagnostics<'_> {
            DiagnosticFormat::Junit => {
                junit::JunitRenderer::new(self.resolver).render(f, self.diagnostics)?;
            }
-            #[cfg(feature = "serde")]
-            DiagnosticFormat::Gitlab => {
-                gitlab::GitlabRenderer::new(self.resolver).render(f, self.diagnostics)?;
-            }
-            DiagnosticFormat::Github => {
-                GithubRenderer::new(self.resolver, "ty").render(f, self.diagnostics)?;
-            }
        }

        Ok(())
@@ -208,7 +198,6 @@ struct ResolvedDiagnostic<'a> {
    message: String,
    annotations: Vec<ResolvedAnnotation<'a>>,
    is_fixable: bool,
-    header_offset: usize,
 }

 impl<'a> ResolvedDiagnostic<'a> {
@@ -259,8 +248,9 @@ impl<'a> ResolvedDiagnostic<'a> {
            id,
            message: diag.inner.message.as_str().to_string(),
            annotations,
-            is_fixable: config.show_fix_status && diag.has_applicable_fix(config),
-            header_offset: diag.inner.header_offset,
+            is_fixable: diag
+                .fix()
+                .is_some_and(|fix| fix.applies(config.fix_applicability)),
        }
    }

@@ -290,7 +280,6 @@ impl<'a> ResolvedDiagnostic<'a> {
            message: diag.inner.message.as_str().to_string(),
            annotations,
            is_fixable: false,
-            header_offset: 0,
        }
    }

@@ -388,7 +377,6 @@ impl<'a> ResolvedDiagnostic<'a> {
            message: &self.message,
            snippets_by_input,
            is_fixable: self.is_fixable,
-            header_offset: self.header_offset,
        }
    }
 }
@@ -408,7 +396,7 @@ struct ResolvedAnnotation<'a> {
    line_end: OneIndexed,
    message: Option<&'a str>,
    is_primary: bool,
-    hide_snippet: bool,
+    is_file_level: bool,
    notebook_index: Option<NotebookIndex>,
 }

@@ -456,7 +444,7 @@ impl<'a> ResolvedAnnotation<'a> {
            line_end,
            message: ann.get_message(),
            is_primary: ann.is_primary,
-            hide_snippet: ann.hide_snippet,
+            is_file_level: ann.is_file_level,
            notebook_index: resolver.notebook_index(&ann.span.file),
        })
    }
@@ -496,11 +484,6 @@ struct RenderableDiagnostic<'r> {
    ///
    /// This is rendered as a `[*]` indicator after the diagnostic ID.
    is_fixable: bool,
-    /// Offset to align the header sigil (`-->`) with the subsequent line number separators.
-    ///
-    /// This is only needed for formatter diagnostics where we don't render a snippet via
-    /// `annotate-snippets` and thus the alignment isn't computed automatically.
-    header_offset: usize,
 }

 impl RenderableDiagnostic<'_> {
@@ -513,11 +496,7 @@ impl RenderableDiagnostic<'_> {
                .iter()
                .map(|snippet| snippet.to_annotate(path))
        });
-        let mut message = self
-            .level
-            .title(self.message)
-            .is_fixable(self.is_fixable)
-            .lineno_offset(self.header_offset);
+        let mut message = self.level.title(self.message).is_fixable(self.is_fixable);
        if let Some(id) = self.id {
            message = message.id(id);
        }
@@ -722,8 +701,8 @@ struct RenderableAnnotation<'r> {
    message: Option<&'r str>,
    /// Whether this annotation is considered "primary" or not.
    is_primary: bool,
-    /// Whether the snippet for this annotation should be hidden instead of rendered.
-    hide_snippet: bool,
+    /// Whether this annotation applies to an entire file, rather than a snippet within it.
+    is_file_level: bool,
 }

 impl<'r> RenderableAnnotation<'r> {
@@ -745,7 +724,7 @@ impl<'r> RenderableAnnotation<'r> {
            range,
            message: ann.message,
            is_primary: ann.is_primary,
-            hide_snippet: ann.hide_snippet,
+            is_file_level: ann.is_file_level,
        }
    }

@@ -771,7 +750,7 @@ impl<'r> RenderableAnnotation<'r> {
        if let Some(message) = self.message {
            ann = ann.label(message);
        }
-        ann.hide_snippet(self.hide_snippet)
+        ann.is_file_level(self.is_file_level)
    }
 }

@@ -812,7 +791,7 @@ where
    T: Db,
 {
    fn path(&self, file: File) -> &str {
-        file.path(self).as_str()
+        relativize_path(self.system().current_directory(), file.path(self).as_str())
    }

    fn input(&self, file: File) -> Input {
@@ -848,7 +827,7 @@ where

 impl FileResolver for &dyn Db {
    fn path(&self, file: File) -> &str {
-        file.path(*self).as_str()
+        relativize_path(self.system().current_directory(), file.path(*self).as_str())
    }

    fn input(&self, file: File) -> Input {
@@ -967,6 +946,14 @@ fn context_after(
    line
 }

+/// Convert an absolute path to be relative to the current working directory.
+fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
+    if let Ok(path) = SystemPath::new(path).strip_prefix(cwd) {
+        return path.as_str();
+    }
+    path
+}
+
 /// Given some source code and annotation ranges, this routine replaces
 /// unprintable characters with printable representations of them.
 ///
@@ -2631,7 +2618,7 @@ watermelon
        /// Show fix availability when rendering.
        pub(super) fn show_fix_status(&mut self, yes: bool) {
            let mut config = std::mem::take(&mut self.config);
-            config = config.with_show_fix_status(yes);
+            config = config.show_fix_status(yes);
            self.config = config;
        }

@@ -2645,7 +2632,7 @@ watermelon
        /// The lowest fix applicability to show when rendering.
        pub(super) fn fix_applicability(&mut self, applicability: Applicability) {
            let mut config = std::mem::take(&mut self.config);
-            config = config.with_fix_applicability(applicability);
+            config = config.fix_applicability(applicability);
            self.config = config;
        }

--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -77,9 +77,11 @@ impl<'a> ConciseRenderer<'a> {
                    )?;
                }
                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))?;
+                    if let Some(fix) = diag.fix() {
+                        // Do not display an indicator for inapplicable fixes
+                        if fix.applies(self.config.fix_applicability) {
+                            write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
+                        }
                    }
                }
            } else {
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -1,11 +1,12 @@
 use std::borrow::Cow;
 use std::num::NonZeroUsize;

+use anstyle::Style;
+use ruff_notebook::NotebookIndex;
 use similar::{ChangeTag, TextDiff};

 use ruff_annotate_snippets::Renderer as AnnotateRenderer;
 use ruff_diagnostics::{Applicability, Fix};
-use ruff_notebook::NotebookIndex;
 use ruff_source_file::OneIndexed;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};

@@ -57,15 +58,13 @@ impl<'a> FullRenderer<'a> {
            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)?;
+
+            if self.config.show_fix_diff {
+                if let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver) {
+                    writeln!(f, "{diff}")?;
+                }
+            }
        }

        Ok(())
@@ -127,6 +126,19 @@ impl std::fmt::Display for Diff<'_> {
            vec![(None, source_text.text_len())]
        };

+        let message = match self.fix.applicability() {
+            // TODO(zanieb): Adjust this messaging once it's user-facing
+            Applicability::Safe => "Safe fix",
+            Applicability::Unsafe => "Unsafe fix",
+            Applicability::DisplayOnly => "Display-only fix",
+        };
+
+        // TODO(brent) `stylesheet.separator` is cyan rather than blue, as we had before. I think
+        // we're getting rid of this soon anyway, so I didn't think it was worth adding another
+        // style to the stylesheet temporarily. The color doesn't appear at all in the snapshot
+        // tests, which is the only place these are currently used.
+        writeln!(f, "ℹ {}", fmt_styled(message, self.stylesheet.separator))?;
+
        let mut last_end = TextSize::ZERO;
        for (cell, offset) in cells {
            let range = TextRange::new(last_end, offset);
@@ -155,67 +167,64 @@ impl std::fmt::Display for Diff<'_> {

            let diff = TextDiff::from_lines(input, &output);

-            let grouped_ops = diff.grouped_ops(3);
+            let (largest_old, largest_new) = diff
+                .ops()
+                .last()
+                .map(|op| (op.old_range().start, op.new_range().start))
+                .unwrap_or_default();

-            // 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();
+            let digit_with = OneIndexed::from_zero_indexed(largest_new.max(largest_old)).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)?;
+                // Room for 2 digits, 2 x 1 space before each digit, 1 space, and 1 `|`. This
+                // centers the three colons on the pipe.
+                writeln!(f, "{:>1$} cell {cell}", ":::", 2 * digit_with.get() + 4)?;
            }

-            for (idx, group) in grouped_ops.iter().enumerate() {
+            for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
                if idx > 0 {
                    writeln!(f, "{:-^1$}", "-", 80)?;
                }
                for op in group {
                    for change in diff.iter_inline_changes(op) {
-                        let (sign, 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 sign = match change.tag() {
+                            ChangeTag::Delete => "-",
+                            ChangeTag::Insert => "+",
+                            ChangeTag::Equal => " ",
                        };

-                        let line = Line {
-                            index: index.map(OneIndexed::from_zero_indexed),
-                            width: digit_with,
-                        };
+                        let line_style = LineStyle::from(change.tag(), self.stylesheet);
+
+                        let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
+                        let new_index = change.new_index().map(OneIndexed::from_zero_indexed);

                        write!(
                            f,
-                            "{line} {sign} ",
-                            line = fmt_styled(line, self.stylesheet.line_no),
-                            sign = fmt_styled(sign, line_no_style),
+                            "{} {} |{}",
+                            Line {
+                                index: old_index,
+                                width: digit_with,
+                            },
+                            Line {
+                                index: new_index,
+                                width: digit_with,
+                            },
+                            fmt_styled(line_style.apply_to(sign), self.stylesheet.emphasis),
                        )?;

                        for (emphasized, value) in change.iter_strings_lossy() {
                            let value = show_nonprinting(&value);
-                            let styled = fmt_styled(value, style);
                            if emphasized {
-                                write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?;
+                                write!(
+                                    f,
+                                    "{}",
+                                    fmt_styled(
+                                        line_style.apply_to(&value),
+                                        self.stylesheet.underline
+                                    )
+                                )?;
                            } else {
-                                write!(f, "{styled}")?;
+                                write!(f, "{}", line_style.apply_to(&value))?;
                            }
                        }
                        if change.missing_newline() {
@@ -226,38 +235,34 @@ impl std::fmt::Display for Diff<'_> {
            }
        }

-        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 LineStyle {
+    style: Style,
+}
+
+impl LineStyle {
+    fn apply_to(&self, input: &str) -> impl std::fmt::Display {
+        fmt_styled(input, self.style)
+    }
+
+    fn from(value: ChangeTag, stylesheet: &DiagnosticStylesheet) -> LineStyle {
+        match value {
+            ChangeTag::Equal => LineStyle {
+                style: stylesheet.none,
+            },
+            ChangeTag::Delete => LineStyle {
+                style: stylesheet.deletion,
+            },
+            ChangeTag::Insert => LineStyle {
+                style: stylesheet.insertion,
+            },
+        }
+    }
+}
+
 struct Line {
    index: Option<OneIndexed>,
    width: NonZeroUsize,
@@ -292,7 +297,7 @@ fn show_nonprinting(s: &str) -> Cow<'_, str> {

 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::{Applicability, Edit, Fix};
+    use ruff_diagnostics::{Applicability, Fix};
    use ruff_text_size::{TextLen, TextRange, TextSize};

    use crate::diagnostic::{
@@ -366,7 +371,6 @@ mod tests {
    fn hide_severity_output() {
        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
        env.hide_severity(true);
-        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);

        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
@@ -573,7 +577,7 @@ print()
        let mut diagnostic = env.err().build();
        let span = env.path("example.py").with_range(TextRange::default());
        let mut annotation = Annotation::primary(span);
-        annotation.hide_snippet(true);
+        annotation.set_file_level(true);
        diagnostic.annotate(annotation);

        insta::assert_snapshot!(env.render(&diagnostic), @r"
@@ -585,8 +589,7 @@ print()
    /// Check that ranges in notebooks are remapped relative to the cells.
    #[test]
    fn notebook_output() {
-        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_status(true);
+        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
@@ -700,9 +703,6 @@ print()
    fn notebook_output_with_diff() {
        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
        env.show_fix_diff(true);
-        env.show_fix_status(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
@@ -712,9 +712,11 @@ print()
          |        ^^
          |
        help: Remove unused import: `os`
-         ::: cell 1
-        1 | # cell 1
-          - import os
+
+        ℹ Safe fix
+           ::: cell 1
+        1 1 | # cell 1
+        2   |-import os

        error[unused-import][*]: `math` imported but unused
         --> notebook.ipynb:cell 2:2:8
@@ -726,13 +728,15 @@ print()
        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
+        ℹ Safe fix
+           ::: cell 2
+        1 1 | # cell 2
+        2   |-import math
+        3 2 | 
+        4 3 | print('hello world')
+
+        error[unused-variable]: Local variable `x` is assigned to but never used
         --> notebook.ipynb:cell 3:4:5
          |
        2 | def foo():
@@ -741,13 +745,14 @@ print()
          |     ^
          |
        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
+
+        ℹ Unsafe fix
+           ::: cell 3
+        1 1 | # cell 3
+        2 2 | def foo():
+        3 3 |     print()
+        4   |-    x = 1
+        5 4 |
        ");
    }

@@ -755,8 +760,6 @@ print()
    fn notebook_output_with_diff_spanning_cells() {
        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
        env.show_fix_diff(true);
-        env.show_fix_status(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.
@@ -769,7 +772,7 @@ print()
        *fix = Fix::unsafe_edits(edits.remove(0), edits);

        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[unused-import][*]: `os` imported but unused
+        error[unused-import]: `os` imported but unused
         --> notebook.ipynb:cell 1:2:8
          |
        1 | # cell 1
@@ -777,21 +780,22 @@ print()
          |        ^^
          |
        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
+
+        ℹ Unsafe fix
+           ::: cell 1
+        1 1 | # cell 1
+        2   |-import os
+           ::: cell 2
+        1 1 | # cell 2
+        2   |-import math
+        3 2 | 
+        4 3 | print('hello world')
+           ::: cell 3
+        1 1 | # cell 3
+        2 2 | def foo():
+        3 3 |     print()
+        4   |-    x = 1
+        5 4 |
        ");
    }

@@ -897,75 +901,4 @@ print()
          |
        ");
    }
-
-    /// 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.show_fix_status(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/crates/ruff_db/src/diagnostic/render/github.rs
+++ b/crates/ruff_db/src/diagnostic/render/github.rs
@@ -1,136 +0,0 @@
-use crate::diagnostic::{Diagnostic, FileResolver, Severity};
-
-pub struct GithubRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-    program: &'a str,
-}
-
-impl<'a> GithubRenderer<'a> {
-    pub fn new(resolver: &'a dyn FileResolver, program: &'a str) -> Self {
-        Self { resolver, program }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        for diagnostic in diagnostics {
-            let severity = match diagnostic.severity() {
-                Severity::Info => "notice",
-                Severity::Warning => "warning",
-                Severity::Error | Severity::Fatal => "error",
-            };
-            write!(
-                f,
-                "::{severity} title={program} ({code})",
-                program = self.program,
-                code = diagnostic.secondary_code_or_id()
-            )?;
-
-            if let Some(span) = diagnostic.primary_span() {
-                let file = span.file();
-                write!(f, ",file={file}", file = file.path(self.resolver))?;
-
-                let (start_location, end_location) = if self.resolver.is_notebook(file) {
-                    // We can't give a reasonable location for the structured formats,
-                    // so we show one that's clearly a fallback
-                    None
-                } else {
-                    let diagnostic_source = file.diagnostic_source(self.resolver);
-                    let source_code = diagnostic_source.as_source_code();
-
-                    span.range().map(|range| {
-                        (
-                            source_code.line_column(range.start()),
-                            source_code.line_column(range.end()),
-                        )
-                    })
-                }
-                .unwrap_or_default();
-
-                write!(
-                    f,
-                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                    row = start_location.line,
-                    column = start_location.column,
-                    end_row = end_location.line,
-                    end_column = end_location.column,
-                )?;
-
-                write!(
-                    f,
-                    "{path}:{row}:{column}: ",
-                    path = file.relative_path(self.resolver).display(),
-                    row = start_location.line,
-                    column = start_location.column,
-                )?;
-            } else {
-                write!(f, "::")?;
-            }
-
-            if let Some(code) = diagnostic.secondary_code() {
-                write!(f, "{code}")?;
-            } else {
-                write!(f, "{id}:", id = diagnostic.id())?;
-            }
-
-            writeln!(f, " {}", diagnostic.body())?;
-        }
-
-        Ok(())
-    }
-}
-
-pub struct DisplayGithubDiagnostics<'a> {
-    renderer: &'a GithubRenderer<'a>,
-    diagnostics: &'a [Diagnostic],
-}
-
-impl<'a> DisplayGithubDiagnostics<'a> {
-    pub fn new(renderer: &'a GithubRenderer<'a>, diagnostics: &'a [Diagnostic]) -> Self {
-        Self {
-            renderer,
-            diagnostics,
-        }
-    }
-}
-
-impl std::fmt::Display for DisplayGithubDiagnostics<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.renderer.render(f, self.diagnostics)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{TestEnvironment, create_diagnostics, create_syntax_error_diagnostics},
-    };
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Github);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Github);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-    }
-
-    #[test]
-    fn missing_file() {
-        let mut env = TestEnvironment::new();
-        env.format(DiagnosticFormat::Github);
-
-        let diag = env.err().build();
-
-        insta::assert_snapshot!(
-            env.render(&diag),
-            @"::error title=ty (test-diagnostic)::test-diagnostic: main diagnostic message",
-        );
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/gitlab.rs
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -1,205 +0,0 @@
-use std::{
-    collections::HashSet,
-    hash::{DefaultHasher, Hash, Hasher},
-    path::Path,
-};
-
-use ruff_source_file::LineColumn;
-use serde::{Serialize, Serializer, ser::SerializeSeq};
-
-use crate::diagnostic::{Diagnostic, Severity};
-
-use super::FileResolver;
-
-pub(super) struct GitlabRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-}
-
-impl<'a> GitlabRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
-        Self { resolver }
-    }
-}
-
-impl GitlabRenderer<'_> {
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            serde_json::to_string_pretty(&SerializedMessages {
-                diagnostics,
-                resolver: self.resolver,
-                #[expect(
-                    clippy::disallowed_methods,
-                    reason = "We don't have access to a `System` here, \
-                              and this is only intended for use by GitLab CI, \
-                              which runs on a real `System`."
-                )]
-                project_dir: std::env::var("CI_PROJECT_DIR").ok().as_deref(),
-            })
-            .unwrap()
-        )
-    }
-}
-
-struct SerializedMessages<'a> {
-    diagnostics: &'a [Diagnostic],
-    resolver: &'a dyn FileResolver,
-    project_dir: Option<&'a str>,
-}
-
-impl Serialize for SerializedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
-        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
-
-        for diagnostic in self.diagnostics {
-            let location = diagnostic
-                .primary_span()
-                .map(|span| {
-                    let file = span.file();
-                    let positions = if self.resolver.is_notebook(file) {
-                        // We can't give a reasonable location for the structured formats,
-                        // so we show one that's clearly a fallback
-                        Default::default()
-                    } else {
-                        let diagnostic_source = file.diagnostic_source(self.resolver);
-                        let source_code = diagnostic_source.as_source_code();
-                        span.range()
-                            .map(|range| Positions {
-                                begin: source_code.line_column(range.start()),
-                                end: source_code.line_column(range.end()),
-                            })
-                            .unwrap_or_default()
-                    };
-
-                    let path = self.project_dir.as_ref().map_or_else(
-                        || file.relative_path(self.resolver).display().to_string(),
-                        |project_dir| relativize_path_to(file.path(self.resolver), project_dir),
-                    );
-
-                    Location { path, positions }
-                })
-                .unwrap_or_default();
-
-            let mut message_fingerprint = fingerprint(diagnostic, &location.path, 0);
-
-            // Make sure that we do not get a fingerprint that is already in use
-            // by adding in the previously generated one.
-            while fingerprints.contains(&message_fingerprint) {
-                message_fingerprint = fingerprint(diagnostic, &location.path, message_fingerprint);
-            }
-            fingerprints.insert(message_fingerprint);
-
-            let description = diagnostic.body();
-            let check_name = diagnostic.secondary_code_or_id();
-            let severity = match diagnostic.severity() {
-                Severity::Info => "info",
-                Severity::Warning => "minor",
-                Severity::Error => "major",
-                // Another option here is `blocker`
-                Severity::Fatal => "critical",
-            };
-
-            let value = Message {
-                check_name,
-                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
-                // so prepend it to the description too.
-                description: format!("{check_name}: {description}"),
-                severity,
-                fingerprint: format!("{:x}", message_fingerprint),
-                location,
-            };
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-#[derive(Serialize)]
-struct Message<'a> {
-    check_name: &'a str,
-    description: String,
-    severity: &'static str,
-    fingerprint: String,
-    location: Location,
-}
-
-/// The place in the source code where the issue was discovered.
-///
-/// According to the CodeClimate report format [specification] linked from the GitLab [docs], this
-/// field is required, so we fall back on a default `path` and position if the diagnostic doesn't
-/// have a primary span.
-///
-/// [specification]: https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types
-/// [docs]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
-#[derive(Default, Serialize)]
-struct Location {
-    path: String,
-    positions: Positions,
-}
-
-#[derive(Default, Serialize)]
-struct Positions {
-    begin: LineColumn,
-    end: LineColumn,
-}
-
-/// Generate a unique fingerprint to identify a violation.
-fn fingerprint(diagnostic: &Diagnostic, project_path: &str, salt: u64) -> u64 {
-    let mut hasher = DefaultHasher::new();
-
-    salt.hash(&mut hasher);
-    diagnostic.name().hash(&mut hasher);
-    project_path.hash(&mut hasher);
-
-    hasher.finish()
-}
-
-/// Convert an absolute path to be relative to the specified project root.
-fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
-    format!(
-        "{}",
-        pathdiff::diff_paths(&path, project_root)
-            .expect("Could not diff paths")
-            .display()
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
-    };
-
-    const FINGERPRINT_FILTERS: [(&str, &str); 1] = [(
-        r#""fingerprint": "[a-z0-9]+","#,
-        r#""fingerprint": "<redacted>","#,
-    )];
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
-##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
-##vso[task.logissue type=error;sourcepath=/undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
+##vso[task.logissue type=error;sourcepath=fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
+##vso[task.logissue type=error;sourcepath=fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
+##vso[task.logissue type=error;sourcepath=undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__output.snap
@@ -1,7 +0,0 @@
---
-source: crates/ruff_db/src/diagnostic/render/github.rs
-expression: env.render_diagnostics(&diagnostics)
---
-::error title=ty (F401),file=/fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
-::error title=ty (F841),file=/fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
-::error title=ty (F821),file=/undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
@@ -1,6 +0,0 @@
---
-source: crates/ruff_db/src/diagnostic/render/github.rs
-expression: env.render_diagnostics(&diagnostics)
---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 10,
      "row": 2
    },
-    "filename": "/notebook.ipynb",
+    "filename": "notebook.ipynb",
    "fix": {
      "applicability": "safe",
      "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 12,
      "row": 2
    },
-    "filename": "/notebook.ipynb",
+    "filename": "notebook.ipynb",
    "fix": {
      "applicability": "safe",
      "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 6,
      "row": 4
    },
-    "filename": "/notebook.ipynb",
+    "filename": "notebook.ipynb",
    "fix": {
      "applicability": "unsafe",
      "edits": [
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 10,
      "row": 1
    },
-    "filename": "/fib.py",
+    "filename": "fib.py",
    "fix": {
      "applicability": "unsafe",
      "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 6,
      "row": 6
    },
-    "filename": "/fib.py",
+    "filename": "fib.py",
    "fix": {
      "applicability": "unsafe",
      "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 5,
      "row": 1
    },
-    "filename": "/undef.py",
+    "filename": "undef.py",
    "fix": null,
    "location": {
      "column": 4,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 1,
      "row": 2
    },
-    "filename": "/syntax_errors.py",
+    "filename": "syntax_errors.py",
    "fix": null,
    "location": {
      "column": 15,
@@ -27,7 +27,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 1,
      "row": 4
    },
-    "filename": "/syntax_errors.py",
+    "filename": "syntax_errors.py",
    "fix": null,
    "location": {
      "column": 12,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"/notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"/fib.py","fix":{"applicability":"unsafe","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":"F841","end_location":{"column":6,"row":6},"filename":"/fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
-{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"/undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
+{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"unsafe","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":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"/syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"/syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__output.snap
@@ -4,16 +4,16 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="/fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="/fib" line="1" column="8">
+    <testsuite name="fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.F401" classname="fib" line="1" column="8">
            <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
        </testcase>
-        <testcase name="org.ruff.F841" classname="/fib" line="6" column="5">
+        <testcase name="org.ruff.F841" classname="fib" line="6" column="5">
            <failure message="Local variable `x` is assigned to but never used">line 6, col 5, Local variable `x` is assigned to but never used</failure>
        </testcase>
    </testsuite>
-    <testsuite name="/undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
-        <testcase name="org.ruff.F821" classname="/undef" line="1" column="4">
+    <testsuite name="undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
+        <testcase name="org.ruff.F821" classname="undef" line="1" column="4">
            <failure message="Undefined name `a`">line 1, col 4, Undefined name `a`</failure>
        </testcase>
    </testsuite>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
@@ -4,11 +4,11 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="2" failures="2" errors="0">
-    <testsuite name="/syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="1" column="15">
+    <testsuite name="syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="1" column="15">
            <failure message="Expected one or more symbol names after import">line 1, col 15, Expected one or more symbol names after import</failure>
        </testcase>
-        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="3" column="12">
+        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="3" column="12">
            <failure message="Expected &apos;)&apos;, found newline">line 3, col 12, Expected &apos;)&apos;, found newline</failure>
        </testcase>
    </testsuite>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F401"
      },
      "location": {
-        "path": "/fib.py",
+        "path": "fib.py",
        "range": {
          "end": {
            "column": 10,
@@ -45,7 +45,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F841"
      },
      "location": {
-        "path": "/fib.py",
+        "path": "fib.py",
        "range": {
          "end": {
            "column": 6,
@@ -80,7 +80,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F821"
      },
      "location": {
-        "path": "/undef.py",
+        "path": "undef.py",
        "range": {
          "end": {
            "column": 5,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
@@ -9,7 +9,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "invalid-syntax"
      },
      "location": {
-        "path": "/syntax_errors.py",
+        "path": "syntax_errors.py",
        "range": {
          "end": {
            "column": 1,
@@ -28,7 +28,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "invalid-syntax"
      },
      "location": {
-        "path": "/syntax_errors.py",
+        "path": "syntax_errors.py",
        "range": {
          "end": {
            "column": 1,
--- a/crates/ruff_db/src/diagnostic/stylesheet.rs
+++ b/crates/ruff_db/src/diagnostic/stylesheet.rs
@@ -40,13 +40,12 @@ pub struct DiagnosticStylesheet {
    pub(crate) help: Style,
    pub(crate) line_no: Style,
    pub(crate) emphasis: Style,
+    pub(crate) underline: Style,
    pub(crate) none: Style,
    pub(crate) separator: Style,
    pub(crate) secondary_code: Style,
    pub(crate) insertion: Style,
    pub(crate) deletion: Style,
-    pub(crate) insertion_line_no: Style,
-    pub(crate) deletion_line_no: Style,
 }

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

@@ -86,13 +84,12 @@ impl DiagnosticStylesheet {
            help: Style::new(),
            line_no: Style::new(),
            emphasis: Style::new(),
+            underline: Style::new(),
            none: Style::new(),
            separator: Style::new(),
            secondary_code: Style::new(),
            insertion: Style::new(),
            deletion: Style::new(),
-            insertion_line_no: Style::new(),
-            deletion_line_no: Style::new(),
        }
    }
 }
--- a/Show More
+++ b/Show More