use tuplespec for variadic param annotation

move annotated_type into paramkind
2025-08-01 16:22:46 -04:00 · 2025-08-01 16:22:46 -04:00
2057 changed files with 40868 additions and 65282 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,10 +19,6 @@

 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ruff_db/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -292,8 +292,6 @@ jobs:
            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
          - target: arm-unknown-linux-musleabihf
            arch: arm
-          - target: riscv64gc-unknown-linux-gnu
-            arch: riscv64

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -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
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -40,7 +40,7 @@ jobs:

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

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

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

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

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

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

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

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

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,8 +38,7 @@ jobs:
      fuzz: ${{ steps.check_fuzzer.outputs.changed }}
      # Flag that is set to "true" when code related to ty changes.
      ty: ${{ steps.check_ty.outputs.changed }}
-      # Flag that is set to "true" when code related to the py-fuzzer folder changes.
-      py-fuzzer: ${{ steps.check_py_fuzzer.outputs.changed }}
+
      # Flag that is set to "true" when code related to the playground changes.
      playground: ${{ steps.check_playground.outputs.changed }}
    steps:
@@ -69,6 +68,7 @@ jobs:
            ':crates/ruff_text_size/**' \
            ':crates/ruff_python_ast/**' \
            ':crates/ruff_python_parser/**' \
+            ':python/py-fuzzer/**' \
            ':.github/workflows/ci.yaml' \
          ; then
              echo "changed=false" >> "$GITHUB_OUTPUT"
@@ -138,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:
@@ -250,13 +238,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -308,13 +296,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -337,7 +325,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
+        uses: taiki-e/install-action@c99cc51b309eee71a866715cfa08c922f11cf898 # v2.56.19
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -393,7 +381,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -418,7 +406,7 @@ jobs:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
+        uses: rui314/setup-mold@702b1908b5edf30d71a8d1666b724e0f0c6fa035 # v1
      - name: "Build tests"
        shell: bash
        env:
@@ -441,7 +429,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
+        uses: cargo-bins/cargo-binstall@808dcb1b503398677d089d3216c51ac7cc11e7ab # v1.14.2
        with:
          tool: cargo-fuzz@0.11.2
      - name: "Install cargo-fuzz"
@@ -455,7 +443,7 @@ jobs:
    needs:
      - cargo-test-linux
      - determine_changes
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.parser == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && needs.determine_changes.outputs.parser == 'true' }}
    timeout-minutes: 20
    env:
      FORCE_COLOR: 1
@@ -645,7 +633,7 @@ jobs:
      - cargo-test-linux
      - determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.ty == 'true' }}
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -694,7 +682,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
+      - uses: cargo-bins/cargo-binstall@808dcb1b503398677d089d3216c51ac7cc11e7ab # v1.14.2
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -740,7 +728,7 @@ jobs:
        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') }}
@@ -915,7 +903,7 @@ jobs:
        run: rustup show

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

@@ -948,7 +936,7 @@ jobs:
        run: rustup show

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

--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -38,7 +38,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # 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,
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -83,7 +83,7 @@ jobs:
      - name: Install the latest version of uv
        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"

--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -129,14 +129,14 @@ jobs:
          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/
@@ -180,14 +180,14 @@ jobs:
          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/
@@ -257,7 +257,7 @@ jobs:
          submodules: recursive
      # Create a GitHub Release while uploading all files to it
      - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
        with:
          pattern: artifacts-*
          path: artifacts
--- a/.github/workflows/typing_conformance.yaml
+++ b/.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:
@@ -41,10 +40,13 @@ jobs:
      - 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"
@@ -62,13 +64,14 @@ jobs:
            cd ruff

            echo "new commit"
-            git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
+            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 --release --bin ty
            mv target/release/ty ty-old
@@ -92,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
@@ -105,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
--- a/.github/workflows/typing_conformance_comment.yaml
+++ b/.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
--- a/.pre-commit-config.yaml
+++ b/.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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,65 +1,5 @@
 # Changelog

