[ty] enum.Flag

.github/CODEOWNERS

@@ -19,10 +19,6 @@
 
 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ruff_db/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager

.github/workflows/build-binaries.yml

@@ -39,17 +39,17 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build sdist"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           command: sdist
           args: --out dist
@@ -68,18 +68,18 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: x86_64
           args: --release --locked --out dist
@@ -110,18 +110,18 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: arm64
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: aarch64
           args: --release --locked --out dist
@@ -166,18 +166,18 @@ jobs:
           - target: aarch64-pc-windows-msvc
             arch: x64
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.platform.arch }}
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           args: --release --locked --out dist
@@ -219,18 +219,18 @@ jobs:
           - x86_64-unknown-linux-gnu
           - i686-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.target }}
           manylinux: auto
@@ -292,21 +292,19 @@ jobs:
             maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
           - target: arm-unknown-linux-musleabihf
             arch: arm
-          - target: riscv64gc-unknown-linux-gnu
-            arch: riscv64
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           manylinux: auto
@@ -321,7 +319,7 @@ jobs:
           githubToken: ${{ github.token }}
           install: |
             apt-get update
-            apt-get install -y --no-install-recommends python3 python3-pip libatomic1
+            apt-get install -y --no-install-recommends python3 python3-pip
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
@@ -361,18 +359,18 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
@@ -427,17 +425,17 @@ jobs:
             arch: armv7
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2

.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@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -63,7 +63,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         with:
           images: ${{ env.RUFF_BASE_IMG }}
           # Defining this makes sure the org.opencontainers.image.version OCI label becomes the actual release version and not the branch name
@@ -113,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-*
@@ -123,7 +123,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         with:
           images: ${{ env.RUFF_BASE_IMG }}
           # Order is on purpose such that the label org.opencontainers.image.version has the first pattern with the full version
@@ -131,7 +131,7 @@ jobs:
             type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
             type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
     steps:
       - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -219,7 +219,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         # ghcr.io prefers index level annotations
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -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-*
@@ -266,7 +266,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: index
         with:
@@ -276,7 +276,7 @@ jobs:
             type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
             type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
 
-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/ci.yaml

@@ -38,12 +38,11 @@ jobs:
       fuzz: ${{ steps.check_fuzzer.outputs.changed }}
       # Flag that is set to "true" when code related to ty changes.
       ty: ${{ steps.check_ty.outputs.changed }}
-      # Flag that is set to "true" when code related to the py-fuzzer folder changes.
-      py-fuzzer: ${{ steps.check_py_fuzzer.outputs.changed }}
+
       # Flag that is set to "true" when code related to the playground changes.
       playground: ${{ steps.check_playground.outputs.changed }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -69,6 +68,7 @@ jobs:
             ':crates/ruff_text_size/**' \
             ':crates/ruff_python_ast/**' \
             ':crates/ruff_python_parser/**' \
+            ':python/py-fuzzer/**' \
             ':.github/workflows/ci.yaml' \
           ; then
               echo "changed=false" >> "$GITHUB_OUTPUT"
@@ -88,6 +88,7 @@ jobs:
             ':!crates/ruff_python_formatter/**' \
             ':!crates/ruff_formatter/**' \
             ':!crates/ruff_dev/**' \
+            ':!crates/ruff_db/**' \
             ':scripts/*' \
             ':python/**' \
             ':.github/workflows/ci.yaml' \
@@ -137,18 +138,6 @@ jobs:
               echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Check if the py-fuzzer code changed
-        id: check_py_fuzzer
-        env:
-          MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
-        run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py_fuzzer/**' \
-          ; then
-              echo "changed=false" >> "$GITHUB_OUTPUT"
-          else
-              echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Check if there was any code related change
         id: check_code
         env:
@@ -208,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
@@ -222,7 +211,7 @@ jobs:
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -242,26 +231,22 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
       - name: ty mdtests (GitHub annotations)
         if: ${{ needs.determine_changes.outputs.ty == 'true' }}
         env:
@@ -304,26 +289,22 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
       - name: "Run tests"
         shell: bash
         env:
@@ -337,20 +318,16 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-nextest
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-        with:
-          enable-cache: "true"
       - name: "Run tests"
         shell: bash
         env:
@@ -368,15 +345,15 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version: 22
+          node-version: 20
           cache: "npm"
           cache-dependency-path: playground/package-lock.json
       - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
@@ -397,14 +374,14 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
       - name: "Build"
         run: cargo build --release --locked
 
@@ -415,7 +392,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
@@ -429,7 +406,7 @@ jobs:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: rustup default "${MSRV}"
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
       - name: "Build tests"
         shell: bash
         env:
@@ -443,7 +420,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -452,7 +429,9 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+        uses: cargo-bins/cargo-binstall@808dcb1b503398677d089d3216c51ac7cc11e7ab # v1.14.2
+        with:
+          tool: cargo-fuzz@0.11.2
       - name: "Install cargo-fuzz"
         # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
         run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -464,16 +443,16 @@ jobs:
     needs:
       - cargo-test-linux
       - determine_changes
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.parser == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && needs.determine_changes.outputs.parser == 'true' }}
     timeout-minutes: 20
     env:
       FORCE_COLOR: 1
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         name: Download Ruff binary to test
         id: download-cached-binary
         with:
@@ -503,7 +482,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: 5
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -533,14 +512,14 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         name: Download comparison Ruff binary
         id: ruff-target
         with:
@@ -654,13 +633,13 @@ jobs:
       - cargo-test-linux
       - determine_changes
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.ty == 'true' }}
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         name: Download new ty binary
         id: ty-new
         with:
@@ -673,7 +652,7 @@ jobs:
           branch: ${{ github.event.pull_request.base.ref }}
           workflow: "ci.yaml"
           check_artifacts: true
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: Fuzz
         env:
           FORCE_COLOR: 1
@@ -700,10 +679,10 @@ jobs:
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+      - uses: cargo-bins/cargo-binstall@808dcb1b503398677d089d3216c51ac7cc11e7ab # v1.14.2
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 
@@ -713,10 +692,10 @@ 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
@@ -724,7 +703,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           args: --out dist
       - name: "Test wheel"
@@ -740,16 +719,16 @@ jobs:
     runs-on: depot-ubuntu-22.04-16
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 22
       - name: "Cache pre-commit"
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -771,10 +750,10 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.13"
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -786,7 +765,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: Install uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         run: uv pip install -r docs/requirements-insiders.txt --system
@@ -813,7 +792,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
@@ -839,18 +818,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 +860,13 @@ jobs:
       - determine_changes
     if: ${{ (needs.determine_changes.outputs.playground == 'true') }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 22
           cache: "npm"
@@ -906,73 +885,34 @@ jobs:
         run: npm run fmt:check
         working-directory: playground
 
-  benchmarks-instrumented-ruff:
-    name: "benchmarks instrumented (ruff)"
+  benchmarks-instrumented:
     runs-on: ubuntu-24.04
     needs: determine_changes
-    if: |
-      github.ref == 'refs/heads/main' || 
-      (needs.determine_changes.outputs.formatter == 'true' || needs.determine_changes.outputs.linter == 'true')
+    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-codspeed
 
       - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark formatter lexer linter parser
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
+        uses: CodSpeedHQ/action@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@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
-        with:
-          tool: cargo-codspeed
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark ty
-
-      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
-        with:
-          mode: instrumentation
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}
 
@@ -985,18 +925,18 @@ jobs:
       TY_LOG: ruff_benchmark=debug
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - name: "Install Rust toolchain"
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
         with:
           tool: cargo-codspeed
 
@@ -1004,13 +944,7 @@ jobs:
         run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
-        env:
-          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
-          # appear to provide much useful insight for our walltime benchmarks right now
-          # (see https://github.com/astral-sh/ruff/pull/20419)
-          CODSPEED_PERF_ENABLED: false
+        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
         with:
-          mode: walltime
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/daily_fuzz.yaml

@@ -31,14 +31,14 @@ jobs:
     # Don't run the cron job on forks:
     if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: Build ruff
         # A debug build means the script runs slower once it gets started,
@@ -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: |

.github/workflows/mypy_primer.yaml

@@ -11,7 +11,6 @@ on:
       - "crates/ruff_python_parser"
       - ".github/workflows/mypy_primer.yaml"
       - ".github/workflows/mypy_primer_comment.yaml"
-      - "scripts/mypy_primer.sh"
       - "Cargo.lock"
       - "!**.md"
 
@@ -32,14 +31,14 @@ jobs:
     runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
@@ -75,16 +74,16 @@ jobs:
     runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
           workspaces: "ruff"
 

.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: |

.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
 

.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"

.github/workflows/publish-pypi.yml

@@ -22,8 +22,8 @@ jobs:
       id-token: write
     steps:
       - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           pattern: wheels-*
           path: wheels

.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

.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 }}

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
@@ -124,19 +124,19 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -175,19 +175,19 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -251,13 +251,13 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
         with:
           pattern: artifacts-*
           path: artifacts

.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@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - 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@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - 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@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - 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: |

.github/workflows/ty-ecosystem-analyzer.yaml

@@ -26,14 +26,14 @@ 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@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
@@ -64,12 +64,11 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@fc0f612798710b0dd69bb7528bc9b361dc60bd43"
+          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

.github/workflows/ty-ecosystem-report.yaml

@@ -22,14 +22,14 @@ jobs:
     runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: ruff
           fetch-depth: 0
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
@@ -49,7 +49,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@fc0f612798710b0dd69bb7528bc9b361dc60bd43"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
 
           ecosystem-analyzer \
             --verbose \

.github/workflows/typing_conformance.yaml

@@ -24,7 +24,6 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
-  CONFORMANCE_SUITE_COMMIT: d4f39b27a4a47aac8b6d4019e1b0b5b3156fabdc
 
 jobs:
   typing_conformance:
@@ -32,19 +31,22 @@ 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 }}
+          ref: d4f39b27a4a47aac8b6d4019e1b0b5b3156fabdc
           path: typing
           persist-credentials: false
 
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
+
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
           workspaces: "ruff"
@@ -54,9 +56,6 @@ jobs:
 
       - name: Compute diagnostic diff
         shell: bash
-        env:
-          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
-          TY_MAX_PARALLELISM: 1
         run: |
           RUFF_DIR="$GITHUB_WORKSPACE/ruff"
 
@@ -65,16 +64,17 @@ jobs:
             cd ruff
 
             echo "new commit"
-            git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
-            cargo build --bin ty
-            mv target/debug/ty ty-new
+            git checkout -b new_commit "${{ github.event.pull_request.head.sha }}"
+            git rev-list --format=%s --max-count=1 new_commit
+            cargo build --release --bin ty
+            mv target/release/ty ty-new
 
+            echo "old commit (merge base)"
             MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
             git checkout -b old_commit "$MERGE_BASE"
-            echo "old commit (merge base)"
             git rev-list --format=%s --max-count=1 old_commit
-            cargo build --bin ty
-            mv target/debug/ty ty-old
+            cargo build --release --bin ty
+            mv target/release/ty ty-old
           )
 
           (
@@ -95,7 +95,6 @@ jobs:
           fi
 
           echo ${{ github.event.number }} > pr-number
-          echo "${CONFORMANCE_SUITE_COMMIT}" > conformance-suite-commit
 
       - name: Upload diff
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -108,9 +107,3 @@ jobs:
         with:
           name: pr-number
           path: pr-number
-
-      - name: Upload conformance suite commit
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: conformance-suite-commit
-          path: conformance-suite-commit

.github/workflows/typing_conformance_comment.yaml

@@ -32,14 +32,6 @@ jobs:
             echo "pr-number=$(<pr-number)" >> "$GITHUB_OUTPUT"
           fi
 
-      - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
-        name: Download typing conformance suite commit
-        with:
-          name: conformance-suite-commit
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-          allow_forks: true
-
       - uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
         name: "Download typing_conformance results"
         id: download-typing_conformance_diff
@@ -69,14 +61,7 @@ jobs:
           # subsequent runs
           echo '<!-- generated-comment typing_conformance_diagnostics_diff -->' >> comment.txt
 
-          if [[ -f conformance-suite-commit ]]
-          then
-            echo "## Diagnostic diff on [typing conformance tests](https://github.com/python/typing/tree/$(<conformance-suite-commit)/conformance)" >> comment.txt
-          else
-            echo "conformance-suite-commit file not found"
-            echo "## Diagnostic diff on typing conformance tests" >> comment.txt
-          fi
-
+          echo '## Diagnostic diff on typing conformance tests' >> comment.txt
           if [ -s "pr/typing_conformance_diagnostics_diff/typing_conformance_diagnostics.diff" ]; then
             echo '<details>' >> comment.txt
             echo '<summary>Changes were detected when running ty on typing conformance tests</summary>' >> comment.txt

.pre-commit-config.yaml

@@ -81,7 +81,7 @@ repos:
         pass_filenames: false # This makes it a lot faster
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.5
     hooks:
       - id: ruff-format
       - id: ruff-check

.vscode/settings.json

@@ -3,7 +3,4 @@
         "--all-features"
     ],
     "rust-analyzer.check.command": "clippy",
-    "search.exclude": {
-        "**/*.snap": true
-    }
-}
+}

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**

CHANGELOG.md

@@ -1,227 +1,353 @@
 # Changelog
 
-## 0.13.2
-
-Released on 2025-09-25.
+## 0.12.5
 
 ### 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))
+- \[`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
 
-- 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))
+- 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
 
-- \[`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))
+- \[`pep8-naming`\] Fix `N802` false positives for `CGIHTTPRequestHandler` and `SimpleHTTPRequestHandler` ([#19432](https://github.com/astral-sh/ruff/pull/19432))
 
-### CLI
+## 0.12.4
 
-- 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))
+### 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
 
-- \[`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))
+- \[`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
 
-- 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))
+- 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))
 
-### Contributors
+## 0.12.0
 
-- [@chirizxc](https://github.com/chirizxc)
-- [@danparizher](https://github.com/danparizher)
-- [@IDrokin117](https://github.com/IDrokin117)
-- [@amyreese](https://github.com/amyreese)
-- [@AlexWaygood](https://github.com/AlexWaygood)
-- [@dylwil3](https://github.com/dylwil3)
-- [@njhearp](https://github.com/njhearp)
-- [@woodruffw](https://github.com/woodruffw)
-- [@dcreager](https://github.com/dcreager)
-- [@TaKO8Ki](https://github.com/TaKO8Ki)
-- [@BurntSushi](https://github.com/BurntSushi)
-- [@salahelfarissi](https://github.com/salahelfarissi)
-- [@MichaReiser](https://github.com/MichaReiser)
-
-## 0.13.0
-
-Check out the [blog post](https://astral.sh/blog/ruff-v0.13.0) for a migration
+Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
 guide and overview of the changes!
 
 ### Breaking changes
 
-- **Several rules can now add `from __future__ import annotations` automatically**
+- **Detection of more syntax errors**
 
-    `TC001`, `TC002`, `TC003`, `RUF013`, and `UP037` now add `from __future__ import annotations` as part of their fixes when the
-    `lint.future-annotations` setting is enabled. This allows the rules to move
-    more imports into `TYPE_CHECKING` blocks (`TC001`, `TC002`, and `TC003`),
-    use PEP 604 union syntax on Python versions before 3.10 (`RUF013`), and
-    unquote more annotations (`UP037`).
+    Ruff now detects version-related syntax errors, such as the use of the `match`
+    statement on Python versions before 3.10, and syntax errors emitted by
+    CPython's compiler, such as irrefutable `match` patterns before the final
+    `case` arm.
 
-- **Full module paths are now used to verify first-party modules**
+- **New default Python version handling for syntax errors**
 
-    Ruff now checks that the full path to a module exists on disk before
-    categorizing it as a first-party import. This change makes first-party
-    import detection more accurate, helping to avoid false positives on local
-    directories with the same name as a third-party dependency, for example. See
-    the [FAQ
-    section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) on import categorization for more details.
+    Ruff will default to the *latest* supported Python version (3.13) when
+    checking for the version-related syntax errors mentioned above to prevent
+    false positives in projects without a Python version configured. The default
+    in all other cases, like applying lint rules, is unchanged and remains at the
+    minimum supported Python version (3.9).
 
-- **Deprecated rules must now be selected by exact rule code**
+- **Updated f-string formatting**
 
-    Ruff will no longer activate deprecated rules selected by their group name
-    or prefix. As noted below, the two remaining deprecated rules were also
-    removed in this release, so this won't affect any current rules, but it will
-    still affect any deprecations in the future.
+    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
+    line break after the format specifier. This addresses a change to the Python
+    grammar in version 3.13.4 that made such a line break a syntax error.
 
-- **The deprecated macOS configuration directory fallback has been removed**
+- **`rust-toolchain.toml` is no longer included in source distributions**
 
-    Ruff will no longer look for a user-level configuration file at
-    `~/Library/Application Support/ruff/ruff.toml` on macOS. This feature was
-    deprecated in v0.5 in favor of using the [XDG
-    specification](https://specifications.freedesktop.org/basedir-spec/latest/)
-    (usually resolving to `~/.config/ruff/ruff.toml`), like on Linux. The
-    fallback and accompanying deprecation warning have now been removed.
+    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
+    minimum supported Rust version (MSRV) for development and building release
+    artifacts. However, when present in source distributions, it would also cause
+    downstream package maintainers to pull in the same Rust toolchain, even if
+    their available toolchain was MSRV-compatible.
 
 ### Removed Rules
 
 The following rules have been removed:
 
-- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name) (`PD901`)
-- [`non-pep604-isinstance`](https://docs.astral.sh/ruff/rules/non-pep604-isinstance) (`UP038`)
+- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
+    (`S320`)
+
+### Deprecated Rules
+
+The following rules have been deprecated:
+
+- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)
 
 ### Stabilization
 
 The following rules have been stabilized and are no longer in preview:
 
-- [`airflow-dag-no-schedule-argument`](https://docs.astral.sh/ruff/rules/airflow-dag-no-schedule-argument)
-    (`AIR002`)
-- [`airflow3-removal`](https://docs.astral.sh/ruff/rules/airflow3-removal) (`AIR301`)
-- [`airflow3-moved-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-moved-to-provider)
-    (`AIR302`)
-- [`airflow3-suggested-update`](https://docs.astral.sh/ruff/rules/airflow3-suggested-update)
-    (`AIR311`)
-- [`airflow3-suggested-to-move-to-provider`](https://docs.astral.sh/ruff/rules/airflow3-suggested-to-move-to-provider)
-    (`AIR312`)
-- [`long-sleep-not-forever`](https://docs.astral.sh/ruff/rules/long-sleep-not-forever) (`ASYNC116`)
-- [`f-string-number-format`](https://docs.astral.sh/ruff/rules/f-string-number-format) (`FURB116`)
-- [`os-symlink`](https://docs.astral.sh/ruff/rules/os-symlink) (`PTH211`)
-- [`generic-not-last-base-class`](https://docs.astral.sh/ruff/rules/generic-not-last-base-class)
-    (`PYI059`)
-- [`redundant-none-literal`](https://docs.astral.sh/ruff/rules/redundant-none-literal) (`PYI061`)
-- [`pytest-raises-ambiguous-pattern`](https://docs.astral.sh/ruff/rules/pytest-raises-ambiguous-pattern)
-    (`RUF043`)
-- [`unused-unpacked-variable`](https://docs.astral.sh/ruff/rules/unused-unpacked-variable)
-    (`RUF059`)
-- [`useless-class-metaclass-type`](https://docs.astral.sh/ruff/rules/useless-class-metaclass-type)
-    (`UP050`)
+- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
+- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
+- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
+- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
+- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
+- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
+- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
+- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
+- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
+- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
+- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
+- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
+- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
+- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
+- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
+- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
+- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
+- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
+- [`non-pep604-annotation-optional`] (`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
 
@@ -266,3 +392,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

CONTRIBUTING.md

@@ -7,35 +7,21 @@ 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
+## The Basics
 
-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.
+Ruff welcomes contributions in the form of pull requests.
 
-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.
+For small changes (e.g., bug fixes), feel free to submit a PR.
 
-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.
+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.
 
-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.
+If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
 
 ### Prerequisites
 

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.86"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -23,13 +23,11 @@ ruff_graph = { path = "crates/ruff_graph" }
 ruff_index = { path = "crates/ruff_index" }
 ruff_linter = { path = "crates/ruff_linter" }
 ruff_macros = { path = "crates/ruff_macros" }
-ruff_memory_usage = { path = "crates/ruff_memory_usage" }
 ruff_notebook = { path = "crates/ruff_notebook" }
 ruff_options_metadata = { path = "crates/ruff_options_metadata" }
 ruff_python_ast = { path = "crates/ruff_python_ast" }
 ruff_python_codegen = { path = "crates/ruff_python_codegen" }
 ruff_python_formatter = { path = "crates/ruff_python_formatter" }
-ruff_python_importer = { path = "crates/ruff_python_importer" }
 ruff_python_index = { path = "crates/ruff_python_index" }
 ruff_python_literal = { path = "crates/ruff_python_literal" }
 ruff_python_parser = { path = "crates/ruff_python_parser" }
@@ -42,7 +40,6 @@ ruff_text_size = { path = "crates/ruff_text_size" }
 ruff_workspace = { path = "crates/ruff_workspace" }
 
 ty = { path = "crates/ty" }
-ty_combine = { path = "crates/ty_combine" }
 ty_ide = { path = "crates/ty_ide" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
@@ -86,7 +83,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.0", features = [
     "derive",
     "smallvec",
     "hashbrown",
@@ -95,7 +92,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 +113,7 @@ jiff = { version = "0.2.0" }
 js-sys = { version = "0.3.69" }
 jod-thread = { version = "1.0.0" }
 libc = { version = "0.2.153" }
-libcst = { version = "1.8.4", default-features = false }
+libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
 lsp-server = { version = "0.7.6" }
 lsp-types = { git = "https://github.com/astral-sh/lsp-types.git", rev = "3512a9f", features = [
@@ -144,12 +141,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "3713cd7eb30821c0c086591832dd6f59f2af7fe7", default-features = false, features = [
-    "compact_str",
-    "macros",
-    "salsa_unstable",
-    "inventory",
-] }
+salsa = { git = "https://github.com/salsa-rs/salsa", rev = "dba66f1a37acca014c2402f231ed5b361bd7d8fe" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
@@ -203,7 +195,7 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }
 
 [workspace.metadata.cargo-shear]
-ignored = ["getrandom", "ruff_options_metadata", "uuid", "get-size2"]
+ignored = ["getrandom", "ruff_options_metadata", "uuid"]
 
 
 [workspace.lints.rust]
@@ -216,8 +208,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -2 }
-# Enabled at the crate level
-disallowed_methods = "allow"
 # Allowed pedantic lints
 char_lit_as_u8 = "allow"
 collapsible_else_if = "allow"
@@ -252,19 +242,10 @@ rest_pat_in_fully_bound_structs = "warn"
 redundant_clone = "warn"
 debug_assert_with_mut_call = "warn"
 unused_peekable = "warn"
-# This lint sometimes flags code whose `if` and `else`
-# bodies could be flipped when a `!` operator is removed.
-# While perhaps sometimes a good idea, it is also often
-# not a good idea due to other factors impacting
-# readability. For example, if flipping the bodies results
-# in the `if` being an order of magnitude bigger than the
-# `else`, then some might consider that harder to read.
-if_not_else = "allow"
 
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"
 
-
 [profile.release]
 # Note that we set these explicitly, and these values
 # were chosen based on a trade-off between compile times

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.2/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.13.2/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.5/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.5/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.2
+  rev: v0.12.5
   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))

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

clippy.toml

@@ -24,20 +24,3 @@ ignore-interior-mutability = [
     # The expression is read-only.
     "ruff_python_ast::hashable::HashableExpr",
 ]
-
-disallowed-methods = [
-    { path = "std::env::var", reason = "Use System::env_var instead in ty crates" },
-    { path = "std::env::current_dir", reason = "Use System::current_directory instead in ty crates" },
-    { path = "std::fs::read_to_string", reason = "Use System::read_to_string instead in ty crates" },
-    { path = "std::fs::metadata", reason = "Use System::path_metadata instead in ty crates" },
-    { path = "std::fs::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "dunce::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "std::fs::read_dir", reason = "Use System::read_directory instead in ty crates" },
-    { path = "std::fs::write", reason = "Use WritableSystem::write_file instead in ty crates" },
-    { path = "std::fs::create_dir_all", reason = "Use WritableSystem::create_directory_all instead in ty crates" },
-    { path = "std::fs::File::create_new", reason = "Use WritableSystem::create_new_file instead in ty crates" },
-    # Path methods that have System trait equivalents
-    { path = "std::path::Path::exists", reason = "Use System::path_exists instead in ty crates" },
-    { path = "std::path::Path::is_dir", reason = "Use System::is_directory instead in ty crates" },
-    { path = "std::path::Path::is_file", reason = "Use System::is_file instead in ty crates" },
-]

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.13.2"
+version = "0.12.5"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -85,7 +85,7 @@ dist = true
 [target.'cfg(target_os = "windows")'.dependencies]
 mimalloc = { workspace = true }
 
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
 tikv-jemallocator = { workspace = true }
 
 [lints]

crates/ruff/src/cache.rs

@@ -13,16 +13,25 @@ use itertools::Itertools;
 use log::{debug, error};
 use rayon::iter::ParallelIterator;
 use rayon::iter::{IntoParallelIterator, ParallelBridge};
+use ruff_linter::codes::Rule;
 use rustc_hash::FxHashMap;
 use tempfile::NamedTempFile;
 
 use ruff_cache::{CacheKey, CacheKeyHasher};
+use ruff_db::diagnostic::Diagnostic;
+use ruff_diagnostics::Fix;
+use ruff_linter::message::create_lint_diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::{VERSION, warn_user};
 use ruff_macros::CacheKey;
+use ruff_notebook::NotebookIndex;
+use ruff_source_file::SourceFileBuilder;
+use ruff_text_size::{TextRange, TextSize};
 use ruff_workspace::Settings;
 use ruff_workspace::resolver::Resolver;
 
+use crate::diagnostics::Diagnostics;
+
 /// [`Path`] that is relative to the package root in [`PackageCache`].
 pub(crate) type RelativePath = Path;
 /// [`PathBuf`] that is relative to the package root in [`PackageCache`].
@@ -289,8 +298,13 @@ impl Cache {
         });
     }
 
-    pub(crate) fn set_linted(&self, path: RelativePathBuf, key: &FileCacheKey, yes: bool) {
-        self.update(path, key, ChangeData::Linted(yes));
+    pub(crate) fn update_lint(
+        &self,
+        path: RelativePathBuf,
+        key: &FileCacheKey,
+        data: LintCacheData,
+    ) {
+        self.update(path, key, ChangeData::Lint(data));
     }
 
     pub(crate) fn set_formatted(&self, path: RelativePathBuf, key: &FileCacheKey) {
@@ -325,15 +339,42 @@ pub(crate) struct FileCache {
 }
 
 impl FileCache {
-    /// Return whether or not the file in the cache was linted and found to have no diagnostics.
-    pub(crate) fn linted(&self) -> bool {
-        self.data.linted
+    /// Convert the file cache into `Diagnostics`, using `path` as file name.
+    pub(crate) fn to_diagnostics(&self, path: &Path) -> Option<Diagnostics> {
+        self.data.lint.as_ref().map(|lint| {
+            let diagnostics = if lint.messages.is_empty() {
+                Vec::new()
+            } else {
+                let file = SourceFileBuilder::new(path.to_string_lossy(), &*lint.source).finish();
+                lint.messages
+                    .iter()
+                    .map(|msg| {
+                        create_lint_diagnostic(
+                            &msg.body,
+                            msg.suggestion.as_ref(),
+                            msg.range,
+                            msg.fix.clone(),
+                            msg.parent,
+                            file.clone(),
+                            msg.noqa_offset,
+                            msg.rule,
+                        )
+                    })
+                    .collect()
+            };
+            let notebook_indexes = if let Some(notebook_index) = lint.notebook_index.as_ref() {
+                FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook_index.clone())])
+            } else {
+                FxHashMap::default()
+            };
+            Diagnostics::new(diagnostics, notebook_indexes)
+        })
     }
 }
 
 #[derive(Debug, Default, bincode::Decode, bincode::Encode)]
 struct FileCacheData {
-    linted: bool,
+    lint: Option<LintCacheData>,
     formatted: bool,
 }
 
@@ -369,6 +410,88 @@ pub(crate) fn init(path: &Path) -> Result<()> {
     Ok(())
 }
 
+#[derive(bincode::Decode, Debug, bincode::Encode, PartialEq)]
+pub(crate) struct LintCacheData {
+    /// Imports made.
+    // pub(super) imports: ImportMap,
+    /// Diagnostic messages.
+    pub(super) messages: Vec<CacheMessage>,
+    /// Source code of the file.
+    ///
+    /// # Notes
+    ///
+    /// This will be empty if `messages` is empty.
+    pub(super) source: String,
+    /// Notebook index if this file is a Jupyter Notebook.
+    #[bincode(with_serde)]
+    pub(super) notebook_index: Option<NotebookIndex>,
+}
+
+impl LintCacheData {
+    pub(crate) fn from_diagnostics(
+        diagnostics: &[Diagnostic],
+        notebook_index: Option<NotebookIndex>,
+    ) -> Self {
+        let source = if let Some(msg) = diagnostics.first() {
+            msg.expect_ruff_source_file().source_text().to_owned()
+        } else {
+            String::new() // No messages, no need to keep the source!
+        };
+
+        let messages = diagnostics
+            .iter()
+            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
+            // this also serves to filter them out, but we shouldn't be caching files with syntax
+            // errors anyway.
+            .filter_map(|msg| Some((msg.name().parse().ok()?, msg)))
+            .map(|(rule, msg)| {
+                // Make sure that all message use the same source file.
+                assert_eq!(
+                    msg.expect_ruff_source_file(),
+                    diagnostics.first().unwrap().expect_ruff_source_file(),
+                    "message uses a different source file"
+                );
+                CacheMessage {
+                    rule,
+                    body: msg.body().to_string(),
+                    suggestion: msg.first_help_text().map(ToString::to_string),
+                    range: msg.expect_range(),
+                    parent: msg.parent(),
+                    fix: msg.fix().cloned(),
+                    noqa_offset: msg.noqa_offset(),
+                }
+            })
+            .collect();
+
+        Self {
+            messages,
+            source,
+            notebook_index,
+        }
+    }
+}
+
+/// On disk representation of a diagnostic message.
+#[derive(bincode::Decode, Debug, bincode::Encode, PartialEq)]
+pub(super) struct CacheMessage {
+    /// The rule for the cached diagnostic.
+    #[bincode(with_serde)]
+    rule: Rule,
+    /// The message body to display to the user, to explain the diagnostic.
+    body: String,
+    /// The message to display to the user, to explain the suggested fix.
+    suggestion: Option<String>,
+    /// Range into the message's [`FileCache::source`].
+    #[bincode(with_serde)]
+    range: TextRange,
+    #[bincode(with_serde)]
+    parent: Option<TextSize>,
+    #[bincode(with_serde)]
+    fix: Option<Fix>,
+    #[bincode(with_serde)]
+    noqa_offset: Option<TextSize>,
+}
+
 pub(crate) trait PackageCaches {
     fn get(&self, package_root: &Path) -> Option<&Cache>;
 
@@ -456,15 +579,15 @@ struct Change {
 
 #[derive(Debug)]
 enum ChangeData {
-    Linted(bool),
+    Lint(LintCacheData),
     Formatted,
 }
 
 impl ChangeData {
     fn apply(self, data: &mut FileCacheData) {
         match self {
-            ChangeData::Linted(yes) => {
-                data.linted = yes;
+            ChangeData::Lint(new_lint) => {
+                data.lint = Some(new_lint);
             }
             ChangeData::Formatted => {
                 data.formatted = true;
@@ -489,6 +612,7 @@ mod tests {
     use test_case::test_case;
 
     use ruff_cache::CACHE_DIR_NAME;
+    use ruff_db::diagnostic::Diagnostic;
     use ruff_linter::package::PackageRoot;
     use ruff_linter::settings::LinterSettings;
     use ruff_linter::settings::flags;
@@ -496,7 +620,7 @@ mod tests {
     use ruff_python_ast::{PySourceType, PythonVersion};
     use ruff_workspace::Settings;
 
-    use crate::cache::{self, ChangeData, FileCache, FileCacheData, FileCacheKey};
+    use crate::cache::{self, FileCache, FileCacheData, FileCacheKey};
     use crate::cache::{Cache, RelativePathBuf};
     use crate::commands::format::{FormatCommandError, FormatMode, FormatResult, format_path};
     use crate::diagnostics::{Diagnostics, lint_path};
@@ -523,7 +647,7 @@ mod tests {
         assert_eq!(cache.changes.lock().unwrap().len(), 0);
 
         let mut paths = Vec::new();
-        let mut paths_with_diagnostics = Vec::new();
+        let mut parse_errors = Vec::new();
         let mut expected_diagnostics = Diagnostics::default();
         for entry in fs::read_dir(&package_root).unwrap() {
             let entry = entry.unwrap();
@@ -547,7 +671,7 @@ mod tests {
                     continue;
                 }
 
-                let mut diagnostics = lint_path(
+                let diagnostics = lint_path(
                     &path,
                     Some(PackageRoot::root(&package_root)),
                     &settings.linter,
@@ -557,15 +681,8 @@ mod tests {
                     UnsafeFixes::Enabled,
                 )
                 .unwrap();
-                if diagnostics.inner.is_empty() {
-                    // We won't load a notebook index from the cache for files without diagnostics,
-                    // so remove them from `expected_diagnostics` too. This allows us to keep the
-                    // full equality assertion below.
-                    diagnostics
-                        .notebook_indexes
-                        .remove(&path.to_string_lossy().to_string());
-                } else {
-                    paths_with_diagnostics.push(path.clone());
+                if diagnostics.inner.iter().any(Diagnostic::is_invalid_syntax) {
+                    parse_errors.push(path.clone());
                 }
                 paths.push(path);
                 expected_diagnostics += diagnostics;
@@ -578,11 +695,11 @@ mod tests {
         let cache = Cache::open(package_root.clone(), &settings);
         assert_ne!(cache.package.files.len(), 0);
 
-        paths_with_diagnostics.sort();
+        parse_errors.sort();
 
         for path in &paths {
-            if paths_with_diagnostics.binary_search(path).is_ok() {
-                continue; // We don't cache files with diagnostics.
+            if parse_errors.binary_search(path).is_ok() {
+                continue; // We don't cache parsing errors.
             }
 
             let relative_path = cache.relative_path(path).unwrap();
@@ -616,7 +733,7 @@ mod tests {
 
     #[test]
     fn cache_adds_file_on_lint() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
 
         let test_cache = TestCache::new("cache_adds_file_on_lint");
         let cache = test_cache.open();
@@ -640,7 +757,7 @@ mod tests {
 
     #[test]
     fn cache_adds_files_on_lint() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
 
         let test_cache = TestCache::new("cache_adds_files_on_lint");
         let cache = test_cache.open();
@@ -665,40 +782,6 @@ mod tests {
         cache.persist().unwrap();
     }
 
-    #[test]
-    fn cache_does_not_add_file_on_lint_with_diagnostic() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
-
-        let test_cache = TestCache::new("cache_does_not_add_file_on_lint_with_diagnostic");
-        let cache = test_cache.open();
-        test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
-
-        cache.persist().unwrap();
-        let cache = test_cache.open();
-
-        let results = test_cache
-            .lint_file_with_cache("source.py", &cache)
-            .expect("Failed to lint test file");
-        assert_eq!(results.inner.len(), 1, "Expected one F822 diagnostic");
-        assert_eq!(
-            cache.changes.lock().unwrap().len(),
-            1,
-            "Files with diagnostics still trigger change events"
-        );
-        assert!(
-            cache
-                .changes
-                .lock()
-                .unwrap()
-                .last()
-                .is_some_and(|change| matches!(change.new_data, ChangeData::Linted(false))),
-            "Files with diagnostics are marked as unlinted"
-        );
-
-        cache.persist().unwrap();
-    }
-
     #[test]
     fn cache_adds_files_on_format() {
         let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
@@ -729,7 +812,7 @@ mod tests {
 
     #[test]
     fn cache_invalidated_on_file_modified_time() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
 
         let test_cache = TestCache::new("cache_invalidated_on_file_modified_time");
         let cache = test_cache.open();
@@ -786,7 +869,7 @@ mod tests {
             file.set_permissions(perms)
         }
 
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
 
         let test_cache = TestCache::new("cache_invalidated_on_permission_change");
         let cache = test_cache.open();
@@ -839,7 +922,7 @@ mod tests {
         );
 
         // Now actually lint a file.
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
         test_cache.write_source_file("new.py", source);
         let new_path_key = RelativePathBuf::from("new.py");
         assert_eq!(cache.changes.lock().unwrap().len(), 0);
@@ -862,7 +945,7 @@ mod tests {
 
     #[test]
     fn format_updates_cache_entry() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\"])\n";
+        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
 
         let test_cache = TestCache::new("format_updates_cache_entry");
         let cache = test_cache.open();
@@ -896,7 +979,7 @@ mod tests {
             panic!("Cache entry for `source.py` is missing.");
         };
 
-        assert!(file_cache.data.linted);
+        assert!(file_cache.data.lint.is_some());
         assert!(file_cache.data.formatted);
     }
 
@@ -946,7 +1029,7 @@ mod tests {
             panic!("Cache entry for `source.py` is missing.");
         };
 
-        assert!(!file_cache.data.linted);
+        assert_eq!(file_cache.data.lint, None);
         assert!(file_cache.data.formatted);
     }
 

crates/ruff/src/commands/check.rs

@@ -6,14 +6,12 @@ use std::time::Instant;
 use anyhow::Result;
 use colored::Colorize;
 use ignore::Error;
-use log::{debug, warn};
+use log::{debug, error, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use rustc_hash::FxHashMap;
 
-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, Span, SubDiagnostic, SubDiagnosticSeverity,
-};
+use ruff_db::diagnostic::Diagnostic;
 use ruff_db::panic::catch_unwind;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
@@ -195,24 +193,21 @@ fn lint_path(
     match result {
         Ok(inner) => inner,
         Err(error) => {
-            let message = match error.payload.as_str() {
-                Some(summary) => format!("Fatal error while linting: {summary}"),
-                _ => "Fatal error while linting".to_owned(),
-            };
-            let mut diagnostic = Diagnostic::new(
-                DiagnosticId::Panic,
-                ruff_db::diagnostic::Severity::Fatal,
-                message,
+            let message = r"This indicates a bug in Ruff. If you could open an issue at:
+
+    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
+
+...with the relevant file contents, the `pyproject.toml` settings, and the following stack trace, we'd be very appreciative!
+";
+
+            error!(
+                "{}{}{} {message}\n{error}",
+                "Panicked while linting ".bold(),
+                fs::relativize_path(path).bold(),
+                ":".bold()
             );
-            let span = Span::from(SourceFileBuilder::new(path.to_string_lossy(), "").finish());
-            let mut annotation = Annotation::primary(span);
-            annotation.set_file_level(true);
-            diagnostic.annotate(annotation);
-            diagnostic.sub(SubDiagnostic::new(
-                SubDiagnosticSeverity::Info,
-                format!("{error}"),
-            ));
-            Ok(Diagnostics::new(vec![diagnostic], FxHashMap::default()))
+
+            Ok(Diagnostics::default())
         }
     }
 }

crates/ruff/src/diagnostics.rs

@@ -20,21 +20,15 @@ use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
 use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::{IOError, Violation, fs};
-use ruff_notebook::{NotebookError, NotebookIndex};
+use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::Settings;
 use rustc_hash::FxHashMap;
 
-use crate::cache::{Cache, FileCache, FileCacheKey};
+use crate::cache::{Cache, FileCacheKey, LintCacheData};
 
-/// A collection of [`Diagnostic`]s and additional information needed to render them.
-///
-/// Note that `notebook_indexes` may be empty if there are no diagnostics because the
-/// `NotebookIndex` isn't cached in this case. This isn't a problem for any current uses as of
-/// 2025-08-12, which are all related to diagnostic rendering, but could be surprising if used
-/// differently in the future.
 #[derive(Debug, Default, PartialEq)]
 pub(crate) struct Diagnostics {
     pub(crate) inner: Vec<Diagnostic>,
@@ -199,9 +193,19 @@ pub(crate) fn lint_path(
             let cache_key = FileCacheKey::from_path(path).context("Failed to create cache key")?;
             let cached_diagnostics = cache
                 .get(relative_path, &cache_key)
-                .is_some_and(FileCache::linted);
-            if cached_diagnostics {
-                return Ok(Diagnostics::default());
+                .and_then(|entry| entry.to_diagnostics(path));
+            if let Some(diagnostics) = cached_diagnostics {
+                // `FixMode::Generate` and `FixMode::Diff` rely on side-effects (writing to disk,
+                // and writing the diff to stdout, respectively). If a file has diagnostics, we
+                // need to avoid reading from and writing to the cache in these modes.
+                if match fix_mode {
+                    flags::FixMode::Generate => true,
+                    flags::FixMode::Apply | flags::FixMode::Diff => {
+                        diagnostics.inner.is_empty() && diagnostics.fixed.is_empty()
+                    }
+                } {
+                    return Ok(diagnostics);
+                }
             }
 
             // Stash the file metadata for later so when we update the cache it reflects the prerun
@@ -318,21 +322,31 @@ pub(crate) fn lint_path(
             (result, transformed, fixed)
         };
 
+    let has_error = result.has_syntax_errors();
     let diagnostics = result.diagnostics;
 
     if let Some((cache, relative_path, key)) = caching {
-        // `FixMode::Apply` and `FixMode::Diff` rely on side-effects (writing to disk,
-        // and writing the diff to stdout, respectively). If a file has diagnostics
-        // with fixes, we need to avoid reading from and writing to the cache in these
-        // modes.
-        let use_fixes = match fix_mode {
-            flags::FixMode::Generate => true,
-            flags::FixMode::Apply | flags::FixMode::Diff => fixed.is_empty(),
-        };
-
-        // We don't cache files with diagnostics.
-        let linted = diagnostics.is_empty() && use_fixes;
-        cache.set_linted(relative_path.to_owned(), &key, linted);
+        // We don't cache parsing errors.
+        if !has_error {
+            // `FixMode::Apply` and `FixMode::Diff` rely on side-effects (writing to disk,
+            // and writing the diff to stdout, respectively). If a file has diagnostics, we
+            // need to avoid reading from and writing to the cache in these modes.
+            if match fix_mode {
+                flags::FixMode::Generate => true,
+                flags::FixMode::Apply | flags::FixMode::Diff => {
+                    diagnostics.is_empty() && fixed.is_empty()
+                }
+            } {
+                cache.update_lint(
+                    relative_path.to_owned(),
+                    &key,
+                    LintCacheData::from_diagnostics(
+                        &diagnostics,
+                        transformed.as_ipy_notebook().map(Notebook::index).cloned(),
+                    ),
+                );
+            }
+        }
     }
 
     let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {

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;
@@ -445,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

crates/ruff/src/main.rs

@@ -19,8 +19,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[global_allocator]

crates/ruff/src/printer.rs

@@ -10,12 +10,14 @@ use ruff_linter::linter::FixTable;
 use serde::Serialize;
 
 use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-    DisplayGithubDiagnostics, GithubRenderer, SecondaryCode,
+    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics, SecondaryCode,
 };
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{Emitter, EmitterContext, GroupedEmitter, SarifEmitter, TextEmitter};
+use ruff_linter::message::{
+    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};
@@ -29,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;
     }
 }
 
@@ -225,35 +229,41 @@ impl Printer {
         let context = EmitterContext::new(&diagnostics.notebook_indexes);
         let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
 
-        let config = DisplayDiagnosticConfig::default().preview(preview);
-
         match self.format {
             OutputFormat::Json => {
-                let config = config.format(DiagnosticFormat::Json);
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Json)
+                    .preview(preview);
                 let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
                 write!(writer, "{value}")?;
             }
             OutputFormat::Rdjson => {
-                let config = config.format(DiagnosticFormat::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 = config.format(DiagnosticFormat::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 = config.format(DiagnosticFormat::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.format == OutputFormat::Full && preview)
+                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                     .with_show_source(self.format == OutputFormat::Full)
-                    .with_fix_applicability(self.unsafe_fixes.required_applicability())
+                    .with_unsafe_fixes(self.unsafe_fixes)
                     .with_preview(preview)
                     .emit(writer, &diagnostics.inner, &context)?;
 
@@ -283,22 +293,22 @@ impl Printer {
                 self.write_summary_text(writer, diagnostics)?;
             }
             OutputFormat::Github => {
-                let renderer = GithubRenderer::new(&context, "Ruff");
-                let value = DisplayGithubDiagnostics::new(&renderer, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
             }
             OutputFormat::Gitlab => {
-                let config = config.format(DiagnosticFormat::Gitlab);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
             }
             OutputFormat::Pylint => {
-                let config = config.format(DiagnosticFormat::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 = config.format(DiagnosticFormat::Azure);
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Azure)
+                    .preview(preview);
                 let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
                 write!(writer, "{value}")?;
             }
@@ -451,7 +461,7 @@ impl Printer {
             TextEmitter::default()
                 .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
                 .with_show_source(preview)
-                .with_fix_applicability(self.unsafe_fixes.required_applicability())
+                .with_unsafe_fixes(self.unsafe_fixes)
                 .emit(writer, &diagnostics.inner, &context)?;
         }
         writer.flush()?;

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()?;

crates/ruff/tests/format.rs

@@ -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()?;

crates/ruff/tests/integration_test.rs

@@ -115,13 +115,12 @@ fn stdin_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> -:1:8
+    -:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
@@ -140,13 +139,12 @@ fn stdin_filename() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.py:1:8
+    F401.py:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
@@ -176,21 +174,19 @@ import bar   # unused import
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `bar` imported but unused
-     --> bar.py:2:8
+    bar.py:2:8: F401 [*] `bar` imported but unused
       |
     2 | import bar   # unused import
-      |        ^^^
+      |        ^^^ F401
       |
-    help: Remove unused import: `bar`
+      = help: Remove unused import: `bar`
 
-    F401 [*] `foo` imported but unused
-     --> foo.py:2:8
+    foo.py:2:8: F401 [*] `foo` imported but unused
       |
     2 | import foo   # unused import
-      |        ^^^
+      |        ^^^ F401
       |
-    help: Remove unused import: `foo`
+      = help: Remove unused import: `foo`
 
     Found 2 errors.
     [*] 2 fixable with the `--fix` option.
@@ -212,13 +208,12 @@ fn check_warn_stdin_filename_with_files() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.py:1:8
+    F401.py:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
@@ -239,13 +234,12 @@ fn stdin_source_type_py() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> TCH.py:1:8
+    TCH.py:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
@@ -477,11 +471,10 @@ fn stdin_fix_jupyter() {
      "nbformat_minor": 5
     }
     ----- stderr -----
-    F821 Undefined name `x`
-     --> Jupyter.ipynb:cell 3:1:7
+    Jupyter.ipynb:cell 3:1:7: F821 Undefined name `x`
       |
     1 | print(x)
-      |       ^
+      |       ^ F821
       |
 
     Found 3 errors (2 fixed, 1 remaining).
@@ -576,21 +569,19 @@ fn stdin_override_parser_ipynb() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> Jupyter.py:cell 1:1:8
+    Jupyter.py:cell 1:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
-    F401 [*] `sys` imported but unused
-     --> Jupyter.py:cell 3:1:8
+    Jupyter.py:cell 3:1:8: F401 [*] `sys` imported but unused
       |
     1 | import sys
-      |        ^^^
+      |        ^^^ F401
       |
-    help: Remove unused import: `sys`
+      = help: Remove unused import: `sys`
 
     Found 2 errors.
     [*] 2 fixable with the `--fix` option.
@@ -614,13 +605,12 @@ fn stdin_override_parser_py() {
     success: false
     exit_code: 1
     ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> F401.ipynb:1:8
+    F401.ipynb:1:8: F401 [*] `os` imported but unused
       |
     1 | import os
-      |        ^^
+      |        ^^ F401
       |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`
 
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
@@ -643,13 +633,12 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
          print(sys.version)
 
     ----- stderr -----
-    F634 If test is a tuple, which is always `True`
-     --> -:3:4
+    -:3:4: F634 If test is a tuple, which is always `True`
       |
     1 | import sys
     2 |
     3 | if (1, 2):
-      |    ^^^^^^
+      |    ^^^^^^ F634
     4 |      print(sys.version)
       |
 
@@ -809,8 +798,7 @@ fn stdin_parse_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    invalid-syntax: Expected one or more symbol names after import
-     --> -:1:16
+    -:1:16: SyntaxError: Expected one or more symbol names after import
       |
     1 | from foo import
       |                ^
@@ -830,16 +818,14 @@ fn stdin_multiple_parse_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    invalid-syntax: Expected one or more symbol names after import
-     --> -:1:16
+    -:1:16: SyntaxError: Expected one or more symbol names after import
       |
     1 | from foo import
       |                ^
     2 | bar =
       |
 
-    invalid-syntax: Expected an expression
-     --> -:2:6
+    -:2:6: SyntaxError: Expected an expression
       |
     1 | from foo import
     2 | bar =
@@ -861,8 +847,7 @@ fn parse_error_not_included() {
     success: false
     exit_code: 1
     ----- stdout -----
-    invalid-syntax: Expected an expression
-     --> -:1:6
+    -:1:6: SyntaxError: Expected an expression
       |
     1 | foo =
       |      ^
@@ -882,11 +867,10 @@ fn full_output_preview() {
     success: false
     exit_code: 1
     ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
       |
     1 | l = 1
-      | ^
+      | ^ E741
       |
 
     Found 1 error.
@@ -911,11 +895,10 @@ preview = true
     success: false
     exit_code: 1
     ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
       |
     1 | l = 1
-      | ^
+      | ^ E741
       |
 
     Found 1 error.
@@ -933,11 +916,10 @@ fn full_output_format() {
     success: false
     exit_code: 1
     ----- stdout -----
-    E741 Ambiguous variable name: `l`
-     --> -:1:1
+    -:1:1: E741 Ambiguous variable name: `l`
       |
     1 | l = 1
-      | ^
+      | ^ E741
       |
 
     Found 1 error.
@@ -1424,9 +1406,7 @@ fn redirect_direct() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
     Found 1 error.
 
     ----- stderr -----
@@ -1458,9 +1438,7 @@ fn redirect_prefix() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
     Found 1 error.
 
     ----- stderr -----
@@ -1477,9 +1455,7 @@ fn deprecated_direct() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
+    -:1:1: RUF920 Hey this is a deprecated test rule.
     Found 1 error.
 
     ----- stderr -----
@@ -1489,8 +1465,6 @@ fn deprecated_direct() {
 
 #[test]
 fn deprecated_multiple_direct() {
-    // Multiple deprecated rules selected by exact code should be included
-    // but a warning should be displayed
     let mut cmd = RuffCheck::default()
         .args(["--select", "RUF920", "--select", "RUF921"])
         .build();
@@ -1498,12 +1472,8 @@ fn deprecated_multiple_direct() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF920 Hey this is a deprecated test rule.
-    --> -:1:1
-
-    RUF921 Hey this is another deprecated test rule.
-    --> -:1:1
-
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
     Found 2 errors.
 
     ----- stderr -----
@@ -1518,10 +1488,12 @@ fn deprecated_indirect() {
     // since it is not a "direct" selection
     let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
     assert_cmd_snapshot!(cmd, @r"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
     ----- stdout -----
-    All checks passed!
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
+    Found 2 errors.
 
     ----- stderr -----
     ");
@@ -1666,23 +1638,22 @@ fn check_input_from_argfile() -> Result<()> {
         (file_a_path.display().to_string().as_str(), "/path/to/a.py"),
     ]}, {
         assert_cmd_snapshot!(cmd
-            .pass_stdin(""), @r"
+            .pass_stdin(""), @r###"
         success: false
         exit_code: 1
         ----- stdout -----
-        F401 [*] `os` imported but unused
-         --> /path/to/a.py:1:8
+        /path/to/a.py:1:8: F401 [*] `os` imported but unused
           |
         1 | import os
-          |        ^^
+          |        ^^ F401
           |
-        help: Remove unused import: `os`
+          = help: Remove unused import: `os`
 
         Found 1 error.
         [*] 1 fixable with the `--fix` option.
 
         ----- stderr -----
-        ");
+        "###);
     });
 
     Ok(())
@@ -1698,12 +1669,8 @@ fn check_hints_hidden_unsafe_fixes() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
@@ -1720,9 +1687,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 1 error.
     No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
@@ -1740,12 +1705,8 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     [*] 1 fixable with the --fix option.
 
@@ -1764,9 +1725,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 1 error.
 
     ----- stderr -----
@@ -1783,12 +1742,8 @@ fn check_shows_unsafe_fixes_with_opt_in() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     [*] 2 fixable with the --fix option.
 
@@ -1809,9 +1764,7 @@ fn fix_applies_safe_fixes_by_default() {
     # fix from stable-test-rule-safe-fix
 
     ----- stderr -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 2 errors (1 fixed, 1 remaining).
     No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
     ");
@@ -1848,9 +1801,7 @@ fn fix_does_not_apply_display_only_fixes() {
     ----- stdout -----
     def add_to_list(item, some_list=[]): ...
     ----- stderr -----
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
     Found 1 error.
     ");
 }
@@ -1868,9 +1819,7 @@ fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
     ----- stdout -----
     def add_to_list(item, some_list=[]): ...
     ----- stderr -----
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
     Found 1 error.
     ");
 }
@@ -1887,9 +1836,7 @@ fn fix_only_unsafe_fixes_available() {
     ----- stdout -----
 
     ----- stderr -----
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 1 error.
     No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
     ");
@@ -2025,12 +1972,8 @@ extend-unsafe-fixes = ["RUF901"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).
 
@@ -2061,12 +2004,8 @@ extend-safe-fixes = ["RUF902"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     [*] 2 fixable with the `--fix` option.
 
@@ -2099,12 +2038,8 @@ extend-safe-fixes = ["RUF902"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
+    -:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
     Found 2 errors.
     [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
@@ -2139,22 +2074,14 @@ extend-safe-fixes = ["RUF9"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF900 Hey this is a stable test rule.
-    --> -:1:1
-
-    RUF901 Hey this is a stable test rule with a safe fix.
-    --> -:1:1
-
-    RUF902 [*] Hey this is a stable test rule with an unsafe fix.
-    --> -:1:1
-
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> -:1:1
-
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> -:1:1
-
-    Found 5 errors.
+    -:1:1: RUF900 Hey this is a stable test rule.
+    -:1:1: RUF901 Hey this is a stable test rule with a safe fix.
+    -:1:1: RUF902 [*] Hey this is a stable test rule with an unsafe fix.
+    -:1:1: RUF903 Hey this is a stable test rule with a display only fix.
+    -:1:1: RUF920 Hey this is a deprecated test rule.
+    -:1:1: RUF921 Hey this is another deprecated test rule.
+    -:1:1: RUF950 Hey this is a test rule that was redirected from another.
+    Found 7 errors.
     [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
     ----- stderr -----
@@ -2214,11 +2141,10 @@ def log(x, base) -> float:
     success: false
     exit_code: 1
     ----- stdout -----
-    D417 Missing argument description in the docstring for `log`: `base`
-     --> -:2:5
+    -:2:5: D417 Missing argument description in the docstring for `log`: `base`
       |
     2 | def log(x, base) -> float:
-      |     ^^^
+      |     ^^^ D417
     3 |     """Calculate natural log of a value
       |
 
@@ -2251,15 +2177,14 @@ select = ["RUF017"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF017 Avoid quadratic list summation
-     --> -:3:1
+    -:3:1: RUF017 Avoid quadratic list summation
       |
     1 | x = [1, 2, 3]
     2 | y = [4, 5, 6]
     3 | sum([x, y], [])
-      | ^^^^^^^^^^^^^^^
+      | ^^^^^^^^^^^^^^^ RUF017
       |
-    help: Replace with `functools.reduce`
+      = help: Replace with `functools.reduce`
 
     Found 1 error.
     No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
@@ -2292,15 +2217,14 @@ unfixable = ["RUF"]
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF017 Avoid quadratic list summation
-     --> -:3:1
+    -:3:1: RUF017 Avoid quadratic list summation
       |
     1 | x = [1, 2, 3]
     2 | y = [4, 5, 6]
     3 | sum([x, y], [])
-      | ^^^^^^^^^^^^^^^
+      | ^^^^^^^^^^^^^^^ RUF017
       |
-    help: Replace with `functools.reduce`
+      = help: Replace with `functools.reduce`
 
     Found 1 error.
 
@@ -2322,11 +2246,10 @@ fn pyproject_toml_stdin_syntax_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF200 Failed to parse pyproject.toml: unclosed table, expected `]`
-     --> pyproject.toml:1:9
+    pyproject.toml:1:9: RUF200 Failed to parse pyproject.toml: unclosed table, expected `]`
       |
     1 | [project
-      |         ^
+      |         ^ RUF200
       |
 
     Found 1 error.
@@ -2348,12 +2271,11 @@ fn pyproject_toml_stdin_schema_error() {
     success: false
     exit_code: 1
     ----- stdout -----
-    RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
-     --> pyproject.toml:2:8
+    pyproject.toml:2:8: RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
       |
     1 | [project]
     2 | name = 1
-      |        ^
+      |        ^ RUF200
       |
 
     Found 1 error.
@@ -2441,12 +2363,11 @@ fn pyproject_toml_stdin_schema_error_fix() {
     [project]
     name = 1
     ----- stderr -----
-    RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
-     --> pyproject.toml:2:8
+    pyproject.toml:2:8: RUF200 Failed to parse pyproject.toml: invalid type: integer `1`, expected a string
       |
     1 | [project]
     2 | name = 1
-      |        ^
+      |        ^ RUF200
       |
 
     Found 1 error.

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()?;
@@ -2476,319 +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.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]`
@@ -5353,37 +4996,6 @@ fn flake8_import_convention_invalid_aliases_config_module_name() -> Result<()> {
     Ok(())
 }
 
-#[test]
-fn flake8_import_convention_nfkc_normalization() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.flake8-import-conventions.aliases]
-"test.module" = "_﹏𝘥𝘦𝘣𝘶𝘨﹏﹏"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-    , @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
-        ");});
-    Ok(())
-}
-
 #[test]
 fn flake8_import_convention_unused_aliased_import() {
     assert_cmd_snapshot!(
@@ -5416,59 +5028,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() {
@@ -5830,7 +5389,7 @@ fn walrus_before_py38() {
     success: false
     exit_code: 1
     ----- stdout -----
-    test.py:1:2: invalid-syntax: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
+    test.py:1:2: SyntaxError: Cannot use named assignment expression (`:=`) on Python 3.7 (syntax was added in Python 3.8)
     Found 1 error.
 
     ----- stderr -----
@@ -5876,15 +5435,15 @@ match 2:
         print("it's one")
 "#
         ),
-        @r"
+        @r###"
     success: false
     exit_code: 1
     ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
     Found 1 error.
 
     ----- stderr -----
-    "
+    "###
     );
 
     // syntax error on 3.9 with preview
@@ -5905,7 +5464,7 @@ match 2:
     success: false
     exit_code: 1
     ----- stdout -----
-    test.py:2:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
     Found 1 error.
 
     ----- stderr -----
@@ -5933,7 +5492,7 @@ fn cache_syntax_errors() -> Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    main.py:1:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
 
     ----- stderr -----
     "
@@ -5946,7 +5505,7 @@ fn cache_syntax_errors() -> Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    main.py:1:1: invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+    main.py:1:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
 
     ----- stderr -----
     "
@@ -5998,15 +5557,15 @@ fn cookiecutter_globbing() -> Result<()> {
                 .args(STDIN_BASE_OPTIONS)
                 .arg("--select=F811")
                 .current_dir(tempdir.path()), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        {{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1: `foo` redefined here
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
+			success: false
+			exit_code: 1
+			----- stdout -----
+			{{cookiecutter.repo_name}}/tests/maintest.py:3:8: F811 [*] Redefinition of unused `foo` from line 1
+			Found 1 error.
+			[*] 1 fixable with the `--fix` option.
 
-        ----- stderr -----
-        ");
+			----- stderr -----
+		");
     });
 
     Ok(())
@@ -6059,7 +5618,7 @@ fn semantic_syntax_errors() -> Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
     main.py:1:20: F821 Undefined name `foo`
 
     ----- stderr -----
@@ -6073,7 +5632,7 @@ fn semantic_syntax_errors() -> Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    main.py:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    main.py:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
     main.py:1:20: F821 Undefined name `foo`
 
     ----- stderr -----
@@ -6092,7 +5651,7 @@ fn semantic_syntax_errors() -> Result<()> {
     success: false
     exit_code: 1
     ----- stdout -----
-    -:1:3: invalid-syntax: assignment expression cannot rebind comprehension variable
+    -:1:3: SyntaxError: assignment expression cannot rebind comprehension variable
     Found 1 error.
 
     ----- stderr -----
@@ -6191,367 +5750,23 @@ match 42:  # invalid-syntax
 }
 
 #[test]
-fn up045_nested_optional_flatten_all() {
-    let contents = "\
-from typing import Optional
-nested_optional: Optional[Optional[Optional[str]]] = None
-";
-
+fn future_annotations_preview_warning() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
             .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
+            .args(["--config", "lint.future-annotations = true"])
+            .args(["--select", "F"])
+            .arg("--no-preview")
             .arg("-")
-            .pass_stdin(contents),
+            .pass_stdin("1"),
         @r"
-    success: false
-    exit_code: 1
+    success: true
+    exit_code: 0
     ----- stdout -----
-    @@ -1,2 +1,2 @@
-     from typing import Optional
-    -nested_optional: Optional[Optional[Optional[str]]] = None
-    +nested_optional: str | None = None
-
+    All checks passed!
 
     ----- stderr -----
-    Would fix 1 error.
+    warning: The `lint.future-annotations` setting will have no effect because `preview` is disabled
     ",
     );
 }
-
-#[test]
-fn show_fixes_in_full_output_with_preview_enabled() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--no-cache", "--output-format", "full"])
-            .args(["--select", "F401"])
-            .arg("--preview")
-            .arg("-")
-            .pass_stdin("import math"),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    F401 [*] `math` imported but unused
-     --> -:1:8
-      |
-    1 | import math
-      |        ^^^^
-      |
-    help: Remove unused import: `math`
-      - import math
-
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ",
-    );
-}
-
-#[test]
-fn rule_panic_mixed_results_concise() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    // Create python files
-    let file_a_path = tempdir.path().join("normal.py");
-    let file_b_path = tempdir.path().join("panic.py");
-    fs::write(&file_a_path, b"import os")?;
-    fs::write(&file_b_path, b"print('hello, world!')")?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r"\\", r"/"),
-        ]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--select", "RUF9", "--preview", "--output-format=concise", "--no-cache"])
-            .args([file_a_path, file_b_path]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-    [TMP]/normal.py:1:1: RUF900 Hey this is a stable test rule.
-    [TMP]/normal.py:1:1: RUF901 [*] Hey this is a stable test rule with a safe fix.
-    [TMP]/normal.py:1:1: RUF902 Hey this is a stable test rule with an unsafe fix.
-    [TMP]/normal.py:1:1: RUF903 Hey this is a stable test rule with a display only fix.
-    [TMP]/normal.py:1:1: RUF911 Hey this is a preview test rule.
-    [TMP]/normal.py:1:1: RUF950 Hey this is a test rule that was redirected from another.
-    [TMP]/panic.py: panic: Fatal error while linting: This is a fake panic for testing.
-    Found 7 errors.
-    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
-    ");
-    });
-    Ok(())
-}
-
-#[test]
-fn rule_panic_mixed_results_full() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    // Create python files
-    let file_a_path = tempdir.path().join("normal.py");
-    let file_b_path = tempdir.path().join("panic.py");
-    fs::write(&file_a_path, b"import os")?;
-    fs::write(&file_b_path, b"print('hello, world!')")?;
-
-    insta::with_settings!({
-        filters => vec![
-            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
-            (r"\\", r"/"),
-        ]
-    }, {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--select", "RUF9", "--preview", "--output-format=full", "--no-cache"])
-            .args([file_a_path, file_b_path]),
-        @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-    RUF900 Hey this is a stable test rule.
-    --> [TMP]/normal.py:1:1
-
-    RUF901 [*] Hey this is a stable test rule with a safe fix.
-    --> [TMP]/normal.py:1:1
-    1 + # fix from stable-test-rule-safe-fix
-    2 | import os
-
-    RUF902 Hey this is a stable test rule with an unsafe fix.
-    --> [TMP]/normal.py:1:1
-
-    RUF903 Hey this is a stable test rule with a display only fix.
-    --> [TMP]/normal.py:1:1
-
-    RUF911 Hey this is a preview test rule.
-    --> [TMP]/normal.py:1:1
-
-    RUF950 Hey this is a test rule that was redirected from another.
-    --> [TMP]/normal.py:1:1
-
-    panic: Fatal error while linting: This is a fake panic for testing.
-    --> [TMP]/panic.py:1:1
-    info: panicked at crates/ruff_linter/src/rules/ruff/rules/test_rules.rs:511:9:
-    This is a fake panic for testing.
-    run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-
-
-    Found 7 errors.
-    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    error: Panic during linting indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-    ...with the relevant file contents, the `pyproject.toml` settings, and the stack trace above, we'd be very appreciative!
-    ");
-    });
-    Ok(())
-}
-
-/// 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(())
-}

crates/ruff/tests/snapshots/integration_test__rule_f401.snap

@@ -55,10 +55,6 @@ either a redundant alias or, if already present in the file, an `__all__` entry.
 to remove third-party and standard library imports -- the fix is unsafe because the module's
 interface changes.
 
-See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
-for more details on how Ruff
-determines whether an import is first or third-party.
-
 ## Example
 
 ```python
@@ -87,6 +83,11 @@ else:
     print("numpy is not installed")
 ```
 
+## Preview
+When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
+the criterion for determining whether an import is first-party
+is stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
+
 ## Options
 - `lint.ignore-init-module-imports`
 - `lint.pyflakes.allowed-unused-imports`
@@ -94,6 +95,6 @@ else:
 ## References
 - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
-- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
+- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)
 
 ----- stderr -----

crates/ruff/tests/snapshots/lint__output_format_azure.snap

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

crates/ruff/tests/snapshots/lint__output_format_concise.snap

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

crates/ruff/tests/snapshots/lint__output_format_full.snap

@@ -16,28 +16,25 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-F401 [*] `os` imported but unused
- --> input.py:1:8
+input.py:1:8: F401 [*] `os` imported but unused
   |
 1 | import os  # F401
-  |        ^^
+  |        ^^ F401
 2 | x = y      # F821
 3 | match 42:  # invalid-syntax
   |
-help: Remove unused import: `os`
+  = help: Remove unused import: `os`
 
-F821 Undefined name `y`
- --> input.py:2:5
+input.py:2:5: F821 Undefined name `y`
   |
 1 | import os  # F401
 2 | x = y      # F821
-  |     ^
+  |     ^ F821
 3 | match 42:  # invalid-syntax
 4 |     case _: ...
   |
 
-invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
- --> input.py:3:1
+input.py:3:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
   |
 1 | import os  # F401
 2 | x = y      # F821

crates/ruff/tests/snapshots/lint__output_format_github.snap

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

crates/ruff/tests/snapshots/lint__output_format_gitlab.snap

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

crates/ruff/tests/snapshots/lint__output_format_grouped.snap

@@ -19,7 +19,7 @@ exit_code: 1
 input.py:
   1:8 F401 [*] `os` imported but unused
   2:5 F821 Undefined name `y`
-  3:1 invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+  3:1 SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
 
 Found 3 errors.
 [*] 1 fixable with the `--fix` option.

crates/ruff/tests/snapshots/lint__output_format_json-lines.snap

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

crates/ruff/tests/snapshots/lint__output_format_json.snap

@@ -69,7 +69,7 @@ exit_code: 1
   },
   {
     "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
     "end_location": {
       "column": 6,
       "row": 3
@@ -80,7 +80,7 @@ exit_code: 1
       "column": 1,
       "row": 3
     },
-    "message": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
+    "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
     "noqa_row": null,
     "url": null
   }

crates/ruff/tests/snapshots/lint__output_format_junit.snap

@@ -26,7 +26,7 @@ exit_code: 1
             <failure message="Undefined name `y`">line 2, col 5, Undefined name `y`</failure>
         </testcase>
         <testcase name="org.ruff.invalid-syntax" classname="[TMP]/input" line="3" column="1">
-            <failure message="Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)">line 3, col 1, Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)</failure>
+            <failure message="SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)">line 3, col 1, SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)</failure>
         </testcase>
     </testsuite>
 </testsuites>

crates/ruff/tests/snapshots/lint__output_format_pylint.snap

@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 input.py:1: [F401] `os` imported but unused
 input.py:2: [F821] Undefined name `y`
-input.py:3: [invalid-syntax] Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+input.py:3: [invalid-syntax] SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
 
 ----- stderr -----

crates/ruff/tests/snapshots/lint__output_format_rdjson.snap

@@ -90,7 +90,7 @@ exit_code: 1
           }
         }
       },
-      "message": "Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
+      "message": "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)"
     }
   ],
   "severity": "WARNING",

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

crates/ruff_annotate_snippets/src/lib.rs

@@ -1,5 +1,3 @@
-#![expect(clippy::needless_doctest_main)]
-
 //! A library for formatting of text or programming code snippets.
 //!
 //! It's primary purpose is to build an ASCII-graphical representation of the snippet

crates/ruff_annotate_snippets/src/renderer/display_list.rs

@@ -193,14 +193,9 @@ impl DisplaySet<'_> {
         stylesheet: &Stylesheet,
         buffer: &mut StyledBuffer,
     ) -> fmt::Result {
-        let hide_severity = annotation.annotation_type.is_none();
         let color = get_annotation_style(&annotation.annotation_type, stylesheet);
         let formatted_len = if let Some(id) = &annotation.id {
-            if hide_severity {
-                id.len()
-            } else {
-                2 + id.len() + annotation_type_len(&annotation.annotation_type)
-            }
+            2 + id.len() + annotation_type_len(&annotation.annotation_type)
         } else {
             annotation_type_len(&annotation.annotation_type)
         };
@@ -214,66 +209,18 @@ impl DisplaySet<'_> {
         if formatted_len == 0 {
             self.format_label(line_offset, &annotation.label, stylesheet, buffer)
         } else {
-            // TODO(brent) All of this complicated checking of `hide_severity` should be reverted
-            // once we have real severities in Ruff. This code is trying to account for two
-            // different cases:
-            //
-            // - main diagnostic message
-            // - subdiagnostic message
-            //
-            // In the first case, signaled by `hide_severity = true`, we want to print the ID (the
-            // noqa code for a ruff lint diagnostic, e.g. `F401`, or `invalid-syntax` for a syntax
-            // error) without brackets. Instead, for subdiagnostics, we actually want to print the
-            // severity (usually `help`) regardless of the `hide_severity` setting. This is signaled
-            // by an ID of `None`.
-            //
-            // With real severities these should be reported more like in ty:
-            //
-            // ```
-            // error[F401]: `math` imported but unused
-            // error[invalid-syntax]: Cannot use `match` statement on Python 3.9...
-            // ```
-            //
-            // instead of the current versions intended to mimic the old Ruff output format:
-            //
-            // ```
-            // F401 `math` imported but unused
-            // invalid-syntax: Cannot use `match` statement on Python 3.9...
-            // ```
-            //
-            // Note that the `invalid-syntax` colon is added manually in `ruff_db`, not here. We
-            // could eventually add a colon to Ruff lint diagnostics (`F401:`) and then make the
-            // colon below unconditional again.
-            //
-            // This also applies to the hard-coded `stylesheet.error()` styling of the
-            // hidden-severity `id`. This should just be `*color` again later, but for now we don't
-            // want an unformatted `id`, which is what `get_annotation_style` returns for
-            // `DisplayAnnotationType::None`.
-            let annotation_type = annotation_type_str(&annotation.annotation_type);
-            if let Some(id) = annotation.id {
-                if hide_severity {
-                    buffer.append(line_offset, &format!("{id} "), *stylesheet.error());
-                } else {
-                    buffer.append(line_offset, &format!("{annotation_type}[{id}]"), *color);
-                }
-            } else {
-                buffer.append(line_offset, annotation_type, *color);
-            }
-
-            if annotation.is_fixable {
-                buffer.append(line_offset, "[", stylesheet.none);
-                buffer.append(line_offset, "*", stylesheet.help);
-                buffer.append(line_offset, "]", stylesheet.none);
-                // In the hide-severity case, we need a space instead of the colon and space below.
-                if hide_severity {
-                    buffer.append(line_offset, " ", stylesheet.none);
-                }
-            }
+            let id = match &annotation.id {
+                Some(id) => format!("[{id}]"),
+                None => String::new(),
+            };
+            buffer.append(
+                line_offset,
+                &format!("{}{}", annotation_type_str(&annotation.annotation_type), id),
+                *color,
+            );
 
             if !is_annotation_empty(annotation) {
-                if annotation.id.is_none() || !hide_severity {
-                    buffer.append(line_offset, ": ", stylesheet.none);
-                }
+                buffer.append(line_offset, ": ", stylesheet.none);
                 self.format_label(line_offset, &annotation.label, stylesheet, buffer)?;
             }
             Ok(())
@@ -302,15 +249,11 @@ impl DisplaySet<'_> {
                 let lineno_color = stylesheet.line_no();
                 buffer.puts(line_offset, lineno_width, header_sigil, *lineno_color);
                 buffer.puts(line_offset, lineno_width + 4, path, stylesheet.none);
-                if let Some(Position { row, col, cell }) = pos {
-                    if let Some(cell) = cell {
-                        buffer.append(line_offset, ":", stylesheet.none);
-                        buffer.append(line_offset, &format!("cell {cell}"), stylesheet.none);
-                    }
-                    buffer.append(line_offset, ":", stylesheet.none);
-                    buffer.append(line_offset, row.to_string().as_str(), stylesheet.none);
+                if let Some((col, row)) = pos {
                     buffer.append(line_offset, ":", stylesheet.none);
                     buffer.append(line_offset, col.to_string().as_str(), stylesheet.none);
+                    buffer.append(line_offset, ":", stylesheet.none);
+                    buffer.append(line_offset, row.to_string().as_str(), stylesheet.none);
                 }
                 Ok(())
             }
@@ -825,7 +768,6 @@ pub(crate) struct Annotation<'a> {
     pub(crate) annotation_type: DisplayAnnotationType,
     pub(crate) id: Option<&'a str>,
     pub(crate) label: Vec<DisplayTextFragment<'a>>,
-    pub(crate) is_fixable: bool,
 }
 
 /// A single line used in `DisplayList`.
@@ -891,13 +833,6 @@ impl DisplaySourceAnnotation<'_> {
     }
 }
 
-#[derive(Debug, PartialEq)]
-pub(crate) struct Position {
-    row: usize,
-    col: usize,
-    cell: Option<usize>,
-}
-
 /// Raw line - a line which does not have the `lineno` part and is not considered
 /// a part of the snippet.
 #[derive(Debug, PartialEq)]
@@ -906,7 +841,7 @@ pub(crate) enum DisplayRawLine<'a> {
     /// slice in the project structure.
     Origin {
         path: &'a str,
-        pos: Option<Position>,
+        pos: Option<(usize, usize)>,
         header_type: DisplayHeaderType,
     },
 
@@ -985,13 +920,6 @@ pub(crate) enum DisplayAnnotationType {
     Help,
 }
 
-impl DisplayAnnotationType {
-    #[inline]
-    const fn is_none(&self) -> bool {
-        matches!(self, Self::None)
-    }
-}
-
 impl From<snippet::Level> for DisplayAnnotationType {
     fn from(at: snippet::Level) -> Self {
         match at {
@@ -1087,12 +1015,11 @@ fn format_message<'m>(
         title,
         footer,
         snippets,
-        is_fixable,
     } = message;
 
     let mut sets = vec![];
     let body = if !snippets.is_empty() || primary {
-        vec![format_title(level, id, title, is_fixable)]
+        vec![format_title(level, id, title)]
     } else {
         format_footer(level, id, title)
     };
@@ -1133,18 +1060,12 @@ fn format_message<'m>(
     sets
 }
 
-fn format_title<'a>(
-    level: crate::Level,
-    id: Option<&'a str>,
-    label: &'a str,
-    is_fixable: bool,
-) -> DisplayLine<'a> {
+fn format_title<'a>(level: crate::Level, id: Option<&'a str>, label: &'a str) -> DisplayLine<'a> {
     DisplayLine::Raw(DisplayRawLine::Annotation {
         annotation: Annotation {
             annotation_type: DisplayAnnotationType::from(level),
             id,
             label: format_label(Some(label), Some(DisplayTextStyle::Emphasis)),
-            is_fixable,
         },
         source_aligned: false,
         continuation: false,
@@ -1163,7 +1084,6 @@ fn format_footer<'a>(
                 annotation_type: DisplayAnnotationType::from(level),
                 id,
                 label: format_label(Some(line), None),
-                is_fixable: false,
             },
             source_aligned: true,
             continuation: i != 0,
@@ -1198,28 +1118,6 @@ fn format_snippet<'m>(
     let main_range = snippet.annotations.first().map(|x| x.range.start);
     let origin = snippet.origin;
     let need_empty_header = origin.is_some() || is_first;
-
-    let is_file_level = snippet.annotations.iter().any(|ann| ann.is_file_level);
-    if is_file_level {
-        // TODO(brent) enable this assertion again once we set `is_file_level` for individual rules.
-        // It's causing too many false positives currently when the default is to make any
-        // annotation with a default range file-level. See
-        // https://github.com/astral-sh/ruff/issues/19688.
-        //
-        // assert!(
-        //     snippet.source.is_empty(),
-        //     "Non-empty file-level snippet that won't be rendered: {:?}",
-        //     snippet.source
-        // );
-        let header = format_header(origin, main_range, &[], is_first, snippet.cell_index);
-        return DisplaySet {
-            display_lines: header.map_or_else(Vec::new, |header| vec![header]),
-            margin: Margin::new(0, 0, 0, 0, term_width, 0),
-        };
-    }
-
-    let cell_index = snippet.cell_index;
-
     let mut body = format_body(
         snippet,
         need_empty_header,
@@ -1228,13 +1126,7 @@ fn format_snippet<'m>(
         anonymized_line_numbers,
         cut_indicator,
     );
-    let header = format_header(
-        origin,
-        main_range,
-        &body.display_lines,
-        is_first,
-        cell_index,
-    );
+    let header = format_header(origin, main_range, &body.display_lines, is_first);
 
     if let Some(header) = header {
         body.display_lines.insert(0, header);
@@ -1254,7 +1146,6 @@ fn format_header<'a>(
     main_range: Option<usize>,
     body: &[DisplayLine<'_>],
     is_first: bool,
-    cell_index: Option<usize>,
 ) -> Option<DisplayLine<'a>> {
     let display_header = if is_first {
         DisplayHeaderType::Initial
@@ -1278,31 +1169,20 @@ fn format_header<'a>(
                 ..
             } = item
             {
-                // At the very end of the `main_range`, report the location as the first character
-                // in the next line instead of falling back to the default location of `1:1`. This
-                // is another divergence from upstream.
-                let end_of_range = range.1 + max(*end_line as usize, 1);
-                if main_range >= range.0 && main_range < end_of_range {
+                if main_range >= range.0 && main_range < range.1 + max(*end_line as usize, 1) {
                     let char_column = text[0..(main_range - range.0).min(text.len())]
                         .chars()
                         .count();
                     col = char_column + 1;
                     line_offset = lineno.unwrap_or(1);
                     break;
-                } else if main_range == end_of_range {
-                    line_offset = lineno.map_or(1, |line| line + 1);
-                    break;
                 }
             }
         }
 
         return Some(DisplayLine::Raw(DisplayRawLine::Origin {
             path,
-            pos: Some(Position {
-                row: line_offset,
-                col,
-                cell: cell_index,
-            }),
+            pos: Some((line_offset, col)),
             header_type: display_header,
         }));
     }
@@ -1592,7 +1472,6 @@ fn format_body<'m>(
                                 annotation_type,
                                 id: None,
                                 label: format_label(annotation.label, None),
-                                is_fixable: false,
                             },
                             range,
                             annotation_type: DisplayAnnotationType::from(annotation.level),
@@ -1632,7 +1511,6 @@ fn format_body<'m>(
                                 annotation_type,
                                 id: None,
                                 label: vec![],
-                                is_fixable: false,
                             },
                             range,
                             annotation_type: DisplayAnnotationType::from(annotation.level),
@@ -1702,7 +1580,6 @@ fn format_body<'m>(
                                 annotation_type,
                                 id: None,
                                 label: format_label(annotation.label, None),
-                                is_fixable: false,
                             },
                             range,
                             annotation_type: DisplayAnnotationType::from(annotation.level),

crates/ruff_annotate_snippets/src/snippet.rs

@@ -22,7 +22,6 @@ pub struct Message<'a> {
     pub(crate) title: &'a str,
     pub(crate) snippets: Vec<Snippet<'a>>,
     pub(crate) footer: Vec<Message<'a>>,
-    pub(crate) is_fixable: bool,
 }
 
 impl<'a> Message<'a> {
@@ -50,15 +49,6 @@ impl<'a> Message<'a> {
         self.footer.extend(footer);
         self
     }
-
-    /// Whether or not the diagnostic for this message is fixable.
-    ///
-    /// This is rendered as a `[*]` indicator after the `id` in an annotation header, if the
-    /// annotation also has `Level::None`.
-    pub fn is_fixable(mut self, yes: bool) -> Self {
-        self.is_fixable = yes;
-        self
-    }
 }
 
 /// Structure containing the slice of text to be annotated and
@@ -75,10 +65,6 @@ pub struct Snippet<'a> {
     pub(crate) annotations: Vec<Annotation<'a>>,
 
     pub(crate) fold: bool,
-
-    /// The optional cell index in a Jupyter notebook, used for reporting source locations along
-    /// with the ranges on `annotations`.
-    pub(crate) cell_index: Option<usize>,
 }
 
 impl<'a> Snippet<'a> {
@@ -89,7 +75,6 @@ impl<'a> Snippet<'a> {
             source,
             annotations: vec![],
             fold: false,
-            cell_index: None,
         }
     }
 
@@ -118,12 +103,6 @@ impl<'a> Snippet<'a> {
         self.fold = fold;
         self
     }
-
-    /// Attach a Jupyter notebook cell index.
-    pub fn cell_index(mut self, index: Option<usize>) -> Self {
-        self.cell_index = index;
-        self
-    }
 }
 
 /// An annotation for a [`Snippet`].
@@ -135,7 +114,6 @@ pub struct Annotation<'a> {
     pub(crate) range: Range<usize>,
     pub(crate) label: Option<&'a str>,
     pub(crate) level: Level,
-    pub(crate) is_file_level: bool,
 }
 
 impl<'a> Annotation<'a> {
@@ -143,11 +121,6 @@ impl<'a> Annotation<'a> {
         self.label = Some(label);
         self
     }
-
-    pub fn is_file_level(mut self, yes: bool) -> Self {
-        self.is_file_level = yes;
-        self
-    }
 }
 
 /// Types of annotations.
@@ -172,7 +145,6 @@ impl Level {
             title,
             snippets: vec![],
             footer: vec![],
-            is_fixable: false,
         }
     }
 
@@ -182,7 +154,6 @@ impl Level {
             range: span,
             label: None,
             level: self,
-            is_file_level: false,
         }
     }
 }

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 {

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 {

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 {

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 {

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 {

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 {

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 }

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 }

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 {

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 {

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 }

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 {

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 {

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 {

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 }

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 {

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 {

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 {

crates/ruff_benchmark/Cargo.toml

@@ -86,5 +86,5 @@ walltime = ["ruff_db/os", "ty_project", "divan"]
 [target.'cfg(target_os = "windows")'.dev-dependencies]
 mimalloc = { workspace = true }
 
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dev-dependencies]
 tikv-jemallocator = { workspace = true }

crates/ruff_benchmark/benches/formatter.rs

@@ -21,8 +21,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[global_allocator]

crates/ruff_benchmark/benches/lexer.rs

@@ -18,8 +18,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[global_allocator]

crates/ruff_benchmark/benches/linter.rs

@@ -26,8 +26,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[global_allocator]
@@ -43,8 +42,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[unsafe(export_name = "_rjem_malloc_conf")]
@@ -79,11 +77,8 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                 b.iter_batched(
                     || parsed.clone(),
                     |parsed| {
-                        // Assert that file contains no parse errors
-                        assert!(parsed.has_valid_syntax());
-
                         let path = case.path();
-                        lint_only(
+                        let result = lint_only(
                             &path,
                             None,
                             settings,
@@ -91,7 +86,10 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                             &SourceKind::Python(case.code().to_string()),
                             PySourceType::from(path.as_path()),
                             ParseSource::Precomputed(parsed),
-                        )
+                        );
+
+                        // Assert that file contains no parse errors
+                        assert!(!result.has_syntax_errors());
                     },
                     criterion::BatchSize::SmallInput,
                 );

crates/ruff_benchmark/benches/parser.rs

@@ -20,8 +20,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
     any(
         target_arch = "x86_64",
         target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
     )
 ))]
 #[global_allocator]

crates/ruff_benchmark/benches/ty.rs

@@ -351,41 +351,6 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
     });
 }
 
-fn benchmark_tuple_implicit_instance_attributes(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[many_tuple_assignments]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression benchmark for a case that used to hang:
-                // https://github.com/astral-sh/ty/issues/765
-                setup_micro_case(
-                    r#"
-                    from typing import Any
-
-                    class A:
-                        foo: tuple[Any, ...]
-
-                    class B(A):
-                        def __init__(self, parent: "C", x: tuple[Any]):
-                            self.foo = parent.foo + x
-
-                    class C(A):
-                        def __init__(self, parent: B, x: tuple[Any]):
-                            self.foo = parent.foo + x
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 fn benchmark_complex_constrained_attributes_1(criterion: &mut Criterion) {
     setup_rayon();
 
@@ -450,6 +415,9 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                     r#"
                     class C:
                         def f(self: "C"):
+                            self.a = ""
+                            self.b = ""
+
                             if isinstance(self.a, str):
                                 return
 
@@ -463,56 +431,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)
                     "#,
                 )
             },
@@ -712,10 +630,8 @@ criterion_group!(
     micro,
     benchmark_many_string_assignments,
     benchmark_many_tuple_assignments,
-    benchmark_tuple_implicit_instance_attributes,
     benchmark_complex_constrained_attributes_1,
     benchmark_complex_constrained_attributes_2,
-    benchmark_complex_constrained_attributes_3,
     benchmark_many_enum_members,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);

crates/ruff_benchmark/benches/ty_walltime.rs

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

crates/ruff_db/Cargo.toml

@@ -14,7 +14,6 @@ license = { workspace = true }
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true, optional = true }
 ruff_diagnostics = { workspace = true }
-ruff_memory_usage = { workspace = true }
 ruff_notebook = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["get-size"] }
 ruff_python_parser = { workspace = true }
@@ -34,17 +33,16 @@ glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
 path-slash = { workspace = true }
-pathdiff = { workspace = true }
 quick-junit = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-similar = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
+unicode-width = { workspace = true }
 zip = { workspace = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]
@@ -54,7 +52,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]

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};
 
@@ -22,7 +21,7 @@ mod stylesheet;
 /// characteristics in the inputs given to the tool. Typically, but not always,
 /// a characteristic is a deficiency. An example of a characteristic that is
 /// _not_ a deficiency is the `reveal_type` diagnostic for our type checker.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct Diagnostic {
     /// The actual diagnostic.
     ///
@@ -213,7 +212,7 @@ impl Diagnostic {
     /// The type returned implements the `std::fmt::Display` trait. In most
     /// cases, just converting it to a string (or printing it) will do what
     /// you want.
-    pub fn concise_message(&self) -> ConciseMessage<'_> {
+    pub fn concise_message(&self) -> ConciseMessage {
         let main = self.inner.message.as_str();
         let annotation = self
             .primary_annotation()
@@ -255,11 +254,6 @@ impl Diagnostic {
             .find(|ann| ann.is_primary)
     }
 
-    /// Returns a mutable borrow of all annotations of this diagnostic.
-    pub fn annotations_mut(&mut self) -> impl Iterator<Item = &mut Annotation> {
-        Arc::make_mut(&mut self.inner).annotations.iter_mut()
-    }
-
     /// Returns the "primary" span of this diagnostic if one exists.
     ///
     /// When there are multiple primary spans, then the first one that was
@@ -316,21 +310,11 @@ impl Diagnostic {
         &self.inner.subs
     }
 
-    /// Returns a mutable borrow of the sub-diagnostics of this diagnostic.
-    pub fn sub_diagnostics_mut(&mut self) -> impl Iterator<Item = &mut SubDiagnostic> {
-        Arc::make_mut(&mut self.inner).subs.iter_mut()
-    }
-
     /// Returns the fix for this diagnostic if it exists.
     pub fn fix(&self) -> Option<&Fix> {
         self.inner.fix.as_ref()
     }
 
-    #[cfg(test)]
-    pub(crate) fn fix_mut(&mut self) -> Option<&mut Fix> {
-        Arc::make_mut(&mut self.inner).fix.as_mut()
-    }
-
     /// Set the fix for this diagnostic.
     pub fn set_fix(&mut self, fix: Fix) {
         debug_assert!(
@@ -350,13 +334,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.
@@ -389,16 +366,6 @@ impl Diagnostic {
         self.inner.secondary_code.as_ref()
     }
 
-    /// Returns the secondary code for the diagnostic if it exists, or the lint name otherwise.
-    ///
-    /// This is a common pattern for Ruff diagnostics, which want to use the noqa code in general,
-    /// but fall back on the `invalid-syntax` identifier for syntax errors, which don't have
-    /// secondary codes.
-    pub fn secondary_code_or_id(&self) -> &str {
-        self.secondary_code()
-            .map_or_else(|| self.inner.id.as_str(), SecondaryCode::as_str)
-    }
-
     /// Set the secondary code for this diagnostic.
     pub fn set_secondary_code(&mut self, code: SecondaryCode) {
         Arc::make_mut(&mut self.inner).secondary_code = Some(code);
@@ -455,26 +422,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.
@@ -495,26 +460,26 @@ impl Diagnostic {
         self.primary_span()?.range()
     }
 
+    /// Returns the [`TextRange`] for the diagnostic.
+    ///
+    /// Panics if the diagnostic has no primary span or if the span has no range.
+    pub fn expect_range(&self) -> TextRange {
+        self.range().expect("Expected a range for the primary span")
+    }
+
     /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
     ///
-    /// Panics if either diagnostic has no primary span, or if its file is not a `SourceFile`.
+    /// 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 {
-        let a = (
-            self.severity().is_fatal(),
-            self.expect_ruff_source_file(),
-            self.range().map(|r| r.start()),
-        );
-        let b = (
-            other.severity().is_fatal(),
+        (self.expect_ruff_source_file(), self.expect_range().start()).cmp(&(
             other.expect_ruff_source_file(),
-            other.range().map(|r| r.start()),
-        );
-
-        a.cmp(&b)
+            other.expect_range().start(),
+        ))
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 struct DiagnosticInner {
     id: DiagnosticId,
     severity: Severity,
@@ -590,7 +555,7 @@ impl Eq for RenderingSortKey<'_> {}
 /// Currently, the order in which sub-diagnostics are rendered relative to one
 /// another (for a single parent diagnostic) is the order in which they were
 /// attached to the diagnostic.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct SubDiagnostic {
     /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
     /// pointer-sized.
@@ -646,11 +611,6 @@ impl SubDiagnostic {
         &self.inner.annotations
     }
 
-    /// Returns a mutable borrow of the annotations of this sub-diagnostic.
-    pub fn annotations_mut(&mut self) -> impl Iterator<Item = &mut Annotation> {
-        self.inner.annotations.iter_mut()
-    }
-
     /// Returns a shared borrow of the "primary" annotation of this diagnostic
     /// if one exists.
     ///
@@ -684,7 +644,7 @@ impl SubDiagnostic {
     /// The type returned implements the `std::fmt::Display` trait. In most
     /// cases, just converting it to a string (or printing it) will do what
     /// you want.
-    pub fn concise_message(&self) -> ConciseMessage<'_> {
+    pub fn concise_message(&self) -> ConciseMessage {
         let main = self.inner.message.as_str();
         let annotation = self
             .primary_annotation()
@@ -699,7 +659,7 @@ impl SubDiagnostic {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 struct SubDiagnosticInner {
     severity: SubDiagnosticSeverity,
     message: DiagnosticMessage,
@@ -727,7 +687,7 @@ struct SubDiagnosticInner {
 ///
 /// Messages attached to annotations should also be as brief and specific as
 /// possible. Long messages could negative impact the quality of rendering.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub struct Annotation {
     /// The span of this annotation, corresponding to some subsequence of the
     /// user's input that we want to highlight.
@@ -742,11 +702,6 @@ pub struct Annotation {
     is_primary: bool,
     /// The diagnostic tags associated with this annotation.
     tags: Vec<DiagnosticTag>,
-    /// Whether this annotation is a file-level or full-file annotation.
-    ///
-    /// When set, rendering will only include the file's name and (optional) range. Everything else
-    /// is omitted, including any file snippet or message.
-    is_file_level: bool,
 }
 
 impl Annotation {
@@ -765,7 +720,6 @@ impl Annotation {
             message: None,
             is_primary: true,
             tags: Vec::new(),
-            is_file_level: false,
         }
     }
 
@@ -782,7 +736,6 @@ impl Annotation {
             message: None,
             is_primary: false,
             tags: Vec::new(),
-            is_file_level: false,
         }
     }
 
@@ -848,28 +801,13 @@ impl Annotation {
     pub fn push_tag(&mut self, tag: DiagnosticTag) {
         self.tags.push(tag);
     }
-
-    /// Set whether or not this annotation is file-level.
-    ///
-    /// File-level annotations are only rendered with their file name and range, if available. This
-    /// is intended for backwards compatibility with Ruff diagnostics, which historically used
-    /// `TextRange::default` to indicate a file-level diagnostic. In the new diagnostic model, a
-    /// [`Span`] with a range of `None` should be used instead, as mentioned in the `Span`
-    /// documentation.
-    ///
-    /// TODO(brent) update this usage in Ruff and remove `is_file_level` entirely. See
-    /// <https://github.com/astral-sh/ruff/issues/19688>, especially my first comment, for more
-    /// details.
-    pub fn set_file_level(&mut self, yes: bool) {
-        self.is_file_level = yes;
-    }
 }
 
 /// Tags that can be associated with an annotation.
 ///
 /// These tags are used to provide additional information about the annotation.
 /// and are passed through to the language server protocol.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
 pub enum DiagnosticTag {
     /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
     Unnecessary,
@@ -1078,7 +1016,7 @@ impl std::fmt::Display for DiagnosticId {
 ///
 /// This enum presents a unified interface to these two types for the sake of creating [`Span`]s and
 /// emitting diagnostics from both ty and ruff.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub enum UnifiedFile {
     Ty(File),
     Ruff(SourceFile),
@@ -1129,7 +1067,7 @@ enum DiagnosticSource {
 
 impl DiagnosticSource {
     /// Returns this input as a `SourceCode` for convenient querying.
-    fn as_source_code(&self) -> SourceCode<'_, '_> {
+    fn as_source_code(&self) -> SourceCode {
         match self {
             DiagnosticSource::Ty(input) => SourceCode::new(input.text.as_str(), &input.line_index),
             DiagnosticSource::Ruff(source) => SourceCode::new(source.source_text(), source.index()),
@@ -1142,7 +1080,7 @@ impl DiagnosticSource {
 /// It consists of a `File` and an optional range into that file. When the
 /// range isn't present, it semantically implies that the diagnostic refers to
 /// the entire file. For example, when the file should be executable but isn't.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
 pub struct Span {
     file: UnifiedFile,
     range: Option<TextRange>,
@@ -1220,7 +1158,7 @@ impl From<crate::files::FileRange> for Span {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
 pub enum Severity {
     Info,
     Warning,
@@ -1255,7 +1193,7 @@ impl Severity {
 /// This type only exists to add an additional `Help` severity that isn't present in `Severity` or
 /// used for main diagnostics. If we want to add `Severity::Help` in the future, this type could be
 /// deleted and the two combined again.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
 pub enum SubDiagnosticSeverity {
     Help,
     Info,
@@ -1309,10 +1247,6 @@ pub struct DisplayDiagnosticConfig {
     hide_severity: bool,
     /// Whether to show the availability of a fix in a diagnostic.
     show_fix_status: bool,
-    /// Whether to show the diff for an available fix after the main diagnostic.
-    ///
-    /// This currently only applies to `DiagnosticFormat::Full`.
-    show_fix_diff: bool,
     /// The lowest applicability that should be shown when reporting diagnostics.
     fix_applicability: Applicability,
 }
@@ -1360,14 +1294,6 @@ impl DisplayDiagnosticConfig {
         }
     }
 
-    /// Whether to show a diff for an available fix after the main diagnostic.
-    pub fn show_fix_diff(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            show_fix_diff: yes,
-            ..self
-        }
-    }
-
     /// Set the lowest fix applicability that should be shown.
     ///
     /// In other words, an applicability of `Safe` (the default) would suppress showing fixes or fix
@@ -1391,7 +1317,6 @@ impl Default for DisplayDiagnosticConfig {
             preview: false,
             hide_severity: false,
             show_fix_status: false,
-            show_fix_diff: false,
             fix_applicability: Applicability::Safe,
         }
     }
@@ -1445,16 +1370,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.
@@ -1513,7 +1428,7 @@ impl std::fmt::Display for ConciseMessage<'_> {
 /// In most cases, callers shouldn't need to use this. Instead, there is
 /// a blanket trait implementation for `IntoDiagnosticMessage` for
 /// anything that implements `std::fmt::Display`.
-#[derive(Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
 pub struct DiagnosticMessage(Box<str>);
 
 impl DiagnosticMessage {

crates/ruff_db/src/diagnostic/render.rs

@@ -2,19 +2,20 @@ use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::path::Path;
 
-use full::FullRenderer;
 use ruff_annotate_snippets::{
     Annotation as AnnotateAnnotation, Level as AnnotateLevel, Message as AnnotateMessage,
-    Snippet as AnnotateSnippet,
+    Renderer as AnnotateRenderer, Snippet as AnnotateSnippet,
 };
 use ruff_notebook::{Notebook, NotebookIndex};
 use ruff_source_file::{LineIndex, OneIndexed, SourceCode};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
+use crate::diagnostic::stylesheet::DiagnosticStylesheet;
 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")]
@@ -114,7 +111,37 @@ impl std::fmt::Display for DisplayDiagnostics<'_> {
                 ConciseRenderer::new(self.resolver, self.config).render(f, self.diagnostics)?;
             }
             DiagnosticFormat::Full => {
-                FullRenderer::new(self.resolver, self.config).render(f, self.diagnostics)?;
+                let stylesheet = if self.config.color {
+                    DiagnosticStylesheet::styled()
+                } else {
+                    DiagnosticStylesheet::plain()
+                };
+
+                let mut renderer = if self.config.color {
+                    AnnotateRenderer::styled()
+                } else {
+                    AnnotateRenderer::plain()
+                }
+                .cut_indicator("…");
+
+                renderer = renderer
+                    .error(stylesheet.error)
+                    .warning(stylesheet.warning)
+                    .info(stylesheet.info)
+                    .note(stylesheet.note)
+                    .help(stylesheet.help)
+                    .line_no(stylesheet.line_no)
+                    .emphasis(stylesheet.emphasis)
+                    .none(stylesheet.none);
+
+                for diag in self.diagnostics {
+                    let resolved = Resolved::new(self.resolver, diag);
+                    let renderable = resolved.to_renderable(self.config.context);
+                    for diag in renderable.diagnostics.iter() {
+                        writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
+                    }
+                    writeln!(f)?;
+                }
             }
             DiagnosticFormat::Azure => {
                 AzureRenderer::new(self.resolver).render(f, self.diagnostics)?;
@@ -139,13 +166,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(())
@@ -171,13 +191,9 @@ struct Resolved<'a> {
 
 impl<'a> Resolved<'a> {
     /// Creates a new resolved set of diagnostics.
-    fn new(
-        resolver: &'a dyn FileResolver,
-        diag: &'a Diagnostic,
-        config: &DisplayDiagnosticConfig,
-    ) -> Resolved<'a> {
+    fn new(resolver: &'a dyn FileResolver, diag: &'a Diagnostic) -> Resolved<'a> {
         let mut diagnostics = vec![];
-        diagnostics.push(ResolvedDiagnostic::from_diagnostic(resolver, config, diag));
+        diagnostics.push(ResolvedDiagnostic::from_diagnostic(resolver, diag));
         for sub in &diag.inner.subs {
             diagnostics.push(ResolvedDiagnostic::from_sub_diagnostic(resolver, sub));
         }
@@ -207,14 +223,12 @@ struct ResolvedDiagnostic<'a> {
     id: Option<String>,
     message: String,
     annotations: Vec<ResolvedAnnotation<'a>>,
-    is_fixable: bool,
 }
 
 impl<'a> ResolvedDiagnostic<'a> {
     /// Resolve a single diagnostic.
     fn from_diagnostic(
         resolver: &'a dyn FileResolver,
-        config: &DisplayDiagnosticConfig,
         diag: &'a Diagnostic,
     ) -> ResolvedDiagnostic<'a> {
         let annotations: Vec<_> = diag
@@ -222,43 +236,18 @@ impl<'a> ResolvedDiagnostic<'a> {
             .annotations
             .iter()
             .filter_map(|ann| {
-                let path = ann
-                    .span
-                    .file
-                    .relative_path(resolver)
-                    .to_str()
-                    .unwrap_or_else(|| ann.span.file.path(resolver));
+                let path = ann.span.file.path(resolver);
                 let diagnostic_source = ann.span.file.diagnostic_source(resolver);
-                ResolvedAnnotation::new(path, &diagnostic_source, ann, resolver)
+                ResolvedAnnotation::new(path, &diagnostic_source, ann)
             })
             .collect();
-
-        let id = if config.hide_severity {
-            // Either the rule code alone (e.g. `F401`), or the lint id with a colon (e.g.
-            // `invalid-syntax:`). When Ruff gets real severities, we should put the colon back in
-            // `DisplaySet::format_annotation` for both cases, but this is a small hack to improve
-            // the formatting of syntax errors for now. This should also be kept consistent with the
-            // concise formatting.
-            Some(diag.secondary_code().map_or_else(
-                || format!("{id}:", id = diag.inner.id),
-                |code| code.to_string(),
-            ))
-        } else {
-            Some(diag.inner.id.to_string())
-        };
-
-        let level = if config.hide_severity {
-            AnnotateLevel::None
-        } else {
-            diag.inner.severity.to_annotate()
-        };
-
+        let id = Some(diag.inner.id.to_string());
+        let message = diag.inner.message.as_str().to_string();
         ResolvedDiagnostic {
-            level,
+            level: diag.inner.severity.to_annotate(),
             id,
-            message: diag.inner.message.as_str().to_string(),
+            message,
             annotations,
-            is_fixable: diag.has_applicable_fix(config),
         }
     }
 
@@ -272,14 +261,9 @@ impl<'a> ResolvedDiagnostic<'a> {
             .annotations
             .iter()
             .filter_map(|ann| {
-                let path = ann
-                    .span
-                    .file
-                    .relative_path(resolver)
-                    .to_str()
-                    .unwrap_or_else(|| ann.span.file.path(resolver));
+                let path = ann.span.file.path(resolver);
                 let diagnostic_source = ann.span.file.diagnostic_source(resolver);
-                ResolvedAnnotation::new(path, &diagnostic_source, ann, resolver)
+                ResolvedAnnotation::new(path, &diagnostic_source, ann)
             })
             .collect();
         ResolvedDiagnostic {
@@ -287,7 +271,6 @@ impl<'a> ResolvedDiagnostic<'a> {
             id: None,
             message: diag.inner.message.as_str().to_string(),
             annotations,
-            is_fixable: false,
         }
     }
 
@@ -318,49 +301,20 @@ impl<'a> ResolvedDiagnostic<'a> {
                     &prev.diagnostic_source.as_source_code(),
                     context,
                     prev.line_end,
-                    prev.notebook_index.as_ref(),
                 )
                 .get();
                 let this_context_begins = context_before(
                     &ann.diagnostic_source.as_source_code(),
                     context,
                     ann.line_start,
-                    ann.notebook_index.as_ref(),
                 )
                 .get();
-
-                // For notebooks, check whether the end of the
-                // previous annotation and the start of the current
-                // annotation are in different cells.
-                let prev_cell_index = prev.notebook_index.as_ref().map(|notebook_index| {
-                    let prev_end = prev
-                        .diagnostic_source
-                        .as_source_code()
-                        .line_column(prev.range.end());
-                    notebook_index.cell(prev_end.line).unwrap_or_default().get()
-                });
-                let this_cell_index = ann.notebook_index.as_ref().map(|notebook_index| {
-                    let this_start = ann
-                        .diagnostic_source
-                        .as_source_code()
-                        .line_column(ann.range.start());
-                    notebook_index
-                        .cell(this_start.line)
-                        .unwrap_or_default()
-                        .get()
-                });
-                let in_different_cells = prev_cell_index != this_cell_index;
-
                 // The boundary case here is when `prev_context_ends`
                 // is exactly one less than `this_context_begins`. In
                 // that case, the context windows are adjacent and we
                 // should fall through below to add this annotation to
                 // the existing snippet.
-                //
-                // For notebooks, also check that the context windows
-                // are in the same cell. Windows from different cells
-                // should never be considered adjacent.
-                if in_different_cells || this_context_begins.saturating_sub(prev_context_ends) > 1 {
+                if this_context_begins.saturating_sub(prev_context_ends) > 1 {
                     snippet_by_path
                         .entry(path)
                         .or_default()
@@ -384,7 +338,6 @@ impl<'a> ResolvedDiagnostic<'a> {
             id: self.id.as_deref(),
             message: &self.message,
             snippets_by_input,
-            is_fixable: self.is_fixable,
         }
     }
 }
@@ -404,8 +357,6 @@ struct ResolvedAnnotation<'a> {
     line_end: OneIndexed,
     message: Option<&'a str>,
     is_primary: bool,
-    is_file_level: bool,
-    notebook_index: Option<NotebookIndex>,
 }
 
 impl<'a> ResolvedAnnotation<'a> {
@@ -418,7 +369,6 @@ impl<'a> ResolvedAnnotation<'a> {
         path: &'a str,
         diagnostic_source: &DiagnosticSource,
         ann: &'a Annotation,
-        resolver: &'a dyn FileResolver,
     ) -> Option<ResolvedAnnotation<'a>> {
         let source = diagnostic_source.as_source_code();
         let (range, line_start, line_end) = match (ann.span.range(), ann.message.is_some()) {
@@ -452,8 +402,6 @@ impl<'a> ResolvedAnnotation<'a> {
             line_end,
             message: ann.get_message(),
             is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
-            notebook_index: resolver.notebook_index(&ann.span.file),
         })
     }
 }
@@ -488,10 +436,6 @@ struct RenderableDiagnostic<'r> {
     /// should be from the same file, and none of the snippets inside of a
     /// collection should overlap with one another or be directly adjacent.
     snippets_by_input: Vec<RenderableSnippets<'r>>,
-    /// Whether or not the diagnostic is fixable.
-    ///
-    /// This is rendered as a `[*]` indicator after the diagnostic ID.
-    is_fixable: bool,
 }
 
 impl RenderableDiagnostic<'_> {
@@ -504,7 +448,7 @@ impl RenderableDiagnostic<'_> {
                 .iter()
                 .map(|snippet| snippet.to_annotate(path))
         });
-        let mut message = self.level.title(self.message).is_fixable(self.is_fixable);
+        let mut message = self.level.title(self.message);
         if let Some(id) = self.id {
             message = message.id(id);
         }
@@ -586,27 +530,17 @@ struct RenderableSnippet<'r> {
     /// Whether this snippet contains at least one primary
     /// annotation.
     has_primary: bool,
-    /// The cell index in a Jupyter notebook, if this snippet refers to a notebook.
-    ///
-    /// This is used for rendering annotations with offsets like `cell 1:2:3` instead of simple row
-    /// and column numbers.
-    cell_index: Option<usize>,
 }
 
 impl<'r> RenderableSnippet<'r> {
     /// Creates a new snippet with one or more annotations that is ready to be
-    /// rendered.
+    /// renderer.
     ///
     /// The first line of the snippet is the smallest line number on which one
     /// of the annotations begins, minus the context window size. The last line
     /// is the largest line number on which one of the annotations ends, plus
     /// the context window size.
     ///
-    /// For Jupyter notebooks, the context window may also be truncated at cell
-    /// boundaries. If multiple annotations are present, and they point to
-    /// different cells, these will have already been split into separate
-    /// snippets by `ResolvedDiagnostic::to_renderable`.
-    ///
     /// Callers should guarantee that the `input` on every `ResolvedAnnotation`
     /// given is identical.
     ///
@@ -623,19 +557,19 @@ impl<'r> RenderableSnippet<'r> {
             "creating a renderable snippet requires a non-zero number of annotations",
         );
         let diagnostic_source = &anns[0].diagnostic_source;
-        let notebook_index = anns[0].notebook_index.as_ref();
         let source = diagnostic_source.as_source_code();
         let has_primary = anns.iter().any(|ann| ann.is_primary);
 
-        let content_start_index = anns.iter().map(|ann| ann.line_start).min().unwrap();
-        let line_start = context_before(&source, context, content_start_index, notebook_index);
-
-        let start = source.line_column(anns[0].range.start());
-        let cell_index = notebook_index
-            .map(|notebook_index| notebook_index.cell(start.line).unwrap_or_default().get());
-
-        let content_end_index = anns.iter().map(|ann| ann.line_end).max().unwrap();
-        let line_end = context_after(&source, context, content_end_index, notebook_index);
+        let line_start = context_before(
+            &source,
+            context,
+            anns.iter().map(|ann| ann.line_start).min().unwrap(),
+        );
+        let line_end = context_after(
+            &source,
+            context,
+            anns.iter().map(|ann| ann.line_end).max().unwrap(),
+        );
 
         let snippet_start = source.line_start(line_start);
         let snippet_end = source.line_end(line_end);
@@ -643,22 +577,6 @@ impl<'r> RenderableSnippet<'r> {
             .as_source_code()
             .slice(TextRange::new(snippet_start, snippet_end));
 
-        // Strip the BOM from the beginning of the snippet, if present. Doing this here saves us the
-        // trouble of updating the annotation ranges in `replace_unprintable`, and also allows us to
-        // check that the BOM is at the very beginning of the file, not just the beginning of the
-        // snippet.
-        const BOM: char = '\u{feff}';
-        let bom_len = BOM.text_len();
-        let (snippet, snippet_start) =
-            if snippet_start == TextSize::ZERO && snippet.starts_with(BOM) {
-                (
-                    &snippet[bom_len.to_usize()..],
-                    snippet_start + TextSize::new(bom_len.to_u32()),
-                )
-            } else {
-                (snippet, snippet_start)
-            };
-
         let annotations = anns
             .iter()
             .map(|ann| RenderableAnnotation::new(snippet_start, ann))
@@ -667,20 +585,14 @@ impl<'r> RenderableSnippet<'r> {
         let EscapedSourceCode {
             text: snippet,
             annotations,
-        } = replace_unprintable(snippet, annotations).fix_up_empty_spans_after_line_terminator();
-
-        let line_start = notebook_index.map_or(line_start, |notebook_index| {
-            notebook_index
-                .cell_row(line_start)
-                .unwrap_or(OneIndexed::MIN)
-        });
+        } = replace_whitespace_and_unprintable(snippet, annotations)
+            .fix_up_empty_spans_after_line_terminator();
 
         RenderableSnippet {
             snippet,
             line_start,
             annotations,
             has_primary,
-            cell_index,
         }
     }
 
@@ -694,7 +606,6 @@ impl<'r> RenderableSnippet<'r> {
                     .iter()
                     .map(RenderableAnnotation::to_annotate),
             )
-            .cell_index(self.cell_index)
     }
 }
 
@@ -709,8 +620,6 @@ struct RenderableAnnotation<'r> {
     message: Option<&'r str>,
     /// Whether this annotation is considered "primary" or not.
     is_primary: bool,
-    /// Whether this annotation applies to an entire file, rather than a snippet within it.
-    is_file_level: bool,
 }
 
 impl<'r> RenderableAnnotation<'r> {
@@ -723,16 +632,11 @@ impl<'r> RenderableAnnotation<'r> {
     /// lifetime parameter here refers to the lifetime of the resolver that
     /// created the given `ResolvedAnnotation`.
     fn new(snippet_start: TextSize, ann: &'_ ResolvedAnnotation<'r>) -> RenderableAnnotation<'r> {
-        // This should only ever saturate if a BOM is present _and_ the annotation range points
-        // before the BOM (i.e. at offset 0). In Ruff this typically results from the use of
-        // `TextRange::default()` for a diagnostic range instead of a range relative to file
-        // contents.
-        let range = ann.range.checked_sub(snippet_start).unwrap_or(ann.range);
+        let range = ann.range - snippet_start;
         RenderableAnnotation {
             range,
             message: ann.message,
             is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
         }
     }
 
@@ -758,7 +662,7 @@ impl<'r> RenderableAnnotation<'r> {
         if let Some(message) = self.message {
             ann = ann.label(message);
         }
-        ann.is_file_level(self.is_file_level)
+        ann
     }
 }
 
@@ -799,7 +703,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 {
@@ -835,7 +739,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 {
@@ -885,15 +789,7 @@ pub struct Input {
 ///
 /// The line number returned is guaranteed to be less than
 /// or equal to `start`.
-///
-/// In Jupyter notebooks, lines outside the cell containing
-/// `start` will be omitted.
-fn context_before(
-    source: &SourceCode<'_, '_>,
-    len: usize,
-    start: OneIndexed,
-    notebook_index: Option<&NotebookIndex>,
-) -> OneIndexed {
+fn context_before(source: &SourceCode<'_, '_>, len: usize, start: OneIndexed) -> OneIndexed {
     let mut line = start.saturating_sub(len);
     // Trim leading empty lines.
     while line < start {
@@ -902,17 +798,6 @@ fn context_before(
         }
         line = line.saturating_add(1);
     }
-
-    if let Some(index) = notebook_index {
-        let content_start_cell = index.cell(start).unwrap_or(OneIndexed::MIN);
-        while line < start {
-            if index.cell(line).unwrap_or(OneIndexed::MIN) == content_start_cell {
-                break;
-            }
-            line = line.saturating_add(1);
-        }
-    }
-
     line
 }
 
@@ -922,15 +807,7 @@ fn context_before(
 /// The line number returned is guaranteed to be greater
 /// than or equal to `start` and no greater than the
 /// number of lines in `source`.
-///
-/// In Jupyter notebooks, lines outside the cell containing
-/// `start` will be omitted.
-fn context_after(
-    source: &SourceCode<'_, '_>,
-    len: usize,
-    start: OneIndexed,
-    notebook_index: Option<&NotebookIndex>,
-) -> OneIndexed {
+fn context_after(source: &SourceCode<'_, '_>, len: usize, start: OneIndexed) -> OneIndexed {
     let max_lines = OneIndexed::from_zero_indexed(source.line_count());
     let mut line = start.saturating_add(len).min(max_lines);
     // Trim trailing empty lines.
@@ -940,32 +817,24 @@ fn context_after(
         }
         line = line.saturating_sub(1);
     }
-
-    if let Some(index) = notebook_index {
-        let content_end_cell = index.cell(start).unwrap_or(OneIndexed::MIN);
-        while line > start {
-            if index.cell(line).unwrap_or(OneIndexed::MIN) == content_end_cell {
-                break;
-            }
-            line = line.saturating_sub(1);
-        }
-    }
-
     line
 }
 
-/// Given some source code and annotation ranges, this routine replaces
-/// unprintable characters with printable representations of them.
+/// 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 tabs
+/// with ASCII whitespace, and unprintable characters with printable
+/// representations of them.
 ///
 /// The source code and annotations returned are updated to reflect changes made
 /// to the source code (if any).
-///
-/// We don't need to normalize whitespace, such as converting tabs to spaces,
-/// because `annotate-snippets` handles that internally. Similarly, it's safe to
-/// modify the annotation ranges by inserting 3-byte Unicode replacements
-/// because `annotate-snippets` will account for their actual width when
-/// rendering and displaying the column to the user.
-fn replace_unprintable<'r>(
+fn replace_whitespace_and_unprintable<'r>(
     source: &'r str,
     mut annotations: Vec<RenderableAnnotation<'r>>,
 ) -> EscapedSourceCode<'r> {
@@ -997,22 +866,48 @@ fn replace_unprintable<'r>(
         }
     };
 
+    const TAB_SIZE: usize = 4;
+    let mut width = 0;
+    let mut column = 0;
     let mut last_end = 0;
     let mut result = String::new();
     for (index, c) in source.char_indices() {
-        // normalize `\r` line endings but don't double `\r\n`
-        if c == '\r' && !source[index + 1..].starts_with("\n") {
-            result.push_str(&source[last_end..index]);
-            result.push('\n');
-            last_end = index + 1;
-        } else if let Some(printable) = unprintable_replacement(c) {
-            result.push_str(&source[last_end..index]);
+        let old_width = width;
+        match c {
+            '\n' | '\r' => {
+                width = 0;
+                column = 0;
+            }
+            '\t' => {
+                let tab_offset = TAB_SIZE - (column % TAB_SIZE);
+                width += tab_offset;
+                column += tab_offset;
 
-            let len = printable.text_len().to_u32();
-            update_ranges(result.text_len().to_usize(), len);
+                let tab_width =
+                    u32::try_from(width - old_width).expect("small width because of tab size");
+                result.push_str(&source[last_end..index]);
 
-            result.push(printable);
-            last_end = index + 1;
+                update_ranges(result.text_len().to_usize(), tab_width);
+
+                for _ in 0..tab_width {
+                    result.push(' ');
+                }
+                last_end = index + 1;
+            }
+            _ => {
+                width += unicode_width::UnicodeWidthChar::width(c).unwrap_or(0);
+                column += 1;
+
+                if let Some(printable) = unprintable_replacement(c) {
+                    result.push_str(&source[last_end..index]);
+
+                    let len = printable.text_len().to_u32();
+                    update_ranges(result.text_len().to_usize(), len);
+
+                    result.push(printable);
+                    last_end = index + 1;
+                }
+            }
         }
     }
 
@@ -2622,13 +2517,6 @@ watermelon
             self.config = config;
         }
 
-        /// Show a diff for the fix when rendering.
-        pub(super) fn show_fix_diff(&mut self, yes: bool) {
-            let mut config = std::mem::take(&mut self.config);
-            config = config.show_fix_diff(yes);
-            self.config = config;
-        }
-
         /// 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);
@@ -2656,12 +2544,7 @@ watermelon
         /// of the corresponding line minus one. (The "minus one" is because
         /// otherwise, the span will end where the next line begins, and this
         /// confuses `ruff_annotate_snippets` as of 2025-03-13.)
-        pub(super) fn span(
-            &self,
-            path: &str,
-            line_offset_start: &str,
-            line_offset_end: &str,
-        ) -> Span {
+        fn span(&self, path: &str, line_offset_start: &str, line_offset_end: &str) -> Span {
             let span = self.path(path);
 
             let file = span.expect_ty_file();
@@ -2684,7 +2567,7 @@ watermelon
         }
 
         /// Like `span`, but only attaches a file path.
-        pub(super) fn path(&self, path: &str) -> Span {
+        fn path(&self, path: &str) -> Span {
             let file = system_path_to_file(&self.db, path).unwrap();
             Span::from(file)
         }
@@ -2798,7 +2681,7 @@ watermelon
         ///
         /// See the docs on `TestEnvironment::span` for the meaning of
         /// `path`, `line_offset_start` and `line_offset_end`.
-        pub(super) fn secondary(
+        fn secondary(
             mut self,
             path: &str,
             line_offset_start: &str,
@@ -2834,7 +2717,7 @@ watermelon
         }
 
         /// Adds a "help" sub-diagnostic with the given message.
-        pub(super) fn help(mut self, message: impl IntoDiagnosticMessage) -> DiagnosticBuilder<'e> {
+        fn help(mut self, message: impl IntoDiagnosticMessage) -> DiagnosticBuilder<'e> {
             self.diag.help(message);
             self
         }
@@ -2994,10 +2877,10 @@ if call(foo
         env.format(format);
 
         let diagnostics = vec![
-            env.invalid_syntax("Expected one or more symbol names after import")
+            env.invalid_syntax("SyntaxError: Expected one or more symbol names after import")
                 .primary("syntax_errors.py", "1:14", "1:15", "")
                 .build(),
-            env.invalid_syntax("Expected ')', found newline")
+            env.invalid_syntax("SyntaxError: Expected ')', found newline")
                 .primary("syntax_errors.py", "3:11", "3:12", "")
                 .build(),
         ];
@@ -3005,8 +2888,7 @@ if call(foo
         (env, diagnostics)
     }
 
-    /// A Jupyter notebook for testing diagnostics.
-    ///
+    /// Create Ruff-style diagnostics for testing the various output formats for a notebook.
     ///
     /// The concatenated cells look like this:
     ///
@@ -3026,7 +2908,17 @@ if call(foo
     /// The first diagnostic is on the unused `os` import with location cell 1, row 2, column 8
     /// (`cell 1:2:8`). The second diagnostic is the unused `math` import at `cell 2:2:8`, and the
     /// third diagnostic is an unfixable unused variable at `cell 3:4:5`.
-    pub(super) static NOTEBOOK: &str = r##"
+    #[allow(
+        dead_code,
+        reason = "This is currently only used for JSON but will be needed soon for other formats"
+    )]
+    pub(crate) fn create_notebook_diagnostics(
+        format: DiagnosticFormat,
+    ) -> (TestEnvironment, Vec<Diagnostic>) {
+        let mut env = TestEnvironment::new();
+        env.add(
+            "notebook.ipynb",
+            r##"
         {
  "cells": [
   {
@@ -3065,14 +2957,8 @@ if call(foo
  "nbformat": 4,
  "nbformat_minor": 5
 }
-"##;
-
-    /// Create Ruff-style diagnostics for testing the various output formats for a notebook.
-    pub(crate) fn create_notebook_diagnostics(
-        format: DiagnosticFormat,
-    ) -> (TestEnvironment, Vec<Diagnostic>) {
-        let mut env = TestEnvironment::new();
-        env.add("notebook.ipynb", NOTEBOOK);
+"##,
+        );
         env.format(format);
 
         let diagnostics = vec![

crates/ruff_db/src/diagnostic/render/azure.rs

@@ -50,8 +50,10 @@ impl AzureRenderer<'_> {
             }
             writeln!(
                 f,
-                "code={code};]{body}",
-                code = diag.secondary_code_or_id(),
+                "{code}]{body}",
+                code = diag
+                    .secondary_code()
+                    .map_or_else(String::new, |code| format!("code={code};")),
                 body = diag.body(),
             )?;
         }

crates/ruff_db/src/diagnostic/render/concise.rs

@@ -69,17 +69,13 @@ impl<'a> ConciseRenderer<'a> {
                         "{code} ",
                         code = fmt_styled(code, stylesheet.secondary_code)
                     )?;
-                } else {
-                    write!(
-                        f,
-                        "{id}: ",
-                        id = fmt_styled(diag.inner.id.as_str(), stylesheet.secondary_code)
-                    )?;
                 }
                 if self.config.show_fix_status {
-                    // Do not display an indicator for inapplicable fixes
-                    if diag.has_applicable_fix(self.config) {
-                        write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
+                    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 {
@@ -160,8 +156,8 @@ mod tests {
         env.show_fix_status(true);
         env.fix_applicability(Applicability::DisplayOnly);
         insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-        syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+        syntax_errors.py:1:15: SyntaxError: Expected one or more symbol names after import
+        syntax_errors.py:3:12: SyntaxError: Expected ')', found newline
         ");
     }
 
@@ -169,8 +165,8 @@ mod tests {
     fn syntax_errors() {
         let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
         insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        syntax_errors.py:1:15: error[invalid-syntax] Expected one or more symbol names after import
-        syntax_errors.py:3:12: error[invalid-syntax] Expected ')', found newline
+        syntax_errors.py:1:15: error[invalid-syntax] SyntaxError: Expected one or more symbol names after import
+        syntax_errors.py:3:12: error[invalid-syntax] SyntaxError: Expected ')', found newline
         ");
     }
 

crates/ruff_db/src/diagnostic/render/full.rs

@@ -1,306 +1,8 @@
-use std::borrow::Cow;
-use std::num::NonZeroUsize;
-
-use similar::{ChangeTag, TextDiff};
-
-use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-use ruff_diagnostics::{Applicability, Fix};
-use ruff_notebook::NotebookIndex;
-use ruff_source_file::OneIndexed;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
-
-use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
-
-pub(super) struct FullRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-    config: &'a DisplayDiagnosticConfig,
-}
-
-impl<'a> FullRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
-        Self { resolver, config }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        let stylesheet = if self.config.color {
-            DiagnosticStylesheet::styled()
-        } else {
-            DiagnosticStylesheet::plain()
-        };
-
-        let mut renderer = if self.config.color {
-            AnnotateRenderer::styled()
-        } else {
-            AnnotateRenderer::plain()
-        }
-        .cut_indicator("…");
-
-        renderer = renderer
-            .error(stylesheet.error)
-            .warning(stylesheet.warning)
-            .info(stylesheet.info)
-            .note(stylesheet.note)
-            .help(stylesheet.help)
-            .line_no(stylesheet.line_no)
-            .emphasis(stylesheet.emphasis)
-            .none(stylesheet.none);
-
-        for diag in diagnostics {
-            let resolved = Resolved::new(self.resolver, diag, self.config);
-            let renderable = resolved.to_renderable(self.config.context);
-            for diag in renderable.diagnostics.iter() {
-                writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
-            }
-
-            if self.config.show_fix_diff
-                && diag.has_applicable_fix(self.config)
-                && let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver)
-            {
-                write!(f, "{diff}")?;
-            }
-
-            writeln!(f)?;
-        }
-
-        Ok(())
-    }
-}
-
-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the `Edit` because diff calculation is expensive.
-struct Diff<'a> {
-    fix: &'a Fix,
-    diagnostic_source: DiagnosticSource,
-    notebook_index: Option<NotebookIndex>,
-    stylesheet: &'a DiagnosticStylesheet,
-}
-
-impl<'a> Diff<'a> {
-    fn from_diagnostic(
-        diagnostic: &'a Diagnostic,
-        stylesheet: &'a DiagnosticStylesheet,
-        resolver: &'a dyn FileResolver,
-    ) -> Option<Diff<'a>> {
-        let file = &diagnostic.primary_span_ref()?.file;
-        Some(Diff {
-            fix: diagnostic.fix()?,
-            diagnostic_source: file.diagnostic_source(resolver),
-            notebook_index: resolver.notebook_index(file),
-            stylesheet,
-        })
-    }
-}
-
-impl std::fmt::Display for Diff<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let source_code = self.diagnostic_source.as_source_code();
-        let source_text = source_code.text();
-
-        // Partition the source code into end offsets for each cell. If `self.notebook_index` is
-        // `None`, indicating a regular script file, all the lines will be in one "cell" under the
-        // `None` key.
-        let cells = if let Some(notebook_index) = &self.notebook_index {
-            let mut last_cell = OneIndexed::MIN;
-            let mut cells: Vec<(Option<OneIndexed>, TextSize)> = Vec::new();
-            for (row, cell) in notebook_index.iter() {
-                if cell != last_cell {
-                    let offset = source_code.line_start(row);
-                    cells.push((Some(last_cell), offset));
-                    last_cell = cell;
-                }
-            }
-            cells.push((Some(last_cell), source_text.text_len()));
-            cells
-        } else {
-            vec![(None, source_text.text_len())]
-        };
-
-        let mut last_end = TextSize::ZERO;
-        for (cell, offset) in cells {
-            let range = TextRange::new(last_end, offset);
-            last_end = offset;
-            let input = source_code.slice(range);
-
-            let mut output = String::with_capacity(input.len());
-            let mut last_end = range.start();
-
-            let mut applied = 0;
-            for edit in self.fix.edits() {
-                if range.contains_range(edit.range()) {
-                    output.push_str(source_code.slice(TextRange::new(last_end, edit.start())));
-                    output.push_str(edit.content().unwrap_or_default());
-                    last_end = edit.end();
-                    applied += 1;
-                }
-            }
-
-            // No edits were applied, so there's no need to diff.
-            if applied == 0 {
-                continue;
-            }
-
-            output.push_str(&source_text[usize::from(last_end)..usize::from(range.end())]);
-
-            let diff = TextDiff::from_lines(input, &output);
-
-            let grouped_ops = diff.grouped_ops(3);
-
-            // Find the new line number with the largest number of digits to align all of the line
-            // number separators.
-            let last_op = grouped_ops.last().and_then(|group| group.last());
-            let largest_new = last_op.map(|op| op.new_range().end).unwrap_or_default();
-
-            let digit_with = OneIndexed::new(largest_new).unwrap_or_default().digits();
-
-            if let Some(cell) = cell {
-                // Room for 1 digit, 1 space, 1 `|`, and 1 more following space. This centers the
-                // three colons on the pipe.
-                writeln!(f, "{:>1$} cell {cell}", ":::", digit_with.get() + 3)?;
-            }
-
-            for (idx, group) in grouped_ops.iter().enumerate() {
-                if idx > 0 {
-                    writeln!(f, "{:-^1$}", "-", 80)?;
-                }
-                for op in group {
-                    for change in diff.iter_inline_changes(op) {
-                        let (sign, style, line_no_style, index) = match change.tag() {
-                            ChangeTag::Delete => (
-                                "-",
-                                self.stylesheet.deletion,
-                                self.stylesheet.deletion_line_no,
-                                None,
-                            ),
-                            ChangeTag::Insert => (
-                                "+",
-                                self.stylesheet.insertion,
-                                self.stylesheet.insertion_line_no,
-                                change.new_index(),
-                            ),
-                            ChangeTag::Equal => (
-                                "|",
-                                self.stylesheet.none,
-                                self.stylesheet.line_no,
-                                change.new_index(),
-                            ),
-                        };
-
-                        let line = Line {
-                            index: index.map(OneIndexed::from_zero_indexed),
-                            width: digit_with,
-                        };
-
-                        write!(
-                            f,
-                            "{line} {sign} ",
-                            line = fmt_styled(line, self.stylesheet.line_no),
-                            sign = fmt_styled(sign, line_no_style),
-                        )?;
-
-                        for (emphasized, value) in change.iter_strings_lossy() {
-                            let value = show_nonprinting(&value);
-                            let styled = fmt_styled(value, style);
-                            if emphasized {
-                                write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?;
-                            } else {
-                                write!(f, "{styled}")?;
-                            }
-                        }
-                        if change.missing_newline() {
-                            writeln!(f)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        match self.fix.applicability() {
-            Applicability::Safe => {}
-            Applicability::Unsafe => {
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.warning),
-                    msg = fmt_styled(
-                        "This is an unsafe fix and may change runtime behavior",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-            Applicability::DisplayOnly => {
-                // Note that this is still only used in tests. There's no `--display-only-fixes`
-                // analog to `--unsafe-fixes` for users to activate this or see the styling.
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.error),
-                    msg = fmt_styled(
-                        "This is a display-only fix and is likely to be incorrect",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl std::fmt::Display for Line {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-fn show_nonprinting(s: &str) -> Cow<'_, str> {
-    if s.find(['\x07', '\x08', '\x1b', '\x7f']).is_some() {
-        Cow::Owned(
-            s.replace('\x07', "␇")
-                .replace('\x08', "␈")
-                .replace('\x1b', "␛")
-                .replace('\x7f', "␡"),
-        )
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::{Applicability, Edit, Fix};
-    use ruff_text_size::{TextLen, TextRange, TextSize};
-
     use crate::diagnostic::{
-        Annotation, DiagnosticFormat, Severity,
-        render::tests::{
-            NOTEBOOK, TestEnvironment, create_diagnostics, create_notebook_diagnostics,
-            create_syntax_error_diagnostics,
-        },
+        DiagnosticFormat, Severity,
+        render::tests::{TestEnvironment, create_diagnostics, create_syntax_error_diagnostics},
     };
 
     #[test]
@@ -340,7 +42,7 @@ mod tests {
     fn syntax_errors() {
         let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Full);
         insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[invalid-syntax]: Expected one or more symbol names after import
+        error[invalid-syntax]: SyntaxError: Expected one or more symbol names after import
          --> syntax_errors.py:1:15
           |
         1 | from os import
@@ -349,71 +51,7 @@ mod tests {
         3 | if call(foo
           |
 
-        error[invalid-syntax]: Expected ')', found newline
-         --> syntax_errors.py:3:12
-          |
-        1 | from os import
-        2 |
-        3 | if call(foo
-          |            ^
-        4 |     def bar():
-        5 |         pass
-          |
-        ");
-    }
-
-    #[test]
-    fn hide_severity_output() {
-        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
-        env.hide_severity(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
-        F401 [*] `os` imported but unused
-         --> fib.py:1:8
-          |
-        1 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        F841 [*] Local variable `x` is assigned to but never used
-         --> fib.py:6:5
-          |
-        4 | def fibonacci(n):
-        5 |     """Compute the nth number in the Fibonacci sequence."""
-        6 |     x = 1
-          |     ^
-        7 |     if n == 0:
-        8 |         return 0
-          |
-        help: Remove assignment to unused variable `x`
-
-        F821 Undefined name `a`
-         --> undef.py:1:4
-          |
-        1 | if a == 1: pass
-          |    ^
-          |
-        "#);
-    }
-
-    #[test]
-    fn hide_severity_syntax_errors() {
-        let (mut env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Full);
-        env.hide_severity(true);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        invalid-syntax: Expected one or more symbol names after import
-         --> syntax_errors.py:1:15
-          |
-        1 | from os import
-          |               ^
-        2 |
-        3 | if call(foo
-          |
-
-        invalid-syntax: Expected ')', found newline
+        error[invalid-syntax]: SyntaxError: Expected ')', found newline
          --> syntax_errors.py:3:12
           |
         1 | from os import
@@ -478,7 +116,7 @@ print()
     /// For example, without the fix, we get diagnostics like this:
     ///
     /// ```
-    /// error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
+    /// error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1A" instead
     ///  --> example.py:1:25
     ///   |
     /// 1 | nested_fstrings = f'␈{f'{f'␛'}'}'
@@ -498,13 +136,13 @@ print()
             .builder(
                 "invalid-character-sub",
                 Severity::Error,
-                r#"Invalid unescaped character SUB, use "\x1a" instead"#,
+                r#"Invalid unescaped character SUB, use "\x1A" instead"#,
             )
             .primary("example.py", "1:24", "1:24", "")
             .build();
 
         insta::assert_snapshot!(env.render(&diagnostic), @r#"
-        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
+        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1A" instead
          --> example.py:1:25
           |
         1 | nested_fstrings = f'␈{f'{f'␛'}'}'
@@ -523,13 +161,13 @@ print()
             .builder(
                 "invalid-character-sub",
                 Severity::Error,
-                r#"Invalid unescaped character SUB, use "\x1a" instead"#,
+                r#"Invalid unescaped character SUB, use "\x1A" instead"#,
             )
             .primary("example.py", "1:1", "1:1", "")
             .build();
 
         insta::assert_snapshot!(env.render(&diagnostic), @r#"
-        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1a" instead
+        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1A" instead
          --> example.py:1:2
           |
         1 | ␈␛
@@ -539,428 +177,4 @@ print()
 
         Ok(())
     }
-
-    /// Ensure that the header column matches the column in the user's input, even if we've replaced
-    /// tabs with spaces for rendering purposes.
-    #[test]
-    fn tab_replacement() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "def foo():\n\treturn 1");
-        env.format(DiagnosticFormat::Full);
-
-        let diagnostic = env.err().primary("example.py", "2:1", "2:9", "").build();
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:2
-          |
-        1 | def foo():
-        2 |     return 1
-          |     ^^^^^^^^
-          |
-        ");
-    }
-
-    /// For file-level diagnostics, we expect to see the header line with the diagnostic information
-    /// and the `-->` line with the file information but no lines of source code.
-    #[test]
-    fn file_level() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env.path("example.py").with_range(TextRange::default());
-        let mut annotation = Annotation::primary(span);
-        annotation.set_file_level(true);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-        --> example.py:1:1
-        ");
-    }
-
-    /// Check that ranges in notebooks are remapped relative to the cells.
-    #[test]
-    fn notebook_output() {
-        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-
-        error[unused-variable]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-        ");
-    }
-
-    /// Check notebook handling for multiple annotations in a single diagnostic that span cells.
-    #[test]
-    fn notebook_output_multiple_annotations() {
-        let mut env = TestEnvironment::new();
-        env.add("notebook.ipynb", NOTEBOOK);
-
-        let diagnostics = vec![
-            // adjacent context windows
-            env.builder("unused-import", Severity::Error, "`os` imported but unused")
-                .primary("notebook.ipynb", "2:7", "2:9", "")
-                .secondary("notebook.ipynb", "4:7", "4:11", "second cell")
-                .help("Remove unused import: `os`")
-                .build(),
-            // non-adjacent context windows
-            env.builder("unused-import", Severity::Error, "`os` imported but unused")
-                .primary("notebook.ipynb", "2:7", "2:9", "")
-                .secondary("notebook.ipynb", "10:4", "10:5", "second cell")
-                .help("Remove unused import: `os`")
-                .build(),
-            // adjacent context windows in the same cell
-            env.err()
-                .primary("notebook.ipynb", "4:7", "4:11", "second cell")
-                .secondary("notebook.ipynb", "6:0", "6:5", "print statement")
-                .help("Remove `print` statement")
-                .build(),
-        ];
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-         ::: notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ---- second cell
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `os`
-
-        error[unused-import]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-         ::: notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     - second cell
-          |
-        help: Remove unused import: `os`
-
-        error[test-diagnostic]: main diagnostic message
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^ second cell
-        3 |
-        4 | print('hello world')
-          | ----- print statement
-          |
-        help: Remove `print` statement
-        ");
-    }
-
-    /// Test that we remap notebook cell line numbers in the diff as well as the main diagnostic.
-    #[test]
-    fn notebook_output_with_diff() {
-        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-         ::: cell 1
-        1 | # cell 1
-          - import os
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        3 | print('hello world')
-
-        error[unused-variable][*]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
-    #[test]
-    fn notebook_output_with_diff_spanning_cells() {
-        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
-        // single diagnostic with edits in different cells.
-        let mut diagnostic = diagnostics.swap_remove(0);
-        let fix = diagnostic.fix_mut().unwrap();
-        let mut edits = fix.edits().to_vec();
-        for diag in diagnostics {
-            edits.extend_from_slice(diag.fix().unwrap().edits());
-        }
-        *fix = Fix::unsafe_edits(edits.remove(0), edits);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-         ::: cell 1
-        1 | # cell 1
-          - import os
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        3 | print('hello world')
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
-    /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
-    /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
-    #[test]
-    fn normalize_carriage_return() {
-        let mut env = TestEnvironment::new();
-        env.add(
-            "example.py",
-            "# Keep parenthesis around preserved CR\rint(-\r    1)\rint(+\r    1)",
-        );
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(39), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | # Keep parenthesis around preserved CR
-        2 | int(-
-          | ^
-        3 |     1)
-        4 | int(+
-          |
-        ");
-    }
-
-    /// Without stripping the BOM, we report an error in column 2, unlike Ruff.
-    #[test]
-    fn strip_bom() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(3), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    #[test]
-    fn bom_with_default_range() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env.path("example.py").with_range(TextRange::default());
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    /// We previously rendered this correctly, but the header was falling back to 1:1 for ranges
-    /// pointing to the final newline in a file. Like Ruff, we now use the offset of the first
-    /// character in the nonexistent final line in the header.
-    #[test]
-    fn end_of_file() {
-        let mut env = TestEnvironment::new();
-        let contents = "unexpected eof\n";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(contents.text_len(), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | unexpected eof
-          |               ^
-          |
-        ");
-    }
-
-    /// Test that we handle the width calculation for the line number correctly even for context
-    /// lines at the end of a diff. For example, we want it to render like this:
-    ///
-    /// ```
-    /// 8  |
-    /// 9  |
-    /// 10 |
-    /// ```
-    ///
-    /// and not like this:
-    ///
-    /// ```
-    /// 8 |
-    /// 9 |
-    /// 10 |
-    /// ```
-    #[test]
-    fn longer_line_number_end_of_context() {
-        let mut env = TestEnvironment::new();
-        let contents = "\
-line 1
-line 2
-line 3
-line 4
-line 5
-line 6
-line 7
-line 8
-line 9
-line 10
-        ";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build();
-        diagnostic.help("Start of diff:");
-        let target = "line 7";
-        let line9 = contents.find(target).unwrap();
-        let range = TextRange::at(TextSize::try_from(line9).unwrap(), target.text_len());
-        diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
-            format!("fixed {target}"),
-            range,
-        )));
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic][*]: main diagnostic message
-         --> example.py:3:1
-          |
-        1 | line 1
-        2 | line 2
-        3 | line 3
-          | ^^^^^^ label
-        4 | line 4
-        5 | line 5
-          |
-        help: Start of diff:
-        4  | line 4
-        5  | line 5
-        6  | line 6
-           - line 7
-        7  + fixed line 7
-        8  | line 8
-        9  | line 9
-        10 | line 10
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
 }

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",
-        );
-    }
-}

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));
-        });
-    }
-}

crates/ruff_db/src/diagnostic/render/json.rs

@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;
 
-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig, SecondaryCode};
 
 use super::FileResolver;
 
@@ -99,7 +99,7 @@ pub(super) fn diagnostic_to_json<'a>(
     // In preview, the locations and filename can be optional.
     if config.preview {
         JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
             url: diagnostic.to_ruff_url(),
             message: diagnostic.body(),
             fix,
@@ -111,7 +111,7 @@ pub(super) fn diagnostic_to_json<'a>(
         }
     } else {
         JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
             url: diagnostic.to_ruff_url(),
             message: diagnostic.body(),
             fix,
@@ -221,7 +221,7 @@ impl Serialize for ExpandedEdits<'_> {
 #[derive(Serialize)]
 pub(crate) struct JsonDiagnostic<'a> {
     cell: Option<OneIndexed>,
-    code: &'a str,
+    code: Option<&'a SecondaryCode>,
     end_location: Option<JsonLocation>,
     filename: Option<&'a str>,
     fix: Option<JsonFix<'a>>,
@@ -302,7 +302,7 @@ mod tests {
         [
           {
             "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
             "end_location": {
               "column": 1,
               "row": 1
@@ -336,7 +336,7 @@ mod tests {
         [
           {
             "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
             "end_location": null,
             "filename": null,
             "fix": null,

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__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`

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__azure__tests__syntax_errors.snap

@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;]SyntaxError: Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;]SyntaxError: Expected ')', found newline

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__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`

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__github__tests__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

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__output.snap

@@ -1,63 +0,0 @@
----
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
----
-[
-  {
-    "check_name": "F401",
-    "description": "F401: `os` imported but unused",
-    "severity": "major",
-    "fingerprint": "<redacted>",
-    "location": {
-      "path": "fib.py",
-      "positions": {
-        "begin": {
-          "line": 1,
-          "column": 8
-        },
-        "end": {
-          "line": 1,
-          "column": 10
-        }
-      }
-    }
-  },
-  {
-    "check_name": "F841",
-    "description": "F841: Local variable `x` is assigned to but never used",
-    "severity": "major",
-    "fingerprint": "<redacted>",
-    "location": {
-      "path": "fib.py",
-      "positions": {
-        "begin": {
-          "line": 6,
-          "column": 5
-        },
-        "end": {
-          "line": 6,
-          "column": 6
-        }
-      }
-    }
-  },
-  {
-    "check_name": "F821",
-    "description": "F821: Undefined name `a`",
-    "severity": "major",
-    "fingerprint": "<redacted>",
-    "location": {
-      "path": "undef.py",
-      "positions": {
-        "begin": {
-          "line": 1,
-          "column": 4
-        },
-        "end": {
-          "line": 1,
-          "column": 5
-        }
-      }
-    }
-  }
-]

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__gitlab__tests__syntax_errors.snap

@@ -1,44 +0,0 @@
----
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
----
-[
-  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Expected one or more symbol names after import",
-    "severity": "major",
-    "fingerprint": "<redacted>",
-    "location": {
-      "path": "syntax_errors.py",
-      "positions": {
-        "begin": {
-          "line": 1,
-          "column": 15
-        },
-        "end": {
-          "line": 2,
-          "column": 1
-        }
-      }
-    }
-  },
-  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Expected ')', found newline",
-    "severity": "major",
-    "fingerprint": "<redacted>",
-    "location": {
-      "path": "syntax_errors.py",
-      "positions": {
-        "begin": {
-          "line": 3,
-          "column": 12
-        },
-        "end": {
-          "line": 4,
-          "column": 1
-        }
-      }
-    }
-  }
-]

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__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": [

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__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,

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json__tests__syntax_errors.snap

@@ -5,35 +5,35 @@ expression: env.render_diagnostics(&diagnostics)
 [
   {
     "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
     "end_location": {
       "column": 1,
       "row": 2
     },
-    "filename": "/syntax_errors.py",
+    "filename": "syntax_errors.py",
     "fix": null,
     "location": {
       "column": 15,
       "row": 1
     },
-    "message": "Expected one or more symbol names after import",
+    "message": "SyntaxError: Expected one or more symbol names after import",
     "noqa_row": null,
     "url": null
   },
   {
     "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
     "end_location": {
       "column": 1,
       "row": 4
     },
-    "filename": "/syntax_errors.py",
+    "filename": "syntax_errors.py",
     "fix": null,
     "location": {
       "column": 12,
       "row": 3
     },
-    "message": "Expected ')', found newline",
+    "message": "SyntaxError: Expected ')', found newline",
     "noqa_row": null,
     "url": null
   }

crates/ruff_db/src/diagnostic/render/snapshots/ruff_db__diagnostic__render__json_lines__tests__notebook_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"}