-## 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))
-
-## 0.12.8
-
-### Preview features
-
- \[`flake8-use-pathlib`\] Expand `PTH201` to check all `PurePath` subclasses ([#19440](https://github.com/astral-sh/ruff/pull/19440))
-
-### Bug fixes
-
- \[`flake8-blind-except`\] Change `BLE001` to correctly parse exception tuples ([#19747](https://github.com/astral-sh/ruff/pull/19747))
- \[`flake8-errmsg`\] Exclude `typing.cast` from `EM101` ([#19656](https://github.com/astral-sh/ruff/pull/19656))
- \[`flake8-simplify`\] Fix raw string handling in `SIM905` for embedded quotes ([#19591](https://github.com/astral-sh/ruff/pull/19591))
- \[`flake8-import-conventions`\] Avoid false positives for NFKC-normalized `__debug__` import aliases in `ICN001` ([#19411](https://github.com/astral-sh/ruff/pull/19411))
- \[`isort`\] Fix syntax error after docstring ending with backslash (`I002`) ([#19505](https://github.com/astral-sh/ruff/pull/19505))
- \[`pylint`\] Mark `PLC0207` fixes as unsafe when `*args` unpacking is present ([#19679](https://github.com/astral-sh/ruff/pull/19679))
- \[`pyupgrade`\] Prevent infinite loop with `I002` (`UP010`, `UP035`) ([#19413](https://github.com/astral-sh/ruff/pull/19413))
- \[`ruff`\] Parenthesize generator expressions in f-strings (`RUF010`) ([#19434](https://github.com/astral-sh/ruff/pull/19434))
-
-### Rule changes
-
- \[`eradicate`\] Don't flag `pyrefly` pragmas as unused code (`ERA001`) ([#19731](https://github.com/astral-sh/ruff/pull/19731))
-
-### Documentation
-
- Replace "associative" with "commutative" in docs for `RUF036` ([#19706](https://github.com/astral-sh/ruff/pull/19706))
- Fix copy and line separator colors in dark mode ([#19630](https://github.com/astral-sh/ruff/pull/19630))
- Fix link to `typing` documentation ([#19648](https://github.com/astral-sh/ruff/pull/19648))
- \[`refurb`\] Make more examples error out-of-the-box ([#19695](https://github.com/astral-sh/ruff/pull/19695),[#19673](https://github.com/astral-sh/ruff/pull/19673),[#19672](https://github.com/astral-sh/ruff/pull/19672))
-
-### Other changes
-
- Include column numbers in GitLab output format ([#19708](https://github.com/astral-sh/ruff/pull/19708))
- Always expand tabs to four spaces in diagnostics ([#19618](https://github.com/astral-sh/ruff/pull/19618))
- Update pre-commit's `ruff` id ([#19654](https://github.com/astral-sh/ruff/pull/19654))
-
 ## 0.12.7

 This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,9 +56,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -95,18 +95,18 @@ dependencies = [

 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
 name = "anstyle-svg"
-version = "0.1.10"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc03a770ef506fe1396c0e476120ac0e6523cf14b74218dd5f18cd6833326fa9"
+checksum = "0a43964079ef399480603125d5afae2b219aceffb77478956e25f17b9bc3435c"
 dependencies = [
 "anstyle",
 "anstyle-lossy",
@@ -117,13 +117,13 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
 "anstyle",
 "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -322,9 +322,9 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.1.11"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
+checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
 dependencies = [
 "serde",
 ]
@@ -346,9 +346,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.31"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
 "jobserver",
 "libc",
@@ -408,9 +408,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.43"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
+checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -418,9 +418,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.43"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
+checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
 dependencies = [
 "anstream",
 "anstyle",
@@ -492,9 +492,9 @@ dependencies = [

 [[package]]
 name = "codspeed"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35584c5fcba8059780748866387fb97c5a203bcfc563fc3d0790af406727a117"
+checksum = "d29180405ab3b37bb020246ea66bf8ae233708766fd59581ae929feaef10ce91"
 dependencies = [
 "anyhow",
 "bincode 1.3.3",
@@ -510,9 +510,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f6c1c6bed5fd84d319e8b0889da051daa361c79b7709c9394dfe1a882bba67"
+checksum = "2454d874ca820ffd71273565530ad318f413195bbc99dce6c958ca07db362c63"
 dependencies = [
 "codspeed",
 "codspeed-criterion-compat-walltime",
@@ -521,9 +521,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c989289ce6b1cbde72ed560496cb8fbf5aa14d5ef5666f168e7f87751038352e"
+checksum = "093a9383cdd1a5a0bd1a47cdafb49ae0c6dcd0793c8fb8f79768bab423128c9c"
 dependencies = [
 "anes",
 "cast",
@@ -546,9 +546,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf64eda57508448d59efd940bad62ede7c50b0d451a150b8d6a0eca642792a6"
+checksum = "e1c73bce1e3f47738bf74a6b58b72a49b4f40c837ce420d8d65a270298592aac"
 dependencies = [
 "codspeed",
 "codspeed-divan-compat-macros",
@@ -557,9 +557,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058167258e819b16a4ba601fdfe270349ef191154758dbce122c62a698f70ba8"
+checksum = "ea51dd8add7eba774cc24b4a98324252ac3ec092ccb5f07e52bbe1cb72a6d373"
 dependencies = [
 "divan-macros",
 "itertools 0.14.0",
@@ -571,9 +571,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f9866ee3a4ef9d2868823ea5811886763af244f2df584ca247f49281c43f1f"
+checksum = "417e9edfc4b0289d4b9b48e62f98c6168d5e30c0e612b2935e394b0dd930fe83"
 dependencies = [
 "cfg-if",
 "clap",
@@ -885,9 +885,9 @@ dependencies = [

 [[package]]
 name = "derive-where"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
+checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1161,9 +1161,9 @@ dependencies = [

 [[package]]
 name = "get-size-derive2"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a17a226478b2e8294ded60782c03efe54476aa8cd1371d0e5ad9d1071e74e0"
+checksum = "ca171f9f8ed2f416ac044de2dc4acde3e356662a14ac990345639653bdc7fc28"
 dependencies = [
 "attribute-derive",
 "quote",
@@ -1172,13 +1172,13 @@ dependencies = [

 [[package]]
 name = "get-size2"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5697765925a05c9d401dd04a93dfd662d336cc25fdcc3301220385a1ffcfdde5"
+checksum = "965bc5c1c5fe05c5bbd398bb9b3f0f14d750261ebdd1af959f2c8a603fedb5ad"
 dependencies = [
 "compact_str",
 "get-size-derive2",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 "smallvec",
 ]

@@ -1264,9 +1264,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"

 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
 "allocator-api2",
 "equivalent",
@@ -1279,7 +1279,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 ]

 [[package]]
@@ -1471,7 +1471,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 ]

 [[package]]
@@ -1491,7 +1491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 "serde",
 ]

@@ -1805,9 +1805,9 @@ dependencies = [

 [[package]]
 name = "libredox"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
+checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7"
 dependencies = [
 "bitflags 2.9.1",
 "libc",
@@ -1856,9 +1856,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"

 [[package]]
 name = "lsp-server"
-version = "0.7.9"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6ada348dbc2703cbe7637b2dda05cff84d3da2819c24abcb305dd613e0ba2e"
+checksum = "9462c4dc73e17f971ec1f171d44bfffb72e65a130117233388a0ebc7ec5656f9"
 dependencies = [
 "crossbeam-channel",
 "log",
@@ -2050,9 +2050,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"

 [[package]]
 name = "notify"
-version = "8.2.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
+checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97"
 dependencies = [
 "bitflags 2.9.1",
 "fsevent-sys",
@@ -2473,9 +2473,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.96"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beef09f85ae72cea1ef96ba6870c51e6382ebfa4f0e85b643459331f3daa5be0"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
 "unicode-ident",
 ]
@@ -2671,9 +2671,9 @@ dependencies = [

 [[package]]
 name = "redox_users"
-version = "0.5.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
 dependencies = [
 "getrandom 0.2.16",
 "libredox",
@@ -2743,7 +2743,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.12.9"
+version = "0.12.7"
 dependencies = [
 "anyhow",
 "argfile",
@@ -2795,7 +2795,7 @@ dependencies = [
 "test-case",
 "thiserror 2.0.12",
 "tikv-jemallocator",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
 "walkdir",
 "wild",
@@ -2811,7 +2811,7 @@ dependencies = [
 "ruff_annotate_snippets",
 "serde",
 "snapbox",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tryfn",
 "unicode-width 0.2.1",
 ]
@@ -2874,7 +2874,6 @@ dependencies = [
 "ruff_annotate_snippets",
 "ruff_cache",
 "ruff_diagnostics",
- "ruff_memory_usage",
 "ruff_notebook",
 "ruff_python_ast",
 "ruff_python_parser",
@@ -2928,7 +2927,7 @@ dependencies = [
 "similar",
 "strum",
 "tempfile",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
 "tracing-indicatif",
 "tracing-subscriber",
@@ -2996,7 +2995,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.12.9"
+version = "0.12.7"
 dependencies = [
 "aho-corasick",
 "anyhow",
@@ -3006,7 +3005,7 @@ dependencies = [
 "fern",
 "glob",
 "globset",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 "imperative",
 "insta",
 "is-macro",
@@ -3022,6 +3021,7 @@ dependencies = [
 "pep440_rs",
 "pyproject-toml",
 "regex",
+ "ruff_annotate_snippets",
 "ruff_cache",
 "ruff_db",
 "ruff_diagnostics",
@@ -3048,7 +3048,7 @@ dependencies = [
 "tempfile",
 "test-case",
 "thiserror 2.0.12",
- "toml 0.9.5",
+ "toml 0.9.4",
 "typed-arena",
 "unicode-normalization",
 "unicode-width 0.2.1",
@@ -3068,14 +3068,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "ruff_memory_usage"
-version = "0.0.0"
-dependencies = [
- "get-size2",
- "ordermap",
-]
-
 [[package]]
 name = "ruff_notebook"
 version = "0.0.0"
@@ -3306,7 +3298,7 @@ dependencies = [
 "serde_json",
 "shellexpand",
 "thiserror 2.0.12",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
 "tracing-log",
 "tracing-subscriber",
@@ -3335,7 +3327,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.12.9"
+version = "0.12.7"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3396,8 +3388,7 @@ dependencies = [
 "shellexpand",
 "strum",
 "tempfile",
- "toml 0.9.5",
- "unicode-normalization",
+ "toml 0.9.4",
 ]

 [[package]]
@@ -3450,19 +3441,20 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"
 dependencies = [
 "boxcar",
 "compact_str",
 "crossbeam-queue",
 "crossbeam-utils",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 "hashlink",
 "indexmap",
 "intrusive-collections",
 "inventory",
 "parking_lot",
 "portable-atomic",
+ "rayon",
 "rustc-hash",
 "salsa-macro-rules",
 "salsa-macros",
@@ -3474,12 +3466,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"

 [[package]]
 name = "salsa-macros"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=918d35d873b2b73a0237536144ef4d22e8d57f27#918d35d873b2b73a0237536144ef4d22e8d57f27"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3576,9 +3568,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.142"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
 dependencies = [
 "itoa",
 "memchr",
@@ -4031,9 +4023,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1"
 dependencies = [
 "indexmap",
 "serde",
@@ -4077,9 +4069,9 @@ dependencies = [

 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
 dependencies = [
 "winnow",
 ]
@@ -4195,7 +4187,6 @@ dependencies = [
 "argfile",
 "clap",
 "clap_complete_command",
- "clearscreen",
 "colored 3.0.0",
 "crossbeam",
 "ctrlc",
@@ -4212,11 +4203,10 @@ dependencies = [
 "ruff_python_trivia",
 "salsa",
 "tempfile",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
 "tracing-flame",
 "tracing-subscriber",
- "ty_combine",
 "ty_project",
 "ty_python_semantic",
 "ty_server",
@@ -4224,16 +4214,6 @@ dependencies = [
 "wild",
 ]

-[[package]]
-name = "ty_combine"
-version = "0.0.0"
-dependencies = [
- "ordermap",
- "ruff_db",
- "ruff_python_ast",
- "ty_python_semantic",
-]
-
 [[package]]
 name = "ty_ide"
 version = "0.0.0"
@@ -4275,7 +4255,6 @@ dependencies = [
 "ruff_cache",
 "ruff_db",
 "ruff_macros",
- "ruff_memory_usage",
 "ruff_options_metadata",
 "ruff_python_ast",
 "ruff_python_formatter",
@@ -4285,9 +4264,8 @@ dependencies = [
 "schemars",
 "serde",
 "thiserror 2.0.12",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
- "ty_combine",
 "ty_python_semantic",
 "ty_vendored",
 ]
@@ -4306,7 +4284,7 @@ dependencies = [
 "drop_bomb",
 "get-size2",
 "glob",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 "indexmap",
 "insta",
 "itertools 0.14.0",
@@ -4318,7 +4296,6 @@ dependencies = [
 "ruff_db",
 "ruff_index",
 "ruff_macros",
- "ruff_memory_usage",
 "ruff_python_ast",
 "ruff_python_literal",
 "ruff_python_parser",
@@ -4332,7 +4309,6 @@ dependencies = [
 "serde",
 "smallvec",
 "static_assertions",
- "strsim",
 "strum",
 "strum_macros",
 "tempfile",
@@ -4360,7 +4336,6 @@ dependencies = [
 "lsp-types",
 "regex",
 "ruff_db",
- "ruff_macros",
 "ruff_notebook",
 "ruff_python_ast",
 "ruff_source_file",
@@ -4374,7 +4349,6 @@ dependencies = [
 "thiserror 2.0.12",
 "tracing",
 "tracing-subscriber",
- "ty_combine",
 "ty_ide",
 "ty_project",
 "ty_python_semantic",
@@ -4413,7 +4387,7 @@ dependencies = [
 "smallvec",
 "tempfile",
 "thiserror 2.0.12",
- "toml 0.9.5",
+ "toml 0.9.4",
 "tracing",
 "ty_python_semantic",
 "ty_static",
@@ -5245,9 +5219,9 @@ dependencies = [

 [[package]]
 name = "zerovec"
-version = "0.11.4"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
 "yoke",
 "zerofrom",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,6 @@ ruff_graph = { path = "crates/ruff_graph" }
 ruff_index = { path = "crates/ruff_index" }
 ruff_linter = { path = "crates/ruff_linter" }
 ruff_macros = { path = "crates/ruff_macros" }
-ruff_memory_usage = { path = "crates/ruff_memory_usage" }
 ruff_notebook = { path = "crates/ruff_notebook" }
 ruff_options_metadata = { path = "crates/ruff_options_metadata" }
 ruff_python_ast = { path = "crates/ruff_python_ast" }
@@ -41,7 +40,6 @@ ruff_text_size = { path = "crates/ruff_text_size" }
 ruff_workspace = { path = "crates/ruff_workspace" }

 ty = { path = "crates/ty" }
-ty_combine = { path = "crates/ty_combine" }
 ty_ide = { path = "crates/ty_ide" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
@@ -85,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.6.2", features = [
+get-size2 = { version = "0.6.0", features = [
    "derive",
    "smallvec",
    "hashbrown",
@@ -143,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 = "918d35d873b2b73a0237536144ef4d22e8d57f27", default-features = false, features = [
-    "compact_str",
-    "macros",
-    "salsa_unstable",
-    "inventory",
-] }
+salsa = { git = "https://github.com/salsa-rs/salsa", rev = "f3dc2f30f9a250618161e35600a00de7fe744953" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
--- a/README.md
+++ b/README.md
@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

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

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.12.9
+  rev: v0.12.7
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.9"
+version = "0.12.7"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -85,7 +85,7 @@ dist = true
 [target.'cfg(target_os = "windows")'.dependencies]
 mimalloc = { workspace = true }

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

 [lints]
--- a/crates/ruff/src/cache.rs
+++ b/crates/ruff/src/cache.rs
@@ -13,16 +13,25 @@ use itertools::Itertools;
 use log::{debug, error};
 use rayon::iter::ParallelIterator;
 use rayon::iter::{IntoParallelIterator, ParallelBridge};
+use ruff_linter::codes::Rule;
 use rustc_hash::FxHashMap;
 use tempfile::NamedTempFile;

 use ruff_cache::{CacheKey, CacheKeyHasher};
+use ruff_db::diagnostic::Diagnostic;
+use ruff_diagnostics::Fix;
+use ruff_linter::message::create_lint_diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::{VERSION, warn_user};
 use ruff_macros::CacheKey;
+use ruff_notebook::NotebookIndex;
+use ruff_source_file::SourceFileBuilder;
+use ruff_text_size::{TextRange, TextSize};
 use ruff_workspace::Settings;
 use ruff_workspace::resolver::Resolver;

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

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

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

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

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

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

+#[derive(bincode::Decode, Debug, bincode::Encode, PartialEq)]
+pub(crate) struct LintCacheData {
+    /// Imports made.
+    // pub(super) imports: ImportMap,
+    /// Diagnostic messages.
+    pub(super) messages: Vec<CacheMessage>,
+    /// Source code of the file.
+    ///
+    /// # Notes
+    ///
+    /// This will be empty if `messages` is empty.
+    pub(super) source: String,
+    /// Notebook index if this file is a Jupyter Notebook.
+    #[bincode(with_serde)]
+    pub(super) notebook_index: Option<NotebookIndex>,
+}
+
+impl LintCacheData {
+    pub(crate) fn from_diagnostics(
+        diagnostics: &[Diagnostic],
+        notebook_index: Option<NotebookIndex>,
+    ) -> Self {
+        let source = if let Some(msg) = diagnostics.first() {
+            msg.expect_ruff_source_file().source_text().to_owned()
+        } else {
+            String::new() // No messages, no need to keep the source!
+        };
+
+        let messages = diagnostics
+            .iter()
+            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
+            // this also serves to filter them out, but we shouldn't be caching files with syntax
+            // errors anyway.
+            .filter_map(|msg| Some((msg.name().parse().ok()?, msg)))
+            .map(|(rule, msg)| {
+                // Make sure that all message use the same source file.
+                assert_eq!(
+                    msg.expect_ruff_source_file(),
+                    diagnostics.first().unwrap().expect_ruff_source_file(),
+                    "message uses a different source file"
+                );
+                CacheMessage {
+                    rule,
+                    body: msg.body().to_string(),
+                    suggestion: msg.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);
    }

--- a/crates/ruff/src/diagnostics.rs
+++ b/crates/ruff/src/diagnostics.rs
@@ -20,21 +20,15 @@ use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{LinterSettings, flags};
 use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::{IOError, Violation, fs};
-use ruff_notebook::{NotebookError, NotebookIndex};
+use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::Settings;
 use rustc_hash::FxHashMap;

-use crate::cache::{Cache, FileCache, FileCacheKey};
+use crate::cache::{Cache, FileCacheKey, LintCacheData};

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

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

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

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

    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {
--- a/crates/ruff/src/main.rs
+++ b/crates/ruff/src/main.rs
@@ -19,8 +19,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -115,13 +115,12 @@ fn stdin_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    F401 [*] `os` imported but unused
-     --> -:1:8
+    -:1:8: F401 [*] `os` imported but unused
      |
    1 | import os
-      |        ^^
+      |        ^^ F401
      |
-    help: Remove unused import: `os`
+      = help: Remove unused import: `os`

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    Found 1 error.

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

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

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

    Found 1 error.
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -4996,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!(
@@ -5420,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 -----
@@ -5466,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
@@ -5495,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 -----
@@ -5523,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 -----
    "
@@ -5536,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 -----
    "
@@ -5588,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(())
@@ -5649,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 -----
@@ -5663,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 -----
@@ -5682,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 -----
--- a/crates/ruff/tests/snapshots/lint__output_format_azure.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_azure.snap
@@ -18,6 +18,6 @@ exit_code: 1
 ----- stdout -----
 ##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
 ##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=2;columnnumber=5;code=F821;]Undefined name `y`
-##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=3;columnnumber=1;code=invalid-syntax;]Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
+##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=3;columnnumber=1;]SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dev-dependencies]
 tikv-jemallocator = { workspace = true }
--- a/crates/ruff_benchmark/benches/formatter.rs
+++ b/crates/ruff_benchmark/benches/formatter.rs
@@ -21,8 +21,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/lexer.rs
+++ b/crates/ruff_benchmark/benches/lexer.rs
@@ -18,8 +18,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/linter.rs
+++ b/crates/ruff_benchmark/benches/linter.rs
@@ -26,8 +26,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
@@ -43,8 +42,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[unsafe(export_name = "_rjem_malloc_conf")]
@@ -79,11 +77,8 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                b.iter_batched(
                    || parsed.clone(),
                    |parsed| {
-                        // Assert that file contains no parse errors
-                        assert!(parsed.has_valid_syntax());
-
                        let path = case.path();
-                        lint_only(
+                        let result = lint_only(
                            &path,
                            None,
                            settings,
@@ -91,7 +86,10 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                            &SourceKind::Python(case.code().to_string()),
                            PySourceType::from(path.as_path()),
                            ParseSource::Precomputed(parsed),
-                        )
+                        );
+
+                        // Assert that file contains no parse errors
+                        assert!(!result.has_syntax_errors());
                    },
                    criterion::BatchSize::SmallInput,
                );
--- a/crates/ruff_benchmark/benches/parser.rs
+++ b/crates/ruff_benchmark/benches/parser.rs
@@ -20,8 +20,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
    any(
        target_arch = "x86_64",
        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
+        target_arch = "powerpc64"
    )
 ))]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -218,24 +218,6 @@ static TANJUN: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::ne
    )
 });

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

-#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS, &*STATIC_FRAME], sample_size=1, sample_count=3)]
+#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS], sample_size=1, sample_count=3)]
 fn medium(bencher: Bencher, benchmark: &Benchmark) {
    run_single_threaded(bencher, benchmark);
 }
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -14,7 +14,6 @@ license = { workspace = true }
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true, optional = true }
 ruff_diagnostics = { workspace = true }
-ruff_memory_usage = { workspace = true }
 ruff_notebook = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["get-size"] }
 ruff_python_parser = { workspace = true }
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -212,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()
@@ -254,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
@@ -315,11 +310,6 @@ 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()
@@ -376,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);
@@ -631,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.
    ///
@@ -669,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()
@@ -727,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 {
@@ -750,7 +720,6 @@ impl Annotation {
            message: None,
            is_primary: true,
            tags: Vec::new(),
-            is_file_level: false,
        }
    }

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

@@ -833,21 +801,6 @@ 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.
@@ -1114,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()),
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -2,15 +2,15 @@ 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,
@@ -111,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)?;
@@ -161,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));
        }
@@ -197,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
@@ -212,45 +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
-                .fix()
-                .is_some_and(|fix| fix.applies(config.fix_applicability)),
        }
    }

@@ -264,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 {
@@ -279,7 +271,6 @@ impl<'a> ResolvedDiagnostic<'a> {
            id: None,
            message: diag.inner.message.as_str().to_string(),
            annotations,
-            is_fixable: false,
        }
    }

@@ -310,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()
@@ -376,7 +338,6 @@ impl<'a> ResolvedDiagnostic<'a> {
            id: self.id.as_deref(),
            message: &self.message,
            snippets_by_input,
-            is_fixable: self.is_fixable,
        }
    }
 }
@@ -396,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> {
@@ -410,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()) {
@@ -444,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),
        })
    }
 }
@@ -480,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<'_> {
@@ -496,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);
        }
@@ -578,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.
    ///
@@ -615,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);
@@ -635,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))
@@ -661,18 +587,11 @@ impl<'r> RenderableSnippet<'r> {
            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)
-        });
-
        RenderableSnippet {
            snippet,
            line_start,
            annotations,
            has_primary,
-            cell_index,
        }
    }

@@ -686,7 +605,6 @@ impl<'r> RenderableSnippet<'r> {
                    .iter()
                    .map(RenderableAnnotation::to_annotate),
            )
-            .cell_index(self.cell_index)
    }
 }

@@ -701,8 +619,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> {
@@ -715,16 +631,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,
        }
    }

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

@@ -877,15 +788,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 {
@@ -894,17 +797,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
 }

@@ -914,15 +806,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.
@@ -932,17 +816,6 @@ 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
 }

@@ -1000,12 +873,7 @@ fn replace_unprintable<'r>(
    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) {
+        if let Some(printable) = unprintable_replacement(c) {
            result.push_str(&source[last_end..index]);

            let len = printable.text_len().to_u32();
@@ -2649,12 +2517,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();
@@ -2677,7 +2540,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)
        }
@@ -2791,7 +2654,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,
@@ -2827,7 +2690,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
        }
@@ -2987,10 +2850,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(),
        ];
@@ -2998,8 +2861,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:
    ///
@@ -3019,7 +2881,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": [
  {
@@ -3058,14 +2930,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![
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -50,8 +50,10 @@ impl AzureRenderer<'_> {
            }
            writeln!(
                f,
-                "code={code};]{body}",
-                code = diag.secondary_code_or_id(),
+                "{code}]{body}",
+                code = diag
+                    .secondary_code()
+                    .map_or_else(String::new, |code| format!("code={code};")),
                body = diag.body(),
            )?;
        }
--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -69,12 +69,6 @@ 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 {
                    if let Some(fix) = diag.fix() {
@@ -162,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
        ");
    }

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

--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -1,70 +1,8 @@
-use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-
-use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::{Diagnostic, DisplayDiagnosticConfig, stylesheet::DiagnosticStylesheet};
-
-pub(super) struct FullRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-    config: &'a DisplayDiagnosticConfig,
-}
-
-impl<'a> FullRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
-        Self { resolver, config }
-    }
-
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        let stylesheet = if self.config.color {
-            DiagnosticStylesheet::styled()
-        } else {
-            DiagnosticStylesheet::plain()
-        };
-
-        let mut renderer = if self.config.color {
-            AnnotateRenderer::styled()
-        } else {
-            AnnotateRenderer::plain()
-        }
-        .cut_indicator("…");
-
-        renderer = renderer
-            .error(stylesheet.error)
-            .warning(stylesheet.warning)
-            .info(stylesheet.info)
-            .note(stylesheet.note)
-            .help(stylesheet.help)
-            .line_no(stylesheet.line_no)
-            .emphasis(stylesheet.emphasis)
-            .none(stylesheet.none);
-
-        for diag in diagnostics {
-            let resolved = Resolved::new(self.resolver, diag, self.config);
-            let renderable = resolved.to_renderable(self.config.context);
-            for diag in renderable.diagnostics.iter() {
-                writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
-            }
-            writeln!(f)?;
-        }
-
-        Ok(())
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::Applicability;
-    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]
@@ -104,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
@@ -113,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
@@ -242,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'␛'}'}'
@@ -262,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'␛'}'}'
@@ -287,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 | ␈␛
@@ -324,239 +198,4 @@ print()
          |
        ");
    }
-
-    /// 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
-        ");
-    }
-
-    /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
-    /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
-    #[test]
-    fn normalize_carriage_return() {
-        let mut env = TestEnvironment::new();
-        env.add(
-            "example.py",
-            "# Keep parenthesis around preserved CR\rint(-\r    1)\rint(+\r    1)",
-        );
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(39), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | # Keep parenthesis around preserved CR
-        2 | int(-
-          | ^
-        3 |     1)
-        4 | int(+
-          |
-        ");
-    }
-
-    /// Without stripping the BOM, we report an error in column 2, unlike Ruff.
-    #[test]
-    fn strip_bom() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(TextSize::new(3), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    #[test]
-    fn bom_with_default_range() {
-        let mut env = TestEnvironment::new();
-        env.add("example.py", "\u{feff}import foo");
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env.path("example.py").with_range(TextRange::default());
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:1:1
-          |
-        1 | import foo
-          | ^
-          |
-        ");
-    }
-
-    /// We previously rendered this correctly, but the header was falling back to 1:1 for ranges
-    /// pointing to the final newline in a file. Like Ruff, we now use the offset of the first
-    /// character in the nonexistent final line in the header.
-    #[test]
-    fn end_of_file() {
-        let mut env = TestEnvironment::new();
-        let contents = "unexpected eof\n";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-
-        let mut diagnostic = env.err().build();
-        let span = env
-            .path("example.py")
-            .with_range(TextRange::at(contents.text_len(), TextSize::new(0)));
-        let annotation = Annotation::primary(span);
-        diagnostic.annotate(annotation);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic]: main diagnostic message
-         --> example.py:2:1
-          |
-        1 | unexpected eof
-          |               ^
-          |
-        ");
-    }
 }
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;

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

 use super::FileResolver;

@@ -99,7 +99,7 @@ pub(super) fn diagnostic_to_json<'a>(
    // In preview, the locations and filename can be optional.
    if config.preview {
        JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
@@ -111,7 +111,7 @@ pub(super) fn diagnostic_to_json<'a>(
        }
    } else {
        JsonDiagnostic {
-            code: diagnostic.secondary_code_or_id(),
+            code: diagnostic.secondary_code(),
            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
@@ -221,7 +221,7 @@ impl Serialize for ExpandedEdits<'_> {
 #[derive(Serialize)]
 pub(crate) struct JsonDiagnostic<'a> {
    cell: Option<OneIndexed>,
-    code: &'a str,
+    code: Option<&'a SecondaryCode>,
    end_location: Option<JsonLocation>,
    filename: Option<&'a str>,
    fix: Option<JsonFix<'a>>,
@@ -302,7 +302,7 @@ mod tests {
        [
          {
            "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
            "end_location": {
              "column": 1,
              "row": 1
@@ -336,7 +336,7 @@ mod tests {
        [
          {
            "cell": null,
-            "code": "test-diagnostic",
+            "code": null,
            "end_location": null,
            "filename": null,
            "fix": null,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;]SyntaxError: Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;]SyntaxError: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
@@ -5,7 +5,7 @@ expression: env.render_diagnostics(&diagnostics)
 [
  {
    "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
    "end_location": {
      "column": 1,
      "row": 2
@@ -16,13 +16,13 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 15,
      "row": 1
    },
-    "message": "Expected one or more symbol names after import",
+    "message": "SyntaxError: Expected one or more symbol names after import",
    "noqa_row": null,
    "url": null
  },
  {
    "cell": null,
-    "code": "invalid-syntax",
+    "code": null,
    "end_location": {
      "column": 1,
      "row": 4
@@ -33,7 +33,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 12,
      "row": 3
    },
-    "message": "Expected ')', found newline",
+    "message": "SyntaxError: Expected ')', found newline",
    "noqa_row": null,
    "url": null
  }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
+{"cell":null,"code":null,"end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"SyntaxError: Expected one or more symbol names after import","noqa_row":null,"url":null}
+{"cell":null,"code":null,"end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"SyntaxError: Expected ')', found newline","noqa_row":null,"url":null}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
@@ -6,10 +6,10 @@ expression: env.render_diagnostics(&diagnostics)
 <testsuites name="ruff" tests="2" failures="2" errors="0">
    <testsuite name="syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="1" column="15">
-            <failure message="Expected one or more symbol names after import">line 1, col 15, Expected one or more symbol names after import</failure>
+            <failure message="SyntaxError: Expected one or more symbol names after import">line 1, col 15, SyntaxError: Expected one or more symbol names after import</failure>
        </testcase>
        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="3" column="12">
-            <failure message="Expected &apos;)&apos;, found newline">line 3, col 12, Expected &apos;)&apos;, found newline</failure>
+            <failure message="SyntaxError: Expected &apos;)&apos;, found newline">line 3, col 12, SyntaxError: Expected &apos;)&apos;, found newline</failure>
        </testcase>
    </testsuite>
 </testsuites>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderpylinttests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderpylinttests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/pylint.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-syntax_errors.py:1: [invalid-syntax] Expected one or more symbol names after import
-syntax_errors.py:3: [invalid-syntax] Expected ')', found newline
+syntax_errors.py:1: [invalid-syntax] SyntaxError: Expected one or more symbol names after import
+syntax_errors.py:3: [invalid-syntax] SyntaxError: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
@@ -21,7 +21,7 @@ expression: env.render_diagnostics(&diagnostics)
          }
        }
      },
-      "message": "Expected one or more symbol names after import"
+      "message": "SyntaxError: Expected one or more symbol names after import"
    },
    {
      "code": {
@@ -40,7 +40,7 @@ expression: env.render_diagnostics(&diagnostics)
          }
        }
      },
-      "message": "Expected ')', found newline"
+      "message": "SyntaxError: Expected ')', found newline"
    }
  ],
  "severity": "WARNING",
--- a/crates/ruff_db/src/file_revision.rs
+++ b/crates/ruff_db/src/file_revision.rs
@@ -9,7 +9,7 @@ use crate::system::file_time_now;
 /// * The last modification time of the file.
 /// * The hash of the file's content.
 /// * The revision as it comes from an external system, for example the LSP.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Default, get_size2::GetSize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
 pub struct FileRevision(u128);

 impl FileRevision {
--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -87,12 +87,11 @@ impl Files {
            .system_by_path
            .entry(absolute.clone())
            .or_insert_with(|| {
+                tracing::trace!("Adding file '{path}'");
+
                let metadata = db.system().path_metadata(path);
-
-                tracing::trace!("Adding file '{absolute}'");
-
                let durability = self
-                    .root(db, &absolute)
+                    .root(db, path)
                    .map_or(Durability::default(), |root| root.durability(db));

                let builder = File::builder(FilePath::System(absolute))
@@ -290,7 +289,7 @@ impl std::panic::RefUnwindSafe for Files {}
 /// # Ordering
 /// Ordering is based on the file's salsa-assigned id and not on its values.
 /// The id may change between runs.
-#[salsa::input(heap_size=ruff_memory_usage::heap_size)]
+#[salsa::input]
 #[derive(PartialOrd, Ord)]
 pub struct File {
    /// The path of the file (immutable).
@@ -522,7 +521,7 @@ impl VirtualFile {
 // The types in here need to be public because they're salsa ingredients but we
 // don't want them to be publicly accessible. That's why we put them into a private module.
 mod private {
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Default, get_size2::GetSize)]
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
    pub enum FileStatus {
        /// The file exists.
        #[default]
--- a/crates/ruff_db/src/files/file_root.rs
+++ b/crates/ruff_db/src/files/file_root.rs
@@ -16,7 +16,7 @@ use crate::system::{SystemPath, SystemPathBuf};
 /// The main usage of file roots is to determine a file's durability. But it can also be used
 /// to make a salsa query dependent on whether a file in a root has changed without writing any
 /// manual invalidation logic.
-#[salsa::input(debug, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::input(debug)]
 pub struct FileRoot {
    /// The path of a root is guaranteed to never change.
    #[returns(deref)]
@@ -37,7 +37,7 @@ impl FileRoot {
    }
 }

-#[derive(Copy, Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum FileRootKind {
    /// The root of a project.
    Project,
--- a/crates/ruff_db/src/files/path.rs
+++ b/crates/ruff_db/src/files/path.rs
@@ -11,7 +11,7 @@ use std::fmt::{Display, Formatter};
 /// * a file stored on the [host system](crate::system::System).
 /// * a virtual file stored on the [host system](crate::system::System).
 /// * a vendored file stored in the [vendored file system](crate::vendored::VendoredFileSystem).
-#[derive(Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub enum FilePath {
    /// Path to a file on the [host system](crate::system::System).
    System(SystemPathBuf),
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -21,7 +21,7 @@ use crate::source::source_text;
 /// reflected in the changed AST offsets.
 /// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
 /// for determining if a query result is unchanged.
-#[salsa::tracked(returns(ref), no_eq, heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::heap_size)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
    let _span = tracing::trace_span!("parsed_module", ?file).entered();

--- a/crates/ruff_db/src/source.rs
+++ b/crates/ruff_db/src/source.rs
@@ -9,7 +9,7 @@ use crate::Db;
 use crate::files::{File, FilePath};

 /// Reads the source text of a python text file (must be valid UTF8) or notebook.
-#[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(heap_size=get_size2::heap_size)]
 pub fn source_text(db: &dyn Db, file: File) -> SourceText {
    let path = file.path(db);
    let _span = tracing::trace_span!("source_text", file = %path).entered();
@@ -157,7 +157,7 @@ pub enum SourceTextError {
 }

 /// Computes the [`LineIndex`] for `file`.
-#[salsa::tracked(heap_size=ruff_memory_usage::heap_size)]
+#[salsa::tracked(heap_size=get_size2::heap_size)]
 pub fn line_index(db: &dyn Db, file: File) -> LineIndex {
    let _span = tracing::trace_span!("line_index", ?file).entered();

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

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

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

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

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

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

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

--- a/crates/ruff_dev/src/format_dev.rs
+++ b/crates/ruff_dev/src/format_dev.rs
@@ -348,7 +348,7 @@ fn format_dev_multi_project(
        debug!(parent: None, "Starting {}", project_path.display());

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

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

 impl Diagnostic {
-    fn display(&self, format: Format) -> DisplayDiagnostic<'_> {
+    fn display(&self, format: Format) -> DisplayDiagnostic {
        DisplayDiagnostic {
            diagnostic: self,
            format,
--- a/crates/ruff_formatter/src/buffer.rs
+++ b/crates/ruff_formatter/src/buffer.rs
@@ -562,7 +562,7 @@ struct RemoveSoftLinebreaksSnapshot {
 pub trait BufferExtensions: Buffer + Sized {
    /// Returns a new buffer that calls the passed inspector for every element that gets written to the output
    #[must_use]
-    fn inspect<F>(&mut self, inspector: F) -> Inspect<'_, Self::Context, F>
+    fn inspect<F>(&mut self, inspector: F) -> Inspect<Self::Context, F>
    where
        F: FnMut(&FormatElement),
    {
@@ -607,7 +607,7 @@ pub trait BufferExtensions: Buffer + Sized {
    /// # }
    /// ```
    #[must_use]
-    fn start_recording(&mut self) -> Recording<'_, Self> {
+    fn start_recording(&mut self) -> Recording<Self> {
        Recording::new(self)
    }

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

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

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

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

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

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

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

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

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

--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.9"
+version = "0.12.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -13,6 +13,7 @@ license = { workspace = true }
 [lib]

 [dependencies]
+ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true }
 ruff_db = { workspace = true, features = ["junit", "serde"] }
 ruff_diagnostics = { workspace = true, features = ["serde"] }
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py
@@ -13,7 +13,6 @@ from airflow.api_connexion.security import requires_access
 from airflow.contrib.aws_athena_hook import AWSAthenaHook
 from airflow.datasets import DatasetAliasEvent
 from airflow.operators.subdag import SubDagOperator
-from airflow.secrets.cache import SecretCache
 from airflow.secrets.local_filesystem import LocalFilesystemBackend
 from airflow.triggers.external_task import TaskStateTrigger
 from airflow.utils import dates
@@ -57,9 +56,6 @@ SubDagOperator()
 # get_connection
 LocalFilesystemBackend()

-# airflow.secrets.cache
-SecretCache()
-

 # airflow.triggers.external_task
 TaskStateTrigger()
--- a/crates/ruff_linter/resources/test/fixtures/eradicate/ERA001.py
+++ b/crates/ruff_linter/resources/test/fixtures/eradicate/ERA001.py
@@ -89,14 +89,3 @@ print(1)
 # ///
 #
 # Foobar
-
-
-# Regression tests for https://github.com/astral-sh/ruff/issues/19713
-
-# mypy: ignore-errors
-# pyright: ignore-errors
-# pyrefly: ignore-errors
-# ty: ignore[unresolved-import]
-# pyrefly: ignore[unused-import]
-
-print(1)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_blind_except/BLE.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_blind_except/BLE.py
@@ -154,11 +154,6 @@ try:
 except Exception as e:
    raise ValueError from e

-try:
-    ...
-except Exception as e:
-    raise e from ValueError("hello")
-

 try:
    pass
@@ -167,92 +162,3 @@ except Exception:
        exception("An error occurred")
    else:
        exception("An error occurred")
-
-# Test tuple exceptions
-try:
-    pass
-except (Exception,):
-    pass
-
-try:
-    pass
-except (Exception, ValueError):
-    pass
-
-try:
-    pass
-except (ValueError, Exception):
-    pass
-
-try:
-    pass
-except (ValueError, Exception) as e:
-    print(e)
-
-try:
-    pass
-except (BaseException, TypeError):
-    pass
-
-try:
-    pass
-except (TypeError, BaseException):
-    pass
-
-try:
-    pass
-except (Exception, BaseException):
-    pass
-
-try:
-    pass
-except (BaseException, Exception):
-    pass
-
-# Test nested tuples
-try:
-    pass
-except ((Exception, ValueError), TypeError):
-    pass
-
-try:
-    pass
-except (ValueError, (BaseException, TypeError)):
-    pass
-
-# Test valid tuple exceptions (should not trigger)
-try:
-    pass
-except (ValueError, TypeError):
-    pass
-
-try:
-    pass
-except (OSError, FileNotFoundError):
-    pass
-
-try:
-    pass
-except (OSError, FileNotFoundError) as e:
-    print(e)
-
-try:
-    pass
-except (Exception, ValueError):
-    critical("...", exc_info=True)
-
-try:
-    pass
-except (Exception, ValueError):
-    raise
-
-try:
-    pass
-except (Exception, ValueError) as e:
-    raise e
-
-# `from None` cause
-try:
-    pass
-except BaseException as e:
-    raise e from None
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420_3.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420_3.py
@@ -1,43 +0,0 @@
-class C: a = None
-{C.a: None for C.a in "abc"}
-print(C.a)
-
-x = [None]
-{x[0]: None for x[0] in "abc"}
-print(x)
-
-class C(list):
-    def __getitem__(self, index, /):
-        item = super().__getitem__(index)
-        if isinstance(index, slice): item = tuple(item)
-        return item
-x = C()
-{x[:0]: None for x[:0] in "abc"}
-print(x)
-
-
-class C:
-    a = None
-
-def func():
-    {(C.a,): None for (C.a,) in "abc"}  # OK
-
-
-def func():
-    obj = type('obj', (), {'attr': 1})()
-    {(obj.attr,): None for (obj.attr,) in "abc"}  # OK
-
-
-def func():
-    lst = [1, 2, 3]
-    {(lst[0],): None for (lst[0],) in "abc"}  # OK
-
-
-def func():
-    lst = [1, 2, 3, 4, 5]
-    {(lst[1:3],): None for (lst[1:3],) in "abc"}  # OK
-
-
-# C420: side-effecting assignment targets
-# These should NOT trigger C420 because they have side-effecting assignment targets
-# See https://github.com/astral-sh/ruff/issues/19511
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py
@@ -129,40 +129,4 @@ print(" x ".rsplit(maxsplit=0))
 print(" x ".rsplit(maxsplit=0))
 print(" x ".rsplit(sep=None, maxsplit=0))
 print("  x  ".rsplit(maxsplit=0))
-print("  x  ".rsplit(sep=None, maxsplit=0))
-
-# https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings
-r"""simple@example.com
-very.common@example.com
-FirstName.LastName@EasierReading.org
-x@example.com
-long.email-address-with-hyphens@and.subdomains.example.com
-user.name+tag+sorting@example.com
-name/surname@example.com
-xample@s.example
-" "@example.org
-"john..doe"@example.org
-mailhost!username@example.org
-"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com
-user%example.com@example.org
-user-@example.org
-I❤️CHOCOLATE@example.com
-this\ still\"not\\allowed@example.com
-stellyamburrr985@example.com
-Abc.123@example.com
-user+mailbox/department=shipping@example.com
-!#$%&'*+-/=?^_`.{|}~@example.com
-"Abc@def"@example.com
-"Fred\ Bloggs"@example.com
-"Joe.\\Blow"@example.com""".split("\n")
-
-
-r"""first
-'no need' to escape
-"swap" quote style
-"use' ugly triple quotes""".split("\n")
-
-# https://github.com/astral-sh/ruff/issues/19845
-print("S\x1cP\x1dL\x1eI\x1fT".split())
-print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
-print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
+print("  x  ".rsplit(sep=None, maxsplit=0))
--- a/crates/ruff_linter/resources/test/fixtures/pylint/missing_maxsplit_arg.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/missing_maxsplit_arg.py
@@ -182,13 +182,3 @@ kwargs_with_maxsplit = {"maxsplit": 1}
 "1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
 kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
 "1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive
-
-
-## Test unpacked list literal args (starred expressions)
-# Errors
-"1,2,3".split(",", *[-1])[0]
-
-## Test unpacked list variable args
-# Errors
-args_list = [-1]
-"1,2,3".split(",", *args_list)[0]
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF064.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF064.py
@@ -51,11 +51,3 @@ dbm.ndbm.open("db", "r", 0o600)  # OK

 os.fchmod(0, 256)  # 0o400
 os.fchmod(0, 493)  # 0o755
-
-# https://github.com/astral-sh/ruff/issues/19010
-os.chmod("foo", 000)  # Error
-os.chmod("foo", 0000)  # Error
-
-os.chmod("foo", 0b0)  # Error
-os.chmod("foo", 0x0)  # Error
-os.chmod("foo", 0)  # Ok
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -28,7 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};

-use ruff_db::diagnostic::{Annotation, Diagnostic, IntoDiagnosticMessage, Span};
+use ruff_db::diagnostic::Diagnostic;
 use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
@@ -315,7 +315,7 @@ impl<'a> Checker<'a> {
    }

    /// Create a [`Generator`] to generate source code based on the current AST state.
-    pub(crate) fn generator(&self) -> Generator<'_> {
+    pub(crate) fn generator(&self) -> Generator {
        Generator::new(self.stylist.indentation(), self.stylist.line_ending())
    }

@@ -3305,17 +3305,6 @@ impl DiagnosticGuard<'_, '_> {
            Err(err) => log::debug!("Failed to create fix for {}: {}", self.name(), err),
        }
    }
-
-    /// Add a secondary annotation with the given message and range.
-    pub(crate) fn secondary_annotation<'a>(
-        &mut self,
-        message: impl IntoDiagnosticMessage + 'a,
-        range: impl Ranged,
-    ) {
-        let span = Span::from(self.context.source_file.clone()).with_range(range.range());
-        let ann = Annotation::secondary(span).message(message);
-        self.diagnostic.as_mut().unwrap().annotate(ann);
-    }
 }

 impl std::ops::Deref for DiagnosticGuard<'_, '_> {
--- a/crates/ruff_linter/src/cst/matchers.rs
+++ b/crates/ruff_linter/src/cst/matchers.rs
@@ -8,14 +8,14 @@ use libcst_native::{
 };
 use ruff_python_codegen::Stylist;

-pub(crate) fn match_module(module_text: &str) -> Result<Module<'_>> {
+pub(crate) fn match_module(module_text: &str) -> Result<Module> {
    match libcst_native::parse_module(module_text, None) {
        Ok(module) => Ok(module),
        Err(_) => bail!("Failed to extract CST from source"),
    }
 }

-pub(crate) fn match_statement(statement_text: &str) -> Result<Statement<'_>> {
+pub(crate) fn match_statement(statement_text: &str) -> Result<Statement> {
    match libcst_native::parse_statement(statement_text) {
        Ok(statement) => Ok(statement),
        Err(_) => bail!("Failed to extract statement from source"),
@@ -220,7 +220,7 @@ pub(crate) fn match_if<'a, 'b>(statement: &'a mut Statement<'b>) -> Result<&'a m
 ///
 /// If the expression is not guaranteed to be valid as a standalone expression (e.g., if it may
 /// span multiple lines and/or require parentheses), use [`transform_expression`] instead.
-pub(crate) fn match_expression(expression_text: &str) -> Result<Expression<'_>> {
+pub(crate) fn match_expression(expression_text: &str) -> Result<Expression> {
    match libcst_native::parse_expression(expression_text) {
        Ok(expression) => Ok(expression),
        Err(_) => bail!("Failed to extract expression from source"),
--- a/crates/ruff_linter/src/doc_lines.rs
+++ b/crates/ruff_linter/src/doc_lines.rs
@@ -13,7 +13,7 @@ use ruff_text_size::{Ranged, TextSize};
 use crate::Locator;

 /// Extract doc lines (standalone comments) from a token sequence.
-pub(crate) fn doc_lines_from_tokens(tokens: &Tokens) -> DocLines<'_> {
+pub(crate) fn doc_lines_from_tokens(tokens: &Tokens) -> DocLines {
    DocLines::new(tokens)
 }

--- a/crates/ruff_linter/src/docstrings/mod.rs
+++ b/crates/ruff_linter/src/docstrings/mod.rs
@@ -32,7 +32,7 @@ impl<'a> Docstring<'a> {
    }

    /// The contents of the docstring, excluding the opening and closing quotes.
-    pub(crate) fn body(&self) -> DocstringBody<'_> {
+    pub(crate) fn body(&self) -> DocstringBody {
        DocstringBody { docstring: self }
    }

--- a/crates/ruff_linter/src/docstrings/sections.rs
+++ b/crates/ruff_linter/src/docstrings/sections.rs
@@ -208,7 +208,7 @@ impl<'a> SectionContexts<'a> {
        self.contexts.len()
    }

-    pub(crate) fn iter(&self) -> SectionContextsIter<'_> {
+    pub(crate) fn iter(&self) -> SectionContextsIter {
        SectionContextsIter {
            docstring_body: self.docstring.body(),
            inner: self.contexts.iter(),
--- a/crates/ruff_linter/src/importer/insertion.rs
+++ b/crates/ruff_linter/src/importer/insertion.rs
@@ -329,7 +329,7 @@ mod tests {

    #[test]
    fn start_of_file() -> Result<()> {
-        fn insert(contents: &str) -> Result<Insertion<'_>> {
+        fn insert(contents: &str) -> Result<Insertion> {
            let parsed = parse_module(contents)?;
            let locator = Locator::new(contents);
            let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
@@ -450,7 +450,7 @@ x = 1

    #[test]
    fn start_of_block() {
-        fn insert(contents: &str, offset: TextSize) -> Insertion<'_> {
+        fn insert(contents: &str, offset: TextSize) -> Insertion {
            let parsed = parse_module(contents).unwrap();
            let locator = Locator::new(contents);
            let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
--- a/crates/ruff_linter/src/linter.rs
+++ b/crates/ruff_linter/src/linter.rs
@@ -44,15 +44,44 @@ pub struct LinterResult {
    /// Flag indicating that the parsed source code does not contain any
    /// [`ParseError`]s
    has_valid_syntax: bool,
+    /// Flag indicating that the parsed source code does not contain any [`ParseError`]s,
+    /// [`UnsupportedSyntaxError`]s, or [`SemanticSyntaxError`]s.
+    has_no_syntax_errors: bool,
 }

 impl LinterResult {
+    /// Returns `true` if the parsed source code contains any [`ParseError`]s *or*
+    /// [`UnsupportedSyntaxError`]s.
+    ///
+    /// See [`LinterResult::has_invalid_syntax`] for a version specific to [`ParseError`]s.
+    pub fn has_syntax_errors(&self) -> bool {
+        !self.has_no_syntax_errors()
+    }
+
+    /// Returns `true` if the parsed source code does not contain any [`ParseError`]s *or*
+    /// [`UnsupportedSyntaxError`]s.
+    ///
+    /// See [`LinterResult::has_valid_syntax`] for a version specific to [`ParseError`]s.
+    pub fn has_no_syntax_errors(&self) -> bool {
+        self.has_valid_syntax() && self.has_no_syntax_errors
+    }
+
+    /// Returns `true` if the parsed source code is valid i.e., it has no [`ParseError`]s.
+    ///
+    /// Note that this does not include version-related [`UnsupportedSyntaxError`]s.
+    ///
+    /// See [`LinterResult::has_no_syntax_errors`] for a version that takes these into account.
+    pub fn has_valid_syntax(&self) -> bool {
+        self.has_valid_syntax
+    }
+
    /// Returns `true` if the parsed source code is invalid i.e., it has [`ParseError`]s.
    ///
-    /// Note that this does not include version-related [`UnsupportedSyntaxError`]s or
-    /// [`SemanticSyntaxError`]s.
+    /// Note that this does not include version-related [`UnsupportedSyntaxError`]s.
+    ///
+    /// See [`LinterResult::has_no_syntax_errors`] for a version that takes these into account.
    pub fn has_invalid_syntax(&self) -> bool {
-        !self.has_valid_syntax
+        !self.has_valid_syntax()
    }
 }

@@ -484,6 +513,7 @@ pub fn lint_only(

    LinterResult {
        has_valid_syntax: parsed.has_valid_syntax(),
+        has_no_syntax_errors: !diagnostics.iter().any(Diagnostic::is_invalid_syntax),
        diagnostics,
    }
 }
@@ -640,6 +670,7 @@ pub fn lint_fix<'a>(
            result: LinterResult {
                diagnostics,
                has_valid_syntax,
+                has_no_syntax_errors,
            },
            transformed,
            fixed,
--- a/crates/ruff_linter/src/locator.rs
+++ b/crates/ruff_linter/src/locator.rs
@@ -49,7 +49,7 @@ impl<'a> Locator<'a> {
        self.index.get()
    }

-    pub fn to_source_code(&self) -> SourceCode<'_, '_> {
+    pub fn to_source_code(&self) -> SourceCode {
        SourceCode::new(self.contents, self.to_index())
    }

--- a/crates/ruff_linter/src/message/github.rs
+++ b/crates/ruff_linter/src/message/github.rs
@@ -33,8 +33,10 @@ impl Emitter for GithubEmitter {

            write!(
                writer,
-                "::error title=Ruff ({code}),file={file},line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                code = diagnostic.secondary_code_or_id(),
+                "::error title=Ruff{code},file={file},line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                code = diagnostic
+                    .secondary_code()
+                    .map_or_else(String::new, |code| format!(" ({code})")),
                file = filename,
                row = source_location.line,
                column = source_location.column,
@@ -52,8 +54,6 @@ impl Emitter for GithubEmitter {

            if let Some(code) = diagnostic.secondary_code() {
                write!(writer, " {code}")?;
-            } else {
-                write!(writer, " {id}:", id = diagnostic.id())?;
            }

            writeln!(writer, " {}", diagnostic.body())?;
--- a/crates/ruff_linter/src/message/gitlab.rs
+++ b/crates/ruff_linter/src/message/gitlab.rs
@@ -61,17 +61,22 @@ impl Serialize for SerializedMessages<'_> {
        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());

        for diagnostic in self.diagnostics {
-            let filename = diagnostic.expect_ruff_filename();
+            let start_location = diagnostic.expect_ruff_start_location();
+            let end_location = diagnostic.expect_ruff_end_location();

-            let (start_location, end_location) = if self.context.is_notebook(&filename) {
+            let filename = diagnostic.expect_ruff_filename();
+            let lines = if self.context.is_notebook(&filename) {
                // We can't give a reasonable location for the structured formats,
                // so we show one that's clearly a fallback
-                Default::default()
+                json!({
+                    "begin": 1,
+                    "end": 1
+                })
            } else {
-                (
-                    diagnostic.expect_ruff_start_location(),
-                    diagnostic.expect_ruff_end_location(),
-                )
+                json!({
+                    "begin": start_location.line,
+                    "end": end_location.line
+                })
            };

            let path = self.project_dir.as_ref().map_or_else(
@@ -88,23 +93,26 @@ impl Serialize for SerializedMessages<'_> {
            }
            fingerprints.insert(message_fingerprint);

-            let description = diagnostic.body();
-            let check_name = diagnostic.secondary_code_or_id();
+            let (description, check_name) = if let Some(code) = diagnostic.secondary_code() {
+                (diagnostic.body().to_string(), code.as_str())
+            } else {
+                let description = diagnostic.body();
+                let description_without_prefix = description
+                    .strip_prefix("SyntaxError: ")
+                    .unwrap_or(description);
+
+                (description_without_prefix.to_string(), "syntax-error")
+            };

            let value = json!({
                "check_name": 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}"),
+                "description": description,
                "severity": "major",
                "fingerprint": format!("{:x}", message_fingerprint),
                "location": {
                    "path": path,
-                    "positions": {
-                        "begin": start_location,
-                        "end": end_location,
-                    },
-                },
+                    "lines": lines
+                }
            });

            s.serialize_element(&value)?;
--- a/crates/ruff_linter/src/message/grouped.rs
+++ b/crates/ruff_linter/src/message/grouped.rs
@@ -1,4 +1,3 @@
-use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
 use std::io::Write;
 use std::num::NonZeroUsize;
@@ -7,16 +6,18 @@ use colored::Colorize;

 use ruff_db::diagnostic::Diagnostic;
 use ruff_notebook::NotebookIndex;
-use ruff_source_file::{LineColumn, OneIndexed};
+use ruff_source_file::OneIndexed;

 use crate::fs::relativize_path;
 use crate::message::diff::calculate_print_width;
-use crate::message::{Emitter, EmitterContext};
+use crate::message::text::{MessageCodeFrame, RuleCodeAndBody};
+use crate::message::{Emitter, EmitterContext, MessageWithLocation, group_diagnostics_by_filename};
 use crate::settings::types::UnsafeFixes;

 #[derive(Default)]
 pub struct GroupedEmitter {
    show_fix_status: bool,
+    show_source: bool,
    unsafe_fixes: UnsafeFixes,
 }

@@ -27,6 +28,12 @@ impl GroupedEmitter {
        self
    }

+    #[must_use]
+    pub fn with_show_source(mut self, show_source: bool) -> Self {
+        self.show_source = show_source;
+        self
+    }
+
    #[must_use]
    pub fn with_unsafe_fixes(mut self, unsafe_fixes: UnsafeFixes) -> Self {
        self.unsafe_fixes = unsafe_fixes;
@@ -69,53 +76,29 @@ impl Emitter for GroupedEmitter {
                        message,
                        show_fix_status: self.show_fix_status,
                        unsafe_fixes: self.unsafe_fixes,
+                        show_source: self.show_source,
                        row_length,
                        column_length,
                    }
                )?;
            }

-            // Print a blank line between files.
-            writeln!(writer)?;
+            // Print a blank line between files, unless we're showing the source, in which case
+            // we'll have already printed a blank line between messages.
+            if !self.show_source {
+                writeln!(writer)?;
+            }
        }

        Ok(())
    }
 }

-struct MessageWithLocation<'a> {
-    message: &'a Diagnostic,
-    start_location: LineColumn,
-}
-
-impl std::ops::Deref for MessageWithLocation<'_> {
-    type Target = Diagnostic;
-
-    fn deref(&self) -> &Self::Target {
-        self.message
-    }
-}
-
-fn group_diagnostics_by_filename(
-    diagnostics: &[Diagnostic],
-) -> BTreeMap<String, Vec<MessageWithLocation<'_>>> {
-    let mut grouped_messages = BTreeMap::default();
-    for diagnostic in diagnostics {
-        grouped_messages
-            .entry(diagnostic.expect_ruff_filename())
-            .or_insert_with(Vec::new)
-            .push(MessageWithLocation {
-                message: diagnostic,
-                start_location: diagnostic.expect_ruff_start_location(),
-            });
-    }
-    grouped_messages
-}
-
 struct DisplayGroupedMessage<'a> {
    message: MessageWithLocation<'a>,
    show_fix_status: bool,
    unsafe_fixes: UnsafeFixes,
+    show_source: bool,
    row_length: NonZeroUsize,
    column_length: NonZeroUsize,
    notebook_index: Option<&'a NotebookIndex>,
@@ -169,50 +152,51 @@ impl Display for DisplayGroupedMessage<'_> {
            },
        )?;

+        if self.show_source {
+            use std::fmt::Write;
+            let mut padded = PadAdapter::new(f);
+            writeln!(
+                padded,
+                "{}",
+                MessageCodeFrame {
+                    message,
+                    notebook_index: self.notebook_index
+                }
+            )?;
+        }
+
        Ok(())
    }
 }

-pub(super) struct RuleCodeAndBody<'a> {
-    pub(crate) message: &'a Diagnostic,
-    pub(crate) show_fix_status: bool,
-    pub(crate) unsafe_fixes: UnsafeFixes,
+/// Adapter that adds a '  ' at the start of every line without the need to copy the string.
+/// Inspired by Rust's `debug_struct()` internal implementation that also uses a `PadAdapter`.
+struct PadAdapter<'buf> {
+    buf: &'buf mut (dyn std::fmt::Write + 'buf),
+    on_newline: bool,
 }

-impl Display for RuleCodeAndBody<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        if self.show_fix_status {
-            if let Some(fix) = self.message.fix() {
-                // Do not display an indicator for inapplicable fixes
-                if fix.applies(self.unsafe_fixes.required_applicability()) {
-                    if let Some(code) = self.message.secondary_code() {
-                        write!(f, "{} ", code.red().bold())?;
-                    }
-                    return write!(
-                        f,
-                        "{fix}{body}",
-                        fix = format_args!("[{}] ", "*".cyan()),
-                        body = self.message.body(),
-                    );
-                }
+impl<'buf> PadAdapter<'buf> {
+    fn new(buf: &'buf mut (dyn std::fmt::Write + 'buf)) -> Self {
+        Self {
+            buf,
+            on_newline: true,
+        }
+    }
+}
+
+impl std::fmt::Write for PadAdapter<'_> {
+    fn write_str(&mut self, s: &str) -> std::fmt::Result {
+        for s in s.split_inclusive('\n') {
+            if self.on_newline {
+                self.buf.write_str("  ")?;
            }
+
+            self.on_newline = s.ends_with('\n');
+            self.buf.write_str(s)?;
        }

-        if let Some(code) = self.message.secondary_code() {
-            write!(
-                f,
-                "{code} {body}",
-                code = code.red().bold(),
-                body = self.message.body(),
-            )
-        } else {
-            write!(
-                f,
-                "{code}: {body}",
-                code = self.message.id().as_str().red().bold(),
-                body = self.message.body(),
-            )
-        }
+        Ok(())
    }
 }

@@ -242,9 +226,19 @@ mod tests {
        assert_snapshot!(content);
    }

+    #[test]
+    fn show_source() {
+        let mut emitter = GroupedEmitter::default().with_show_source(true);
+        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
+
+        assert_snapshot!(content);
+    }
+
    #[test]
    fn fix_status() {
-        let mut emitter = GroupedEmitter::default().with_show_fix_status(true);
+        let mut emitter = GroupedEmitter::default()
+            .with_show_fix_status(true)
+            .with_show_source(true);
        let content = capture_emitter_output(&mut emitter, &create_diagnostics());

        assert_snapshot!(content);
@@ -254,6 +248,7 @@ mod tests {
    fn fix_status_unsafe() {
        let mut emitter = GroupedEmitter::default()
            .with_show_fix_status(true)
+            .with_show_source(true)
            .with_unsafe_fixes(UnsafeFixes::Enabled);
        let content = capture_emitter_output(&mut emitter, &create_diagnostics());

--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -1,5 +1,7 @@
+use std::collections::BTreeMap;
 use std::fmt::Display;
 use std::io::Write;
+use std::ops::Deref;

 use rustc_hash::FxHashMap;

@@ -13,7 +15,7 @@ pub use github::GithubEmitter;
 pub use gitlab::GitlabEmitter;
 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
-use ruff_source_file::SourceFile;
+use ruff_source_file::{LineColumn, SourceFile};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 pub use sarif::SarifEmitter;
 pub use text::TextEmitter;
@@ -31,7 +33,8 @@ mod text;
 /// Creates a `Diagnostic` from a syntax error, with the format expected by Ruff.
 ///
 /// This is almost identical to `ruff_db::diagnostic::create_syntax_error_diagnostic`, except the
-/// `message` is stored as the primary diagnostic message instead of on the primary annotation.
+/// `message` is stored as the primary diagnostic message instead of on the primary annotation, and
+/// `SyntaxError: ` is prepended to the message.
 ///
 /// TODO(brent) These should be unified at some point, but we keep them separate for now to avoid a
 /// ton of snapshot changes while combining ruff's diagnostic type with `Diagnostic`.
@@ -40,7 +43,11 @@ pub fn create_syntax_error_diagnostic(
    message: impl std::fmt::Display,
    range: impl Ranged,
 ) -> Diagnostic {
-    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
+    let mut diag = Diagnostic::new(
+        DiagnosticId::InvalidSyntax,
+        Severity::Error,
+        format_args!("SyntaxError: {message}"),
+    );
    let span = span.into().with_range(range.range());
    diag.annotate(Annotation::primary(span));
    diag
@@ -68,15 +75,7 @@ where
    );

    let span = Span::from(file).with_range(range);
-    let mut annotation = Annotation::primary(span);
-    // The `0..0` range is used to highlight file-level diagnostics.
-    //
-    // TODO(brent) We should instead set this flag on annotations for individual lint rules that
-    // actually need it, but we need to be able to cache the new diagnostic model first. See
-    // https://github.com/astral-sh/ruff/issues/19688.
-    if range == TextRange::default() {
-        annotation.set_file_level(true);
-    }
+    let annotation = Annotation::primary(span);
    diagnostic.annotate(annotation);

    if let Some(suggestion) = suggestion {
@@ -132,6 +131,35 @@ impl FileResolver for EmitterContext<'_> {
    }
 }

+struct MessageWithLocation<'a> {
+    message: &'a Diagnostic,
+    start_location: LineColumn,
+}
+
+impl Deref for MessageWithLocation<'_> {
+    type Target = Diagnostic;
+
+    fn deref(&self) -> &Self::Target {
+        self.message
+    }
+}
+
+fn group_diagnostics_by_filename(
+    diagnostics: &[Diagnostic],
+) -> BTreeMap<String, Vec<MessageWithLocation>> {
+    let mut grouped_messages = BTreeMap::default();
+    for diagnostic in diagnostics {
+        grouped_messages
+            .entry(diagnostic.expect_ruff_filename())
+            .or_insert_with(Vec::new)
+            .push(MessageWithLocation {
+                message: diagnostic,
+                start_location: diagnostic.expect_ruff_start_location(),
+            });
+    }
+    grouped_messages
+}
+
 /// Display format for [`Diagnostic`]s.
 ///
 /// The emitter serializes a slice of [`Diagnostic`]s and writes them to a [`Write`].
--- a/crates/ruff_linter/src/message/sarif.rs
+++ b/crates/ruff_linter/src/message/sarif.rs
@@ -27,10 +27,7 @@ impl Emitter for SarifEmitter {
            .map(SarifResult::from_message)
            .collect::<Result<Vec<_>>>()?;

-        let unique_rules: HashSet<_> = results
-            .iter()
-            .filter_map(|result| result.code.as_secondary_code())
-            .collect();
+        let unique_rules: HashSet<_> = results.iter().filter_map(|result| result.code).collect();
        let mut rules: Vec<SarifRule> = unique_rules.into_iter().map(SarifRule::from).collect();
        rules.sort_by(|a, b| a.code.cmp(b.code));

@@ -112,40 +109,9 @@ impl Serialize for SarifRule<'_> {
    }
 }

-#[derive(Debug)]
-enum RuleCode<'a> {
-    SecondaryCode(&'a SecondaryCode),
-    LintId(&'a str),
-}
-
-impl RuleCode<'_> {
-    fn as_secondary_code(&self) -> Option<&SecondaryCode> {
-        match self {
-            RuleCode::SecondaryCode(code) => Some(code),
-            RuleCode::LintId(_) => None,
-        }
-    }
-
-    fn as_str(&self) -> &str {
-        match self {
-            RuleCode::SecondaryCode(code) => code.as_str(),
-            RuleCode::LintId(id) => id,
-        }
-    }
-}
-
-impl<'a> From<&'a Diagnostic> for RuleCode<'a> {
-    fn from(code: &'a Diagnostic) -> Self {
-        match code.secondary_code() {
-            Some(diagnostic) => Self::SecondaryCode(diagnostic),
-            None => Self::LintId(code.id().as_str()),
-        }
-    }
-}
-
 #[derive(Debug)]
 struct SarifResult<'a> {
-    code: RuleCode<'a>,
+    code: Option<&'a SecondaryCode>,
    level: String,
    message: String,
    uri: String,
@@ -162,7 +128,7 @@ impl<'a> SarifResult<'a> {
        let end_location = message.expect_ruff_end_location();
        let path = normalize_path(&*message.expect_ruff_filename());
        Ok(Self {
-            code: RuleCode::from(message),
+            code: message.secondary_code(),
            level: "error".to_string(),
            message: message.body().to_string(),
            uri: url::Url::from_file_path(&path)
@@ -182,7 +148,7 @@ impl<'a> SarifResult<'a> {
        let end_location = message.expect_ruff_end_location();
        let path = normalize_path(&*message.expect_ruff_filename());
        Ok(Self {
-            code: RuleCode::from(message),
+            code: message.secondary_code(),
            level: "error".to_string(),
            message: message.body().to_string(),
            uri: path.display().to_string(),
@@ -217,7 +183,7 @@ impl Serialize for SarifResult<'_> {
                    }
                }
            }],
-            "ruleId": self.code.as_str(),
+            "ruleId": self.code,
        })
        .serialize(serializer)
    }
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegithubtestssyntax_errors.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegithubtestssyntax_errors.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/ruff_linter/src/message/github.rs
 expression: content
+snapshot_kind: text
 ---
-::error title=Ruff (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=Ruff (invalid-syntax),file=syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=Ruff,file=syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: SyntaxError: Expected one or more symbol names after import
+::error title=Ruff,file=syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: SyntaxError: Expected ')', found newline
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegitlabtestsoutput.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegitlabtestsoutput.snap
@@ -5,58 +5,40 @@ expression: redact_fingerprint(&content)
 [
  {
    "check_name": "F401",
-    "description": "F401: `os` imported but unused",
+    "description": "`os` imported but unused",
    "fingerprint": "<redacted>",
    "location": {
-      "path": "fib.py",
-      "positions": {
-        "begin": {
-          "column": 8,
-          "line": 1
-        },
-        "end": {
-          "column": 10,
-          "line": 1
-        }
-      }
+      "lines": {
+        "begin": 1,
+        "end": 1
+      },
+      "path": "fib.py"
    },
    "severity": "major"
  },
  {
    "check_name": "F841",
-    "description": "F841: Local variable `x` is assigned to but never used",
+    "description": "Local variable `x` is assigned to but never used",
    "fingerprint": "<redacted>",
    "location": {
-      "path": "fib.py",
-      "positions": {
-        "begin": {
-          "column": 5,
-          "line": 6
-        },
-        "end": {
-          "column": 6,
-          "line": 6
-        }
-      }
+      "lines": {
+        "begin": 6,
+        "end": 6
+      },
+      "path": "fib.py"
    },
    "severity": "major"
  },
  {
    "check_name": "F821",
-    "description": "F821: Undefined name `a`",
+    "description": "Undefined name `a`",
    "fingerprint": "<redacted>",
    "location": {
-      "path": "undef.py",
-      "positions": {
-        "begin": {
-          "column": 4,
-          "line": 1
-        },
-        "end": {
-          "column": 5,
-          "line": 1
-        }
-      }
+      "lines": {
+        "begin": 1,
+        "end": 1
+      },
+      "path": "undef.py"
    },
    "severity": "major"
  }
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegitlabtestssyntax_errors.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegitlabtestssyntax_errors.snap
@@ -4,40 +4,28 @@ expression: redact_fingerprint(&content)
 ---
 [
  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Expected one or more symbol names after import",
+    "check_name": "syntax-error",
+    "description": "Expected one or more symbol names after import",
    "fingerprint": "<redacted>",
    "location": {
-      "path": "syntax_errors.py",
-      "positions": {
-        "begin": {
-          "column": 15,
-          "line": 1
-        },
-        "end": {
-          "column": 1,
-          "line": 2
-        }
-      }
+      "lines": {
+        "begin": 1,
+        "end": 2
+      },
+      "path": "syntax_errors.py"
    },
    "severity": "major"
  },
  {
-    "check_name": "invalid-syntax",
-    "description": "invalid-syntax: Expected ')', found newline",
+    "check_name": "syntax-error",
+    "description": "Expected ')', found newline",
    "fingerprint": "<redacted>",
    "location": {
-      "path": "syntax_errors.py",
-      "positions": {
-        "begin": {
-          "column": 12,
-          "line": 3
-        },
-        "end": {
-          "column": 1,
-          "line": 4
-        }
-      }
+      "lines": {
+        "begin": 3,
+        "end": 4
+      },
+      "path": "syntax_errors.py"
    },
    "severity": "major"
  }
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsfix_status.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsfix_status.snap
@@ -1,10 +1,30 @@
 ---
 source: crates/ruff_linter/src/message/grouped.rs
 expression: content
+snapshot_kind: text
 ---
 fib.py:
  1:8 F401 `os` imported but unused
+    |
+  1 | import os
+    |        ^^ F401
+    |
+    = help: Remove unused import: `os`
+  
  6:5 F841 Local variable `x` is assigned to but never used
-
+    |
+  4 | def fibonacci(n):
+  5 |     """Compute the nth number in the Fibonacci sequence."""
+  6 |     x = 1
+    |     ^ F841
+  7 |     if n == 0:
+  8 |         return 0
+    |
+    = help: Remove assignment to unused variable `x`
+  
 undef.py:
  1:4 F821 Undefined name `a`
+    |
+  1 | if a == 1: pass
+    |    ^ F821
+    |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsfix_status_unsafe.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsfix_status_unsafe.snap
@@ -1,10 +1,30 @@
 ---
 source: crates/ruff_linter/src/message/grouped.rs
 expression: content
+snapshot_kind: text
 ---
 fib.py:
  1:8 F401 [*] `os` imported but unused
+    |
+  1 | import os
+    |        ^^ F401
+    |
+    = help: Remove unused import: `os`
+  
  6:5 F841 [*] Local variable `x` is assigned to but never used
-
+    |
+  4 | def fibonacci(n):
+  5 |     """Compute the nth number in the Fibonacci sequence."""
+  6 |     x = 1
+    |     ^ F841
+  7 |     if n == 0:
+  8 |         return 0
+    |
+    = help: Remove assignment to unused variable `x`
+  
 undef.py:
  1:4 F821 Undefined name `a`
+    |
+  1 | if a == 1: pass
+    |    ^ F821
+    |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsshow_source.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsshow_source.snap
@@ -0,0 +1,30 @@
+---
+source: crates/ruff_linter/src/message/grouped.rs
+expression: content
+snapshot_kind: text
+---
+fib.py:
+  1:8 F401 `os` imported but unused
+    |
+  1 | import os
+    |        ^^ F401
+    |
+    = help: Remove unused import: `os`
+  
+  6:5 F841 Local variable `x` is assigned to but never used
+    |
+  4 | def fibonacci(n):
+  5 |     """Compute the nth number in the Fibonacci sequence."""
+  6 |     x = 1
+    |     ^ F841
+  7 |     if n == 0:
+  8 |         return 0
+    |
+    = help: Remove assignment to unused variable `x`
+  
+undef.py:
+  1:4 F821 Undefined name `a`
+    |
+  1 | if a == 1: pass
+    |    ^ F821
+    |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestssyntax_errors.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestssyntax_errors.snap
@@ -1,7 +1,8 @@
 ---
 source: crates/ruff_linter/src/message/grouped.rs
 expression: content
+snapshot_kind: text
 ---
 syntax_errors.py:
-  1:15 invalid-syntax: Expected one or more symbol names after import
-  3:12 invalid-syntax: Expected ')', found newline
+  1:15 SyntaxError: Expected one or more symbol names after import
+  3:12 SyntaxError: Expected ')', found newline
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsdefault.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsdefault.snap
@@ -1,30 +1,28 @@
 ---
 source: crates/ruff_linter/src/message/text.rs
 expression: content
+snapshot_kind: text
 ---
-F401 `os` imported but unused
- --> fib.py:1:8
+fib.py:1:8: F401 `os` imported but unused
  |
 1 | import os
-  |        ^^
+  |        ^^ F401
  |
-help: Remove unused import: `os`
+  = help: Remove unused import: `os`

-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
+fib.py:6:5: F841 Local variable `x` is assigned to but never used
  |
 4 | def fibonacci(n):
 5 |     """Compute the nth number in the Fibonacci sequence."""
 6 |     x = 1
-  |     ^
+  |     ^ F841
 7 |     if n == 0:
 8 |         return 0
  |
-help: Remove assignment to unused variable `x`
+  = help: Remove assignment to unused variable `x`

-F821 Undefined name `a`
- --> undef.py:1:4
+undef.py:1:4: F821 Undefined name `a`
  |
 1 | if a == 1: pass
-  |    ^
+  |    ^ F821
  |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status.snap
@@ -1,30 +1,28 @@
 ---
 source: crates/ruff_linter/src/message/text.rs
 expression: content
+snapshot_kind: text
 ---
-F401 `os` imported but unused
- --> fib.py:1:8
+fib.py:1:8: F401 `os` imported but unused
  |
 1 | import os
-  |        ^^
+  |        ^^ F401
  |
-help: Remove unused import: `os`
+  = help: Remove unused import: `os`

-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
+fib.py:6:5: F841 Local variable `x` is assigned to but never used
  |
 4 | def fibonacci(n):
 5 |     """Compute the nth number in the Fibonacci sequence."""
 6 |     x = 1
-  |     ^
+  |     ^ F841
 7 |     if n == 0:
 8 |         return 0
  |
-help: Remove assignment to unused variable `x`
+  = help: Remove assignment to unused variable `x`

-F821 Undefined name `a`
- --> undef.py:1:4
+undef.py:1:4: F821 Undefined name `a`
  |
 1 | if a == 1: pass
-  |    ^
+  |    ^ F821
  |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status_unsafe.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status_unsafe.snap
@@ -1,30 +1,28 @@
 ---
 source: crates/ruff_linter/src/message/text.rs
 expression: content
+snapshot_kind: text
 ---
-F401 [*] `os` imported but unused
- --> fib.py:1:8
+fib.py:1:8: F401 [*] `os` imported but unused
  |
 1 | import os
-  |        ^^
+  |        ^^ F401
  |
-help: Remove unused import: `os`
+  = help: Remove unused import: `os`

-F841 [*] Local variable `x` is assigned to but never used
- --> fib.py:6:5
+fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
  |
 4 | def fibonacci(n):
 5 |     """Compute the nth number in the Fibonacci sequence."""
 6 |     x = 1
-  |     ^
+  |     ^ F841
 7 |     if n == 0:
 8 |         return 0
  |
-help: Remove assignment to unused variable `x`
+  = help: Remove assignment to unused variable `x`

-F821 Undefined name `a`
- --> undef.py:1:4
+undef.py:1:4: F821 Undefined name `a`
  |
 1 | if a == 1: pass
-  |    ^
+  |    ^ F821
  |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Douglas Creager	9964f4eee6	use tuplespec for variadic param annotation	2025-08-01 16:22:46 -04:00
Douglas Creager	46c936cc72	move annotated_type into paramkind	2025-08-01 16:22:46 -04:00