[ty] Track narrowing unions to prevent exponential blowup

When inferring a call expression with a union type context, we try narrowing to each element of the union. If nested calls have the same union as their parameter type, this would lead to exponential blowup. By tracking which unions we're already narrowing against, we skip redundant nested narrowing. On a synthetic benchmark with nested `list_schema()` calls: - 4-level nesting: >120s → 0.13s
[ty] Add short-circuits for union type relation checks
2025-12-18 20:24:33 -06:00 · 2025-12-18 20:24:18 -06:00 · 2025-12-18 20:24:03 -06:00 · 2025-12-18 20:23:28 -06:00 · 2025-12-18 18:35:38 -06:00 · 2025-12-18 18:35:38 -06:00
1468 changed files with 13293 additions and 31123 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,7 +22,6 @@ crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_CR.py text eol=cr
 crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_LF.py text eol=lf

 crates/ruff_python_parser/resources/inline linguist-generated=true
-crates/ty_python_semantic/resources/mdtest/external/*.lock linguist-generated=true

 ruff.schema.json -diff linguist-generated=true text=auto eol=lf
 ty.schema.json -diff linguist-generated=true text=auto eol=lf
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,11 +20,9 @@
 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
-/crates/ty_ide/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
+/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 @Gankra
+/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ty_python_semantic/ @carljm @AlexWaygood @sharkdp @dcreager
-/crates/ty_module_resolver/ @carljm @MichaReiser @AlexWaygood Gankra
+/crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -4,17 +4,10 @@
 self-hosted-runner:
  # Various runners we use that aren't recognized out-of-the-box by actionlint:
  labels:
-    - depot-ubuntu-24.04-4
    - depot-ubuntu-latest-8
    - depot-ubuntu-22.04-16
    - depot-ubuntu-22.04-32
    - depot-windows-2022-16
-    - depot-ubuntu-22.04-arm-4
    - github-windows-2025-x86_64-8
    - github-windows-2025-x86_64-16
    - codspeed-macro
-
-paths:
-  ".github/workflows/mypy_primer.yaml":
-    ignore:
-      - 'condition "false" is always evaluated to false. remove the if: section'
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -39,7 +39,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -59,7 +59,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload sdist"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-sdist
          path: dist
@@ -68,7 +68,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -84,7 +84,7 @@ jobs:
          target: x86_64
          args: --release --locked --out dist
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-macos-x86_64
          path: dist
@@ -99,7 +99,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-macos-x86_64
          path: |
@@ -110,7 +110,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -131,7 +131,7 @@ jobs:
          ruff --help
          python -m ruff --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-aarch64-apple-darwin
          path: dist
@@ -146,7 +146,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-aarch64-apple-darwin
          path: |
@@ -166,7 +166,7 @@ jobs:
          - target: aarch64-pc-windows-msvc
            arch: x64
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -192,7 +192,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -203,7 +203,7 @@ jobs:
          7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
          sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
@@ -219,7 +219,7 @@ jobs:
          - x86_64-unknown-linux-gnu
          - i686-unknown-linux-gnu
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -242,7 +242,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-${{ matrix.target }}
          path: dist
@@ -260,7 +260,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-${{ matrix.target }}
          path: |
@@ -296,7 +296,7 @@ jobs:
            arch: riscv64

    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -327,7 +327,7 @@ jobs:
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            ruff --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -345,7 +345,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
@@ -361,7 +361,7 @@ jobs:
          - x86_64-unknown-linux-musl
          - i686-unknown-linux-musl
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -389,7 +389,7 @@ jobs:
            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            .venv/bin/${{ env.MODULE_NAME }} --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-${{ matrix.target }}
          path: dist
@@ -407,7 +407,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-${{ matrix.target }}
          path: |
@@ -427,7 +427,7 @@ jobs:
            arch: armv7

    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false
@@ -456,7 +456,7 @@ jobs:
            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            .venv/bin/${{ env.MODULE_NAME }} --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -474,7 +474,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -20,12 +20,6 @@ on:
 env:
  RUFF_BASE_IMG: ghcr.io/${{ github.repository_owner }}/ruff

-permissions:
-  contents: read
-  # TODO(zanieb): Ideally, this would be `read` on dry-run but that will require
-  # significant changes to the workflow.
-  packages: write # zizmor: ignore[excessive-permissions]
-
 jobs:
  docker-build:
    name: Build Docker image (ghcr.io/astral-sh/ruff) for ${{ matrix.platform }}
@@ -39,12 +33,12 @@ jobs:
          - linux/amd64
          - linux/arm64
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          submodules: recursive
          persist-credentials: false

-      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
@@ -69,7 +63,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.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
@@ -102,7 +96,7 @@ jobs:
          touch "/tmp/digests/${digest#sha256:}"

      - name: Upload digests
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: digests-${{ env.PLATFORM_TUPLE }}
          path: /tmp/digests/*
@@ -119,17 +113,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

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

      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
@@ -225,7 +219,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
        # ghcr.io prefers index level annotations
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -262,17 +256,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
        with:
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,10 +49,8 @@ jobs:
      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 }}
-      # Flag that is set to "true" when code related to the benchmarks changes.
-      benchmarks: ${{ steps.check_benchmarks.outputs.changed }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -97,7 +95,6 @@ jobs:
            ':!crates/ruff_python_formatter/**' \
            ':!crates/ruff_formatter/**' \
            ':!crates/ruff_dev/**' \
-            ':!crates/ruff_benchmark/**' \
            ':scripts/*' \
            ':python/**' \
            ':.github/workflows/ci.yaml' \
@@ -205,21 +202,6 @@ jobs:
            ':crates/ruff_python_trivia/**' \
            ':crates/ruff_source_file/**' \
            ':crates/ruff_text_size/**' \
-            ':.github/workflows/ci.yaml' \
-          ; then
-              echo "changed=false" >> "$GITHUB_OUTPUT"
-          else
-              echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Check if the benchmark code changed
-        id: check_benchmarks
-        env:
-          MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
-        run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- \
-            ':Cargo.toml' \
-            ':Cargo.lock' \
            ':crates/ruff_benchmark/**' \
            ':.github/workflows/ci.yaml' \
          ; then
@@ -233,7 +215,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -247,7 +229,7 @@ jobs:
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -269,7 +251,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -281,15 +263,15 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
@@ -332,7 +314,7 @@ jobs:
      (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main')
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -343,11 +325,11 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -367,7 +349,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -376,11 +358,11 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -395,7 +377,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -403,9 +385,9 @@ jobs:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
          cache: "npm"
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
@@ -427,7 +409,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
@@ -456,7 +438,7 @@ jobs:
    if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -468,7 +450,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
+        uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
      - name: "Install cargo-fuzz"
        # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
        run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -483,10 +465,10 @@ jobs:
    env:
      FORCE_COLOR: 1
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          shared-key: ruff-linux-debug
@@ -515,13 +497,13 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 5
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -548,20 +530,15 @@ jobs:
    needs: determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
    # Ecosystem check needs linter and/or formatter changes.
-    if: |
-      !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' &&
-      (
-        needs.determine_changes.outputs.linter == 'true' ||
-        needs.determine_changes.outputs.formatter == 'true'
-      )
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ github.event.pull_request.base.ref }}
          persist-credentials: false

-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          activate-environment: true
@@ -582,7 +559,7 @@ jobs:
          cargo build --bin ruff
          mv target/debug/ruff target/debug/ruff-baseline

-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
          clean: false
@@ -648,7 +625,7 @@ jobs:

      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        name: Upload Results
        with:
          name: ecosystem-result
@@ -663,11 +640,11 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
    timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 10 || 20 }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          fetch-depth: 0
          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -710,10 +687,10 @@ jobs:
    needs: determine_changes
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
+      - uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -723,10 +700,10 @@ jobs:
    needs: determine_changes
    if: ${{ needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main' }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -745,7 +722,7 @@ jobs:
    timeout-minutes: 20
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -774,18 +751,18 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
      - name: "Cache pre-commit"
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ~/.cache/pre-commit
          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -794,7 +771,7 @@ jobs:
          echo '```console' > "$GITHUB_STEP_SUMMARY"
          # Enable color output for pre-commit and remove it for the summary
          # Use --hook-stage=manual to enable slower pre-commit hooks that are skipped by default
-          SKIP=cargo-fmt uvx --python="${PYTHON_VERSION}" pre-commit run --all-files --show-diff-on-failure --color=always --hook-stage=manual | \
+          SKIP=cargo-fmt,clippy,dev-generate-all uvx --python="${PYTHON_VERSION}" pre-commit run --all-files --show-diff-on-failure --color=always --hook-stage=manual | \
            tee >(sed -E 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[mGK]//g' >> "$GITHUB_STEP_SUMMARY") >&1
          exit_code="${PIPESTATUS[0]}"
          echo '```' >> "$GITHUB_STEP_SUMMARY"
@@ -805,7 +782,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -814,7 +791,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          python-version: 3.13
          activate-environment: true
@@ -836,7 +813,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -862,7 +839,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: "Checkout ruff source"
        with:
          persist-credentials: false
@@ -878,7 +855,7 @@ jobs:
      - name: Build Ruff binary
        run: cargo build -p ruff --bin ruff

-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: "Checkout ruff-lsp source"
        with:
          persist-credentials: false
@@ -913,7 +890,7 @@ jobs:
      - determine_changes
    if: ${{ (needs.determine_changes.outputs.playground == 'true') }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -921,9 +898,9 @@ jobs:
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
          cache: "npm"
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
@@ -949,9 +926,7 @@ jobs:
      (
        github.ref == 'refs/heads/main' ||
        needs.determine_changes.outputs.formatter == 'true' ||
-        needs.determine_changes.outputs.linter == 'true' ||
-        needs.determine_changes.outputs.parser == 'true' ||
-        needs.determine_changes.outputs.benchmarks == 'true'
+        needs.determine_changes.outputs.linter == 'true'
      )
    timeout-minutes: 20
    permissions:
@@ -959,198 +934,112 @@ jobs:
      id-token: write # required for OIDC authentication with CodSpeed
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-codspeed

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

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
+        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
        with:
          mode: simulation
          run: cargo codspeed run

-  benchmarks-instrumented-ty-build:
-    name: "benchmarks instrumented ty (build)"
-    runs-on: depot-ubuntu-24.04-4
+  benchmarks-instrumented-ty:
+    name: "benchmarks instrumented (ty)"
+    runs-on: ubuntu-24.04
    needs: determine_changes
    if: |
      github.repository == 'astral-sh/ruff' &&
      (
        github.ref == 'refs/heads/main' ||
-        needs.determine_changes.outputs.ty == 'true' ||
-        needs.determine_changes.outputs.benchmarks == 'true'
+        needs.determine_changes.outputs.ty == 'true'
      )
    timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-instrumented-ty-run:
-    name: "benchmarks instrumented ty (${{ matrix.benchmark }})"
-    runs-on: ubuntu-24.04
-    needs: benchmarks-instrumented-ty-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      fail-fast: false
-      matrix:
-        benchmark:
-          - "check_file|micro|anyio"
-          - "attrs|hydra|datetype"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
+        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
        with:
          mode: simulation
-          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"
+          run: cargo codspeed run

-  benchmarks-walltime-build:
-    name: "benchmarks walltime (build)"
-    # We only run this job if `github.repository == 'astral-sh/ruff'`,
-    # so hardcoding depot here is fine
-    runs-on: depot-ubuntu-22.04-arm-4
-    needs: determine_changes
-    if: |
-      github.repository == 'astral-sh/ruff' &&
-      (
-        !contains(github.event.pull_request.labels.*.name, 'no-test') &&
-        (
-          needs.determine_changes.outputs.ty == 'true' ||
-          needs.determine_changes.outputs.benchmarks == 'true' ||
-          github.ref == 'refs/heads/main'
-        )
-      )
-    timeout-minutes: 20
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          persist-credentials: false
-
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
-        with:
-          tool: cargo-codspeed
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build -m walltime --features "codspeed,ty_walltime" --profile profiling --no-default-features -p ruff_benchmark
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-walltime-run:
-    name: "benchmarks walltime (${{ matrix.benchmark }})"
+  benchmarks-walltime:
+    name: "benchmarks walltime (${{ matrix.benchmarks }})"
    runs-on: codspeed-macro
-    needs: benchmarks-walltime-build
+    needs: determine_changes
+    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    permissions:
      contents: read # required for actions/checkout
      id-token: write # required for OIDC authentication with CodSpeed
    strategy:
      matrix:
-        benchmark:
-          - colour_science
-          - "pandas|tanjun|altair"
-          - "static_frame|sympy"
-          - "pydantic|multithreaded|freqtrade"
+        benchmarks:
+          - "medium|multithreaded"
+          - "small|large"
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+
+      - name: "Install Rust toolchain"
+        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
        with:
          tool: cargo-codspeed

-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime
+      - name: "Build benchmarks"
+        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
+        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
        env:
          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
          # appear to provide much useful insight for our walltime benchmarks right now
@@ -1158,4 +1047,4 @@ jobs:
          CODSPEED_PERF_ENABLED: false
        with:
          mode: walltime
-          run: cargo codspeed run --bench ty_walltime -m walltime "${{ matrix.benchmark }}"
+          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -31,10 +31,10 @@ jobs:
    # Don't run the cron job on forks:
    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -62,7 +62,7 @@ jobs:
    name: Create an issue if the daily fuzz surfaced any bugs
    runs-on: ubuntu-latest
    needs: fuzz
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result != 'success' }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result == 'failure' }}
    permissions:
      issues: write
    steps:
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -6,11 +6,6 @@ on:
  pull_request:
    paths:
      - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
      - "crates/ruff_db"
      - "crates/ruff_python_ast"
      - "crates/ruff_python_parser"
@@ -41,14 +36,14 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
@@ -70,7 +65,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload diff
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: mypy_primer_diff
          path: mypy_primer.diff
@@ -80,14 +75,14 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
@@ -108,7 +103,7 @@ jobs:
          scripts/mypy_primer.sh

      - name: Upload diff
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: mypy_primer_memory_diff
          path: mypy_primer_memory.diff
@@ -122,14 +117,14 @@ jobs:
    # TODO: Enable once we fixed the non-deterministic diagnostics
    if: false
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -17,14 +17,11 @@ on:
        required: true
        type: string

-permissions:
-  contents: read
-
 jobs:
  mkdocs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: true
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -26,14 +26,14 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,8 +22,8 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
-      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          pattern: wheels-*
          path: wheels
--- a/.github/workflows/publish-ty-playground.yml
+++ b/.github/workflows/publish-ty-playground.yml
@@ -30,14 +30,14 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
--- a/.github/workflows/publish-wasm.yml
+++ b/.github/workflows/publish-wasm.yml
@@ -29,7 +29,7 @@ jobs:
        target: [web, bundler, nodejs]
      fail-fast: false
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -45,9 +45,9 @@ jobs:
          jq '.name="@astral-sh/ruff-wasm-${{ matrix.target }}"' crates/ruff_wasm/pkg/package.json > /tmp/package.json
          mv /tmp/package.json crates/ruff_wasm/pkg
      - run: cp LICENSE crates/ruff_wasm/pkg # wasm-pack does not put the LICENSE file in the pkg
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
        with:
-          node-version: 24
+          node-version: 22
          registry-url: "https://registry.npmjs.org"
      - name: "Publish (dry-run)"
        if: ${{ inputs.plan == '' || fromJson(inputs.plan).announcement_tag_is_implicit }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,7 +70,7 @@ jobs:
        shell: bash
        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh"
      - name: Cache dist
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/dist
@@ -86,7 +86,7 @@ jobs:
          cat plan-dist-manifest.json
          echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
      - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
        with:
          name: artifacts-plan-dist-manifest
          path: plan-dist-manifest.json
@@ -128,14 +128,14 @@ jobs:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
        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@37930b1c2abaa49bbe596cd826c3c89aef350131
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -153,7 +153,7 @@ jobs:

          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
      - name: "Upload artifacts"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
        with:
          name: artifacts-build-global
          path: |
@@ -179,14 +179,14 @@ jobs:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
        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@37930b1c2abaa49bbe596cd826c3c89aef350131
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -200,7 +200,7 @@ jobs:
          cat dist-manifest.json
          echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
      - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
        with:
          # Overwrite the previous copy
          name: artifacts-dist-manifest
@@ -256,7 +256,7 @@ jobs:
          submodules: recursive
      # Create a GitHub Release while uploading all files to it
      - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
        with:
          pattern: artifacts-*
          path: artifacts
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -16,7 +16,8 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Formats the code again
+#    c. Attempts to update any snapshots that might have changed
+#       (this sub-step is allowed to fail)
 #    d. Commits the changes and pushes them to the same upstream branch
 #    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
@@ -61,12 +62,12 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: Checkout Ruff
        with:
          path: ruff
          persist-credentials: true
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: Checkout typeshed
        with:
          repository: python/typeshed
@@ -76,7 +77,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -125,12 +126,12 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -164,12 +165,12 @@ jobs:
      contents: write
      pull-requests: write
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -197,6 +198,42 @@ jobs:
        run: |
          rm "${VENDORED_TYPESHED}/pyproject.toml"
          git commit -am "Remove pyproject.toml file"
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - name: "Install Rust toolchain"
+        if: ${{ success() }}
+        run: rustup show
+      - name: "Install mold"
+        if: ${{ success() }}
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Install cargo nextest"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-nextest
+      - name: "Install cargo insta"
+        if: ${{ success() }}
+        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        with:
+          tool: cargo-insta
+      - name: Update snapshots
+        if: ${{ success() }}
+        run: |
+          cargo r \
+          --profile=profiling \
+          -p ty_completion_eval \
+          -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
+
+          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
+          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
+          #
+          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
+          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
+          # We don't care about other tests failing here, we just want snapshots updated where possible,
+          # so we use `|| true` here to ignore the exit code.
+          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
+      - name: Commit snapshot changes
+        if: ${{ success() }}
+        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
      - name: Push changes upstream and create a PR
        if: ${{ success() }}
        run: |
@@ -208,7 +245,7 @@ jobs:
    name: Create an issue if the typeshed sync failed
    runs-on: ubuntu-latest
    needs: [sync, docstrings-windows, docstrings-macos-and-pr]
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result != 'success' || needs.docstrings-windows.result != 'success' || needs.docstrings-macos-and-pr.result != 'success') }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result == 'failure' || needs.docstrings-windows.result == 'failure' || needs.docstrings-macos-and-pr.result == 'failure') }}
    permissions:
      issues: write
    steps:
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -4,13 +4,7 @@ permissions: {}

 on:
  pull_request:
-    # The default for `pull_request` is to trigger on `synchronize`, `opened` and `reopened`.
-    # We also add `labeled` here so that the workflow triggers when a label is initially added.
-    types:
-      - labeled
-      - synchronize
-      - opened
-      - reopened
+    types: [labeled]

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -23,22 +17,23 @@ env:
  RUSTUP_MAX_RETRIES: 10
  RUST_BACKTRACE: 1
  REF_NAME: ${{ github.ref_name }}
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}

 jobs:
  ty-ecosystem-analyzer:
    name: Compute diagnostic diff
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
-    if: contains( github.event.pull_request.labels.*.name, 'ecosystem-analyzer')
+    if: contains(github.event.label.name, 'ecosystem-analyzer')
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact

@@ -117,30 +112,39 @@ jobs:

          cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"

-      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload full report"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
        with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch ${{ github.head_ref }} --commit-hash ${GITHUB_SHA}
+
+      - name: "Append deployment URL"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        env:
+          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
+        run: |
+          echo >> comment.md
+          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md

      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload comment
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: comment.md
          path: comment.md

      - name: Upload diagnostics diff
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: diff.html
          path: dist/diff.html

      - name: Upload timing diff
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: timing.html
          path: dist/timing.html
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -1,7 +1,3 @@
-# This workflow is a cron job that generates a report describing
-# all diagnostics ty emits across the whole ecosystem. The report
-# is uploaded to https://ty-ecosystem-ext.pages.dev/ on a weekly basis.
-
 name: ty ecosystem-report

 permissions: {}
@@ -18,6 +14,7 @@ env:
  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10
  RUST_BACKTRACE: 1
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}

 jobs:
  ty-ecosystem-report:
@@ -25,21 +22,21 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
-          enable-cache: true
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          workspaces: "ruff"
-          lookup-only: false
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact

      - name: Install Rust toolchain
        run: rustup show
@@ -73,10 +70,11 @@ jobs:
            ecosystem-diagnostics.json \
            --output dist/index.html

-      # NOTE: astral-sh-bot uses this artifact to publish the ecosystem report.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload ecosystem report"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
        with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -6,11 +6,6 @@ on:
  pull_request:
    paths:
      - "crates/ty*/**"
-      - "!crates/ty_ide/**"
-      - "!crates/ty_server/**"
-      - "!crates/ty_test/**"
-      - "!crates/ty_completion_eval/**"
-      - "!crates/ty_wasm/**"
      - "crates/ruff_db"
      - "crates/ruff_python_ast"
      - "crates/ruff_python_parser"
@@ -37,13 +32,13 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          repository: python/typing
          ref: ${{ env.CONFORMANCE_SUITE_COMMIT }}
@@ -59,6 +54,9 @@ jobs:

      - name: Compute diagnostic diff
        shell: bash
+        env:
+          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
+          TY_MAX_PARALLELISM: 1
        run: |
          RUFF_DIR="$GITHUB_WORKSPACE/ruff"

@@ -101,7 +99,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload diff
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: typing_conformance_diagnostics_diff
          path: typing_conformance_diagnostics.diff
@@ -109,7 +107,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload conformance suite commit
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: conformance-suite-commit
          path: conformance-suite-commit
--- a/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -0,0 +1,23 @@
+# Configuration for the zizmor static analysis tool, run via pre-commit in CI
+# https://docs.zizmor.sh/configuration/
+#
+# TODO: can we remove the ignores here so that our workflows are more secure?
+rules:
+  cache-poisoning:
+    ignore:
+      - build-docker.yml
+  excessive-permissions:
+    # it's hard to test what the impact of removing these ignores would be
+    # without actually running the release workflow...
+    ignore:
+      - build-docker.yml
+      - publish-docs.yml
+  secrets-inherit:
+    # `cargo dist` makes extensive use of `secrets: inherit`,
+    # and we can't easily fix that until an upstream release changes that.
+    disable: true
+  template-injection:
+    ignore:
+      # like with `secrets-inherit`, `cargo dist` introduces some
+      # template injections. We've manually audited these usages for safety.
+      - release.yml
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ exclude: |

 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: v5.0.0
    hooks:
      - id: check-merge-conflict

@@ -32,13 +32,13 @@ repos:
      - id: validate-pyproject

  - repo: https://github.com/executablebooks/mdformat
-    rev: 1.0.0
+    rev: 0.7.22
    hooks:
      - id: mdformat
        language: python # means renovate will also update `additional_dependencies`
        additional_dependencies:
-          - mdformat-mkdocs==5.0.0
-          - mdformat-footnote==0.1.2
+          - mdformat-mkdocs==4.0.0
+          - mdformat-footnote==0.1.1
        exclude: |
          (?x)^(
            docs/formatter/black\.md
@@ -46,7 +46,7 @@ repos:
          )$

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.47.0
+    rev: v0.45.0
    hooks:
      - id: markdownlint-fix
        exclude: |
@@ -56,7 +56,7 @@ repos:
          )$

  - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.20.0
+    rev: 1.19.1
    hooks:
      - id: blacken-docs
        language: python # means renovate will also update `additional_dependencies`
@@ -67,10 +67,10 @@ repos:
            .*?invalid(_.+)*_syntax\.md
          )$
        additional_dependencies:
-          - black==25.12.0
+          - black==25.1.0

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

@@ -84,7 +84,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.10
+    rev: v0.12.7
    hooks:
      - id: ruff-format
      - id: ruff-check
@@ -94,7 +94,7 @@ repos:

  # Prettier
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.7.4
+    rev: v3.6.2
    hooks:
      - id: prettier
        types: [yaml]
@@ -102,19 +102,19 @@ repos:
  # zizmor detects security vulnerabilities in GitHub Actions workflows.
  # Additional configuration for the tool is found in `.github/zizmor.yml`
  - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.19.0
+    rev: v1.16.0
    hooks:
      - id: zizmor

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

  # `actionlint` hook, for verifying correct syntax in GitHub Actions workflows.
  # Some additional configuration for `actionlint` can be found in `.github/actionlint.yaml`.
  - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.9
+    rev: v1.7.7
    hooks:
      - id: actionlint
        stages:
@@ -129,9 +129,12 @@ repos:
          # actionlint has a shellcheck integration which extracts shell scripts in `run:` steps from GitHub Actions
          # and checks these with shellcheck. This is arguably its most useful feature,
          # but the integration only works if shellcheck is installed
-          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.11.1"
+          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.10.0"

  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.11.0.1
+    rev: v0.10.0.1
    hooks:
      - id: shellcheck
+
+ci:
+  skip: [cargo-fmt, dev-generate-all]
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,70 +0,0 @@
-# Ruff Repository
-
-This repository contains both Ruff (a Python linter and formatter) and ty (a Python type checker). The crates follow a naming convention: `ruff_*` for Ruff-specific code and `ty_*` for ty-specific code. ty reuses several Ruff crates, including the Python parser (`ruff_python_parser`) and AST definitions (`ruff_python_ast`).
-
-## Running Tests
-
-Run all tests (using `nextest` for faster execution):
-
-```sh
-cargo nextest run
-```
-
-For faster test execution, use the `fast-test` profile which enables optimizations while retaining debug info:
-
-```sh
-cargo nextest run --cargo-profile fast-test
-```
-
-Run tests for a specific crate:
-
-```sh
-cargo nextest run -p ty_python_semantic
-```
-
-Run a specific mdtest (use a substring of the test name):
-
-```sh
-MDTEST_TEST_FILTER="<filter>" cargo nextest run -p ty_python_semantic mdtest
-```
-
-Update snapshots after running tests:
-
-```sh
-cargo insta accept
-```
-
-## Running Clippy
-
-```sh
-cargo clippy --workspace --all-targets --all-features -- -D warnings
-```
-
-## Running Debug Builds
-
-Use debug builds (not `--release`) when developing, as release builds lack debug assertions and have slower compile times.
-
-Run Ruff:
-
-```sh
-cargo run --bin ruff -- check path/to/file.py
-```
-
-Run ty:
-
-```sh
-cargo run --bin ty -- check path/to/file.py
-```
-
-## Pull Requests
-
-When working on ty, PR titles should start with `[ty]` and be tagged with the `ty` GitHub label.
-
-## Development Guidelines
-
- All changes must be tested. If you're not testing your changes, you're not done.
- Get your tests to pass. If you didn't run the tests, your code does not work.
- Follow existing code style. Check neighboring files for patterns.
- Always run `uvx pre-commit run -a` at the end of a task.
- Avoid writing significant amounts of new code. This is often a sign that we're missing an existing method or mechanism that could help solve the problem. Look for existing utilities first.
- Avoid falling back to patterns that require `panic!`, `unreachable!`, or `.unwrap()`. Instead, try to encode those constraints in the type system.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,15 +17,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "alloca"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -146,12 +137,9 @@ dependencies = [

 [[package]]
 name = "arc-swap"
-version = "1.8.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
-dependencies = [
- "rustversion",
-]
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"

 [[package]]
 name = "argfile"
@@ -220,6 +208,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "bincode"
 version = "2.0.1"
@@ -286,9 +280,6 @@ name = "bitflags"
 version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
-dependencies = [
- "serde_core",
-]

 [[package]]
 name = "bitvec"
@@ -360,9 +351,9 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 dependencies = [
 "serde_core",
 ]
@@ -666,7 +657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -675,7 +666,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -776,20 +767,18 @@ dependencies = [

 [[package]]
 name = "criterion"
-version = "0.8.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d883447757bb0ee46f233e9dc22eb84d93a9508c9b868687b274fc431d886bf"
+checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928"
 dependencies = [
- "alloca",
 "anes",
 "cast",
 "ciborium",
 "clap",
- "criterion-plot 0.8.1",
+ "criterion-plot 0.6.0",
 "itertools 0.13.0",
 "num-traits",
 "oorandom",
- "page_size",
 "regex",
 "serde",
 "serde_json",
@@ -809,9 +798,9 @@ dependencies = [

 [[package]]
 name = "criterion-plot"
-version = "0.8.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed943f81ea2faa8dcecbbfa50164acf95d555afec96a27871663b300e387b2e4"
+checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338"
 dependencies = [
 "cast",
 "itertools 0.13.0",
@@ -1033,7 +1022,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
 ]

 [[package]]
@@ -1125,7 +1114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]

 [[package]]
@@ -1648,9 +1637,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.45.1"
+version = "1.43.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983e3b24350c84ab8a65151f537d67afbbf7153bb9f1110e03e9fa9b07f67a5c"
+checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0"
 dependencies = [
 "console 0.15.11",
 "once_cell",
@@ -1660,7 +1649,6 @@ dependencies = [
 "ron",
 "serde",
 "similar",
- "tempfile",
 ]

 [[package]]
@@ -1727,7 +1715,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi",
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1781,9 +1769,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

 [[package]]
 name = "jiff"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"
+checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
 dependencies = [
 "jiff-static",
 "jiff-tzdb-platform",
@@ -1791,14 +1779,14 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde_core",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]

 [[package]]
 name = "jiff-static"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"
+checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1874,9 +1862,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"

 [[package]]
 name = "libcst"
@@ -1982,9 +1970,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"

 [[package]]
 name = "lsp-server"
@@ -2060,9 +2048,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"

 [[package]]
 name = "matchit"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b"
+checksum = "9ea5f97102eb9e54ab99fb70bb175589073f554bdadfb74d9bd656482ea73e2a"

 [[package]]
 name = "memchr"
@@ -2301,16 +2289,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "page_size"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -2634,9 +2612,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.104"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
 "unicode-ident",
 ]
@@ -2898,16 +2876,13 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"

 [[package]]
 name = "ron"
-version = "0.12.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
+checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
 dependencies = [
- "bitflags 2.10.0",
- "once_cell",
+ "base64",
+ "bitflags 1.3.2",
 "serde",
- "serde_derive",
- "typeid",
- "unicode-ident",
 ]

 [[package]]
@@ -3154,7 +3129,6 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
- "ty_module_resolver",
 "ty_python_semantic",
 "zip",
 ]
@@ -3249,6 +3223,7 @@ name = "ruff_memory_usage"
 version = "0.0.0"
 dependencies = [
 "get-size2",
+ "ordermap",
 ]

 [[package]]
@@ -3619,15 +3594,15 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"

 [[package]]
 name = "rustix"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
 "bitflags 2.10.0",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]

 [[package]]
@@ -3644,8 +3619,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

 [[package]]
 name = "salsa"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=309c249088fdeef0129606fa34ec2eefc74736ff#309c249088fdeef0129606fa34ec2eefc74736ff"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3669,13 +3644,13 @@ dependencies = [

 [[package]]
 name = "salsa-macro-rules"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=309c249088fdeef0129606fa34ec2eefc74736ff#309c249088fdeef0129606fa34ec2eefc74736ff"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"

 [[package]]
 name = "salsa-macros"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=309c249088fdeef0129606fa34ec2eefc74736ff#309c249088fdeef0129606fa34ec2eefc74736ff"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3694,9 +3669,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.2.0"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
+checksum = "1317c3bf3e7df961da95b0a56a172a02abead31276215a0497241a7624b487ce"
 dependencies = [
 "dyn-clone",
 "ref-cast",
@@ -3707,9 +3682,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "1.2.0"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45"
+checksum = "5f760a6150d45dd66ec044983c124595ae76912e77ed0b44124cb3e415cce5d9"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3783,15 +3758,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.148"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
 "itoa",
 "memchr",
+ "ryu",
 "serde",
 "serde_core",
- "zmij",
 ]

 [[package]]
@@ -3807,9 +3782,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
 dependencies = [
 "serde_core",
 ]
@@ -3825,9 +3800,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "3.16.1"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
+checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
 dependencies = [
 "serde_core",
 "serde_with_macros",
@@ -3835,9 +3810,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "3.16.1"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
+checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -3987,9 +3962,9 @@ dependencies = [

 [[package]]
 name = "supports-hyperlinks"
-version = "3.2.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e396b6523b11ccb83120b115a0b7366de372751aa6edf19844dfb13a6af97e91"
+checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"

 [[package]]
 name = "syn"
@@ -4021,15 +3996,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

 [[package]]
 name = "tempfile"
-version = "3.24.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
 "fastrand",
 "getrandom 0.3.4",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]

 [[package]]
@@ -4223,9 +4198,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "toml"
-version = "0.9.10+spec-1.1.0"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
+checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
 "indexmap",
 "serde_core",
@@ -4238,9 +4213,9 @@ dependencies = [

 [[package]]
 name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
 dependencies = [
 "serde_core",
 ]
@@ -4259,24 +4234,24 @@ dependencies = [

 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
 "winnow",
 ]

 [[package]]
 name = "toml_writer"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"

 [[package]]
 name = "tracing"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
 "log",
 "pin-project-lite",
@@ -4297,9 +4272,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.36"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
 "once_cell",
 "valuable",
@@ -4318,9 +4293,9 @@ dependencies = [

 [[package]]
 name = "tracing-indicatif"
-version = "0.3.14"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ef6990e0438749f0080573248e96631171a0b5ddfddde119aa5ba8c3a9c47e"
+checksum = "04d4e11e0e27acef25a47f27e9435355fecdc488867fa2bc90e75b0700d2823d"
 dependencies = [
 "indicatif",
 "tracing",
@@ -4400,7 +4375,6 @@ dependencies = [
 "tracing-flame",
 "tracing-subscriber",
 "ty_combine",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 "ty_server",
@@ -4415,6 +4389,7 @@ dependencies = [
 "ordermap",
 "ruff_db",
 "ruff_python_ast",
+ "ty_python_semantic",
 ]

 [[package]]
@@ -4432,8 +4407,8 @@ dependencies = [
 "tempfile",
 "toml",
 "ty_ide",
- "ty_module_resolver",
 "ty_project",
+ "ty_python_semantic",
 "walkdir",
 ]

@@ -4463,35 +4438,11 @@ dependencies = [
 "salsa",
 "smallvec",
 "tracing",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 "ty_vendored",
 ]

-[[package]]
-name = "ty_module_resolver"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "camino",
- "compact_str",
- "get-size2",
- "insta",
- "ruff_db",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_stdlib",
- "rustc-hash",
- "salsa",
- "strum",
- "strum_macros",
- "tempfile",
- "thiserror 2.0.17",
- "tracing",
- "ty_vendored",
-]
-
 [[package]]
 name = "ty_project"
 version = "0.0.0"
@@ -4526,7 +4477,6 @@ dependencies = [
 "toml",
 "tracing",
 "ty_combine",
- "ty_module_resolver",
 "ty_python_semantic",
 "ty_static",
 "ty_vendored",
@@ -4579,11 +4529,11 @@ dependencies = [
 "strsim",
 "strum",
 "strum_macros",
+ "tempfile",
 "test-case",
 "thiserror 2.0.17",
 "tracing",
- "ty_combine",
- "ty_module_resolver",
+ "ty_python_semantic",
 "ty_static",
 "ty_test",
 "ty_vendored",
@@ -4622,7 +4572,6 @@ dependencies = [
 "tracing-subscriber",
 "ty_combine",
 "ty_ide",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 ]
@@ -4663,7 +4612,6 @@ dependencies = [
 "thiserror 2.0.17",
 "toml",
 "tracing",
- "ty_module_resolver",
 "ty_python_semantic",
 "ty_static",
 "ty_vendored",
@@ -4711,12 +4659,6 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"

-[[package]]
-name = "typeid"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
-
 [[package]]
 name = "typenum"
 version = "1.18.0"
@@ -4876,9 +4818,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.19.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
 "getrandom 0.3.4",
 "js-sys",
@@ -4889,9 +4831,9 @@ dependencies = [

 [[package]]
 name = "uuid-macro-internal"
-version = "1.19.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39d11901c36b3650df7acb0f9ebe624f35b5ac4e1922ecd3c57f444648429594"
+checksum = "d9384a660318abfbd7f8932c34d67e4d1ec511095f95972ddc01e19d7ba8413f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5111,37 +5053,15 @@ dependencies = [
 "glob",
 ]

-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]

-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.62.0"
@@ -5525,12 +5445,6 @@ dependencies = [
 "zstd",
 ]

-[[package]]
-name = "zmij"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868"
-
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,6 @@ ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
 ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
-ty_module_resolver = { path = "crates/ty_module_resolver" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
 ty_server = { path = "crates/ty_server" }
@@ -58,8 +57,8 @@ anstream = { version = "0.6.18" }
 anstyle = { version = "1.0.10" }
 anyhow = { version = "1.0.80" }
 arc-swap = { version = "1.7.1" }
-argfile = { version = "0.2.0" }
 assert_fs = { version = "1.1.0" }
+argfile = { version = "0.2.0" }
 bincode = { version = "2.0.0" }
 bitflags = { version = "2.5.0" }
 bitvec = { version = "1.0.1", default-features = false, features = [
@@ -71,31 +70,30 @@ camino = { version = "1.1.7" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
+csv = { version = "1.3.1" }
+divan = { package = "codspeed-divan-compat", version = "4.0.4" }
 codspeed-criterion-compat = { version = "4.0.4", default-features = false }
 colored = { version = "3.0.0" }
-compact_str = "0.9.0"
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
-criterion = { version = "0.8.0", default-features = false }
+compact_str = "0.9.0"
+criterion = { version = "0.7.0", default-features = false }
 crossbeam = { version = "0.8.4" }
-csv = { version = "1.3.1" }
 dashmap = { version = "6.0.1" }
 datatest-stable = { version = "0.3.3" }
-divan = { package = "codspeed-divan-compat", version = "4.0.4" }
-drop_bomb = { version = "0.1.5" }
 dunce = { version = "1.0.5" }
+drop_bomb = { version = "0.1.5" }
 etcetera = { version = "0.11.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
+getrandom = { version = "0.3.1" }
 get-size2 = { version = "0.7.3", features = [
    "derive",
    "smallvec",
    "hashbrown",
    "compact-str",
-    "ordermap"
 ] }
-getrandom = { version = "0.3.1" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
@@ -117,8 +115,8 @@ is-macro = { version = "0.3.5" }
 is-wsl = { version = "0.4.0" }
 itertools = { version = "0.14.0" }
 jiff = { version = "0.2.0" }
-jod-thread = { version = "1.0.0" }
 js-sys = { version = "0.3.69" }
+jod-thread = { version = "1.0.0" }
 libc = { version = "0.2.153" }
 libcst = { version = "1.8.4", default-features = false }
 log = { version = "0.4.17" }
@@ -140,8 +138,6 @@ pretty_assertions = "1.3.0"
 proc-macro2 = { version = "1.0.79" }
 pyproject-toml = { version = "0.13.4" }
 quick-junit = { version = "0.5.0" }
-quickcheck = { version = "1.0.3", default-features = false }
-quickcheck_macros = { version = "1.0.0" }
 quote = { version = "1.0.23" }
 rand = { version = "0.9.0" }
 rayon = { version = "1.10.0" }
@@ -150,7 +146,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 = "309c249088fdeef0129606fa34ec2eefc74736ff", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
@@ -198,9 +194,9 @@ tryfn = { version = "0.2.1" }
 typed-arena = { version = "2.0.2" }
 unic-ucd-category = { version = "0.9" }
 unicode-ident = { version = "1.0.12" }
-unicode-normalization = { version = "0.1.23" }
 unicode-width = { version = "0.2.0" }
 unicode_names2 = { version = "1.2.2" }
+unicode-normalization = { version = "0.1.23" }
 url = { version = "2.5.0" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
 walkdir = { version = "2.3.2" }
@@ -210,13 +206,8 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }

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

 [workspace.lints.rust]
 unsafe_code = "warn"
@@ -276,10 +267,17 @@ if_not_else = "allow"
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"

+
 [profile.release]
 lto = "fat"
 codegen-units = 16

+# Profile to build a minimally sized binary for ruff/ty
+[profile.minimal-size]
+inherits = "release"
+opt-level = "z"
+codegen-units = 1
+
 # Some crates don't change as much but benefit more from
 # more expensive optimization passes, so we selectively
 # decrease codegen-units in some cases.
@@ -290,12 +288,6 @@ codegen-units = 1
 [profile.release.package.salsa]
 codegen-units = 1

-# Profile to build a minimally sized binary for ruff/ty
-[profile.minimal-size]
-inherits = "release"
-opt-level = "z"
-codegen-units = 1
-
 [profile.dev.package.insta]
 opt-level = 3

@@ -335,11 +327,6 @@ strip = false
 debug = "full"
 lto = false

-# Profile for faster iteration: applies minimal optimizations for faster tests.
-[profile.fast-test]
-inherits = "dev"
-opt-level = 1
-
 # The profile that 'cargo dist' will build with.
 [profile.dist]
 inherits = "release"
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -12,13 +12,6 @@ license = { workspace = true }
 readme = "../../README.md"
 default-run = "ruff"

-[package.metadata.cargo-shear]
-# Used via macro expansion.
-ignored = ["jiff"]
-
-[package.metadata.dist]
-dist = true
-
 [dependencies]
 ruff_cache = { workspace = true }
 ruff_db = { workspace = true, default-features = false, features = ["os"] }
@@ -68,12 +61,6 @@ tracing = { workspace = true, features = ["log"] }
 walkdir = { workspace = true }
 wild = { 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]
-tikv-jemallocator = { workspace = true }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true }
-
 [dev-dependencies]
 # Enable test rules during development
 ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
@@ -89,5 +76,18 @@ ruff_python_trivia = { workspace = true }
 tempfile = { workspace = true }
 test-case = { workspace = true }

+[package.metadata.cargo-shear]
+# Used via macro expansion.
+ignored = ["jiff"]
+
+[package.metadata.dist]
+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]
+tikv-jemallocator = { workspace = true }
+
 [lints]
 workspace = true
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -1305,7 +1305,7 @@ mod tests {
        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
        let _s = settings.bind_to_scope();

-        assert_snapshot!(str::from_utf8(&buf)?, @"
+        assert_snapshot!(str::from_utf8(&buf)?, @r"
        io: test.py: Permission denied
        --> test.py:1:1

--- a/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
+++ b/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
@@ -4,3 +4,4 @@ source: crates/ruff/src/commands/check.rs
 /home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
+
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
+snapshot_kind: text
 ---
 0.0.0
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
+snapshot_kind: text
 ---
 0.0.0 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
+snapshot_kind: text
 ---
 0.0.0+24 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
+snapshot_kind: text
 ---
 {
  "version": "0.0.0",
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -132,29 +132,29 @@ fn dependents() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r#"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        {
-          "ruff/__init__.py": [],
-          "ruff/a.py": [],
-          "ruff/b.py": [
-            "ruff/a.py"
-          ],
-          "ruff/c.py": [
-            "ruff/b.py"
-          ],
-          "ruff/d.py": [
-            "ruff/c.py"
-          ],
-          "ruff/e.py": [
-            "ruff/d.py"
-          ]
-        }
+        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r###"
+            success: true
+            exit_code: 0
+            ----- stdout -----
+            {
+              "ruff/__init__.py": [],
+              "ruff/a.py": [],
+              "ruff/b.py": [
+                "ruff/a.py"
+              ],
+              "ruff/c.py": [
+                "ruff/b.py"
+              ],
+              "ruff/d.py": [
+                "ruff/c.py"
+              ],
+              "ruff/e.py": [
+                "ruff/d.py"
+              ]
+            }

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

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

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

    insta::with_settings!({
@@ -319,7 +319,7 @@ fn globs() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -340,7 +340,7 @@ fn globs() -> Result<()> {
        }

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

    Ok(())
@@ -368,7 +368,7 @@ fn exclude() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -381,7 +381,7 @@ fn exclude() -> Result<()> {
        }

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

    Ok(())
@@ -421,7 +421,7 @@ fn wildcard() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -443,7 +443,7 @@ fn wildcard() -> Result<()> {
        }

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

    Ok(())
@@ -639,7 +639,7 @@ fn venv() -> Result<()> {
    }, {
        assert_cmd_snapshot!(
            command().args(["--python", "none"]).arg("packages/albatross").current_dir(&root),
-            @"
+            @r"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -695,7 +695,7 @@ fn notebook_basic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -708,7 +708,7 @@ fn notebook_basic() -> Result<()> {
        }

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

    Ok(())
@@ -765,7 +765,7 @@ fn notebook_with_magic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        assert_cmd_snapshot!(command().current_dir(&root), @r###"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -778,7 +778,7 @@ fn notebook_with_magic() -> Result<()> {
        }

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

    Ok(())
--- a/crates/ruff/tests/cli/analyze_graph.rs
+++ b/crates/ruff/tests/cli/analyze_graph.rs
@@ -29,7 +29,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
        ("ruff/c.py", ""),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r#"
+    assert_cmd_snapshot!(test.command(), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -46,12 +46,12 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

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

    assert_cmd_snapshot!(
        test.command()
            .arg("--no-type-checking-imports"),
-        @r#"
+        @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -65,7 +65,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

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

    Ok(())
@@ -103,7 +103,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        ),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r#"
+    assert_cmd_snapshot!(test.command(), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -117,7 +117,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

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

    test.write_file(
        "ruff.toml",
@@ -127,7 +127,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        "#,
    )?;

-    assert_cmd_snapshot!(test.command(), @r#"
+    assert_cmd_snapshot!(test.command(), @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -144,7 +144,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

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

    Ok(())
--- a/crates/ruff/tests/cli/format.rs
+++ b/crates/ruff/tests/cli/format.rs
@@ -51,7 +51,7 @@ fn default_files() -> Result<()> {

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("--check"), @"
+        .arg("--check"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -71,7 +71,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--stdin-filename", "foo.py"])
        .arg("foo.py")
-        .pass_stdin("foo =     1"), @"
+        .pass_stdin("foo =     1"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -87,7 +87,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
 fn nonexistent_config_file() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo.toml", "."]), @"
+        .args(["--config", "foo.toml", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -111,7 +111,7 @@ fn nonexistent_config_file() -> Result<()> {
 fn config_override_rejected_if_invalid_toml() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo = bar", "."]), @"
+        .args(["--config", "foo = bar", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -145,7 +145,7 @@ fn too_many_config_files() -> Result<()> {
        .arg("ruff.toml")
        .arg("--config")
        .arg("ruff2.toml")
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -168,7 +168,7 @@ fn config_file_and_isolated() -> Result<()> {
        .arg("--isolated")
        .arg("--config")
        .arg("ruff.toml")
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -390,7 +390,7 @@ fn mixed_line_endings() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .arg("--diff")
        .arg("--isolated")
-        .arg("."), @"
+        .arg("."), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -446,7 +446,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should be formatted regardless of it being excluded by format.exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -469,7 +469,7 @@ fn deduplicate_directory_and_explicit_file() -> Result<()> {
            .arg("--check")
            .arg(".")
            .arg("main.py"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -495,7 +495,7 @@ from module import =
    assert_cmd_snapshot!(test.format_command()
        .arg("--check")
        .arg("--isolated")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -522,7 +522,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--check")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -534,7 +534,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -545,7 +545,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -614,7 +614,7 @@ fn output_format_notebook() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--preview", "--check"]).arg(path),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -672,7 +672,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -685,7 +685,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -701,7 +701,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -714,7 +714,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @"
+        .arg("main.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -771,7 +771,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should not be formatted because of --force-exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -931,7 +931,7 @@ tab-size = 2
            .pass_stdin(r"
 if True:
    pass
-    "), @"
+    "), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1144,7 +1144,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @"
+        .arg("test.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1184,7 +1184,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @"
+        .arg("test.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1216,7 +1216,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @"
+        .arg("test.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1246,7 +1246,7 @@ fn test_diff() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1311,7 +1311,7 @@ fn test_diff_no_change() -> Result<()> {
    let paths = [fixtures.join("unformatted.py")];
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1341,7 +1341,7 @@ fn test_diff_stdin_unformatted() -> Result<()> {
        test.format_command()
            .args(["--isolated", "--diff", "-", "--stdin-filename", "unformatted.py"])
            .pass_stdin(unformatted),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1366,7 +1366,7 @@ fn test_diff_stdin_formatted() -> Result<()> {
    let unformatted = fs::read(fixtures.join("formatted.py")).unwrap();
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff", "-"]).pass_stdin(unformatted),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1873,7 +1873,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1938,7 +1938,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @"
+        .arg("."), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2021,7 +2021,7 @@ def file2(arg1, arg2,):
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--range=1:8-1:15"])
        .arg("file1.py")
-        .arg("file2.py"),  @"
+        .arg("file2.py"),  @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2068,7 +2068,7 @@ fn range_start_larger_than_end() -> Result<()> {
 def foo(arg1, arg2,):
    print("Shouldn't format this" )

-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2168,7 +2168,7 @@ fn range_missing_line() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2192,7 +2192,7 @@ fn zero_line_number() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2217,7 +2217,7 @@ fn column_and_line_zero() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2274,7 +2274,7 @@ fn range_formatting_notebook() -> Result<()> {
 "nbformat": 4,
 "nbformat_minor": 5
 }
-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2355,7 +2355,7 @@ fn cookiecutter_globbing() -> Result<()> {
    ])?;

    assert_cmd_snapshot!(test.format_command()
-            .args(["--isolated", "--diff", "."]), @"
+            .args(["--isolated", "--diff", "."]), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2374,7 +2374,7 @@ fn stable_output_format_warning() -> Result<()> {
        test.format_command()
            .args(["--output-format=full", "-"])
            .pass_stdin(""),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/cli/lint.rs
+++ b/crates/ruff/tests/cli/lint.rs
@@ -39,7 +39,7 @@ inline-quotes = "single"
            .arg("ruff.toml")
            .args(["--stdin-filename", "test.py"])
            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -76,18 +76,18 @@ inline-quotes = "single"
            .arg("--config")
            .arg("ruff.toml")
            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+        success: false
+        exit_code: 1
+        ----- stdout -----
+        -:1:5: Q000 [*] Double quotes found but single quotes preferred
+        -:1:5: B005 Using `.strip()` with multi-character strings is misleading
+        -:1:19: Q000 [*] Double quotes found but single quotes preferred
+        Found 3 errors.
+        [*] 2 fixable with the `--fix` option.

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

    Ok(())
 }
@@ -110,7 +110,7 @@ inline-quotes = "single"
        .arg("--config")
        .arg("ruff.toml")
        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -150,7 +150,7 @@ inline-quotes = "single"
        .arg("--config")
        .arg("ruff.toml")
        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -220,7 +220,7 @@ OTHER = "OTHER"
            // Explicitly pass test.py, should be linted regardless of it being excluded by lint.exclude
            .arg("test.py")
            // Lint all other files in the directory, should respect the `exclude` and `lint.exclude` options
-            .arg("."), @"
+            .arg("."), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -259,16 +259,16 @@ exclude = ["main.py"]
            .arg(".")
            // Explicitly pass main.py, should be linted regardless of it being excluded by lint.exclude
            .arg("main.py"),
-        @"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:1:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+        @r"
+        success: false
+        exit_code: 1
+        ----- stdout -----
+        main.py:1:8: F401 [*] `os` imported but unused
+        Found 1 error.
+        [*] 1 fixable with the `--fix` option.

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

    Ok(())
@@ -299,7 +299,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -340,7 +340,7 @@ max-line-length = 100
 _ = "---------------------------------------------------------------------------亜亜亜亜亜亜"
 # longer than 100
 _ = "---------------------------------------------------------------------------亜亜亜亜亜亜亜亜亜亜亜亜亜亜"
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -381,7 +381,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -422,7 +422,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -461,7 +461,7 @@ ignore = ["D203", "D212"]
    assert_cmd_snapshot!(fixture
        .check_command()
        .current_dir(fixture.root().join("subdirectory"))
-        , @"
+        , @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -478,7 +478,7 @@ ignore = ["D203", "D212"]
 fn nonexistent_config_file() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo.toml", "."]), @"
+        .args(["--config", "foo.toml", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -501,7 +501,7 @@ fn nonexistent_config_file() {
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @"
+        .args(["--config", "foo = bar", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -537,7 +537,7 @@ fn too_many_config_files() -> Result<()> {
        .arg("ruff.toml")
        .arg("--config")
        .arg("ruff2.toml")
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -556,7 +556,7 @@ fn too_many_config_files() -> Result<()> {
 fn extend_passed_via_config_argument() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "extend = 'foo.toml'", "."]), @"
+        .args(["--config", "extend = 'foo.toml'", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -588,17 +588,17 @@ extend = "ruff3.toml"
    )?;

    assert_cmd_snapshot!(fixture
-        .check_command(), @"
-    success: false
-    exit_code: 2
-    ----- stdout -----
+        .check_command(), @r"
+        success: false
+        exit_code: 2
+        ----- stdout -----

-    ----- stderr -----
-    ruff failed
-      Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
-      Cause: Failed to read [TMP]/ruff3.toml
-      Cause: No such file or directory (os error 2)
-    ");
+        ----- stderr -----
+        ruff failed
+          Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
+          Cause: Failed to read [TMP]/ruff3.toml
+          Cause: No such file or directory (os error 2)
+        ");

    Ok(())
 }
@@ -627,7 +627,7 @@ extend = "ruff.toml"

    assert_cmd_snapshot!(fixture
        .check_command(),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -659,7 +659,7 @@ select = [E501]

    assert_cmd_snapshot!(
        fixture.check_command(),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -688,7 +688,7 @@ fn config_file_and_isolated() -> Result<()> {
        .arg("--config")
        .arg("ruff.toml")
        .arg("--isolated")
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -742,7 +742,7 @@ x = "longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssss
        .args(["--config", "lint.extend-select=['E501', 'F841']"])
        .args(["--config", "lint.isort.combine-as-imports = false"])
        .arg("-")
-        .pass_stdin(test_code), @"
+        .pass_stdin(test_code), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -761,7 +761,7 @@ fn valid_toml_but_nonexistent_option_provided_via_config_argument() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
        .args([".", "--config", "extend-select=['F481']"]),  // No such code as F481!
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -788,7 +788,7 @@ fn each_toml_option_requires_a_new_flag_1() {
        // commas can't be used to delimit different config overrides;
        // you need a new --config flag for each override
        .args([".", "--config", "extend-select=['F841'], line-length=90"]),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -819,7 +819,7 @@ fn each_toml_option_requires_a_new_flag_2() {
        // spaces *also* can't be used to delimit different config overrides;
        // you need a new --config flag for each override
        .args([".", "--config", "extend-select=['F841'] line-length=90"]),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -886,7 +886,7 @@ fn value_given_to_table_key_is_not_inline_table_2() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
        .args([".", "--config", r#"lint=123"#]),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -953,7 +953,7 @@ select=["E501"]
        .arg("ruff.toml")
        .args(["--config", "line-length=110"])
        .arg("-")
-        .pass_stdin(test_code), @"
+        .pass_stdin(test_code), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -976,7 +976,7 @@ fn complex_config_setting_overridden_via_cli() -> Result<()> {
        .args(["--config", "lint.per-file-ignores = {'generated.py' = ['N801']}"])
        .args(["--stdin-filename", "generated.py"])
        .arg("-")
-        .pass_stdin(test_code), @"
+        .pass_stdin(test_code), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -993,7 +993,7 @@ fn deprecated_config_option_overridden_via_cli() {
        .args(STDIN_BASE_OPTIONS)
        .args(["--config", "select=['N801']", "-"])
        .pass_stdin("class lowercase: ..."),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1061,7 +1061,7 @@ include = ["*.ipy"]
        .check_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @"
+        .arg("."), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1111,7 +1111,7 @@ external = ["AAA"]
        .pass_stdin(r#"
 # flake8: noqa: AAA101, BBB102
 import os
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1147,7 +1147,7 @@ required-version = "0.1.0"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1184,7 +1184,7 @@ required-version = "{version}"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1222,7 +1222,7 @@ required-version = ">{version}"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @"
+"#), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1252,7 +1252,7 @@ required-version = ">=0.1.0"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1289,7 +1289,7 @@ import os

 def func():
    x = 1
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1323,7 +1323,7 @@ fn negated_per_file_ignores() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @"
+        , @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1355,7 +1355,7 @@ fn negated_per_file_ignores_absolute() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @"
+        , @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1389,7 +1389,7 @@ fn negated_per_file_ignores_overlap() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @"
+        , @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1423,7 +1423,7 @@ import os  # F401
 def function():
    import os  # F811
    print(os.name)
-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1466,7 +1466,7 @@ import sys
        .check_command()
        .args(["--config", "ruff.toml"])
        .arg("noqa.py"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1482,7 +1482,7 @@ import sys
        .args(["--config", "ruff.toml"])
        .arg("noqa.py")
        .args(["--preview"]),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1497,7 +1497,7 @@ import sys
        .args(["--config", "ruff.toml"])
        .arg("noqa.py")
        .args(["--ignore-noqa", "--preview"]),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1539,7 +1539,7 @@ def first_square():
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1551,8 +1551,7 @@ def first_square():
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    def first_square():
        return [x * x for x in range(20)][0]  # noqa: RUF015
    ");
@@ -1588,7 +1587,7 @@ def unused(x):
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1600,8 +1599,7 @@ def unused(x):
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    def unused(x):  # noqa: ANN001, ANN201, D103
        pass
    ");
@@ -1637,7 +1635,7 @@ import a
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1649,8 +1647,7 @@ import a
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    import z  # noqa: I001
    import c
    import a
@@ -1687,7 +1684,7 @@ def unused(x):  # noqa: ANN001, ARG001, D103
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1699,8 +1696,7 @@ def unused(x):  # noqa: ANN001, ARG001, D103
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    def unused(x):  # noqa: ANN001, ANN201, ARG001, D103
        pass
    ");
@@ -1736,7 +1732,7 @@ import os
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1747,8 +1743,7 @@ import os
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    # ruff: noqa F401
    import os
    ");
@@ -1784,7 +1779,7 @@ import os
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1795,8 +1790,7 @@ import os
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @"
-
+    insta::assert_snapshot!(test_code, @r"
    # ruff: disable[F401]
    import os
    ");
@@ -1837,7 +1831,7 @@ print(
        .arg("-")
        .pass_stdin(r#"

-"#), @"
+"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1850,7 +1844,6 @@ print(
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

    insta::assert_snapshot!(test_code, @r#"
-
    print(
        """First line
        second line
@@ -1893,7 +1886,7 @@ def first_square():

    assert_cmd_snapshot!(fixture
        .check_command()
-        .args(["--add-noqa"]), @"
+        .args(["--add-noqa"]), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1922,7 +1915,7 @@ from foo import (  # noqa: F401
        .check_command()
        .arg("--add-noqa")
        .arg("--select=F401")
-        .arg("noqa.py"), @"
+        .arg("noqa.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1949,7 +1942,7 @@ def foo():
        .check_command()
        .arg("--add-noqa=TODO: fix")
        .arg("--select=F401,F841")
-        .arg("test.py"), @"
+        .arg("test.py"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1959,12 +1952,12 @@ def foo():
    ");

    let content = fs::read_to_string(fixture.root().join("test.py"))?;
-    insta::assert_snapshot!(content, @"
-    import os  # noqa: F401 TODO: fix
+    insta::assert_snapshot!(content, @r"
+import os  # noqa: F401 TODO: fix

-    def foo():
-        x = 1  # noqa: F841 TODO: fix
-    ");
+def foo():
+    x = 1  # noqa: F841 TODO: fix
+");

    Ok(())
 }
@@ -1978,7 +1971,7 @@ fn add_noqa_with_newline_in_reason() -> Result<()> {
        .check_command()
        .arg("--add-noqa=line1\nline2")
        .arg("--select=F401")
-        .arg("test.py"), @"
+        .arg("test.py"), @r###"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1986,7 +1979,7 @@ fn add_noqa_with_newline_in_reason() -> Result<()> {
    ----- stderr -----
    ruff failed
      Cause: --add-noqa <reason> cannot contain newline characters
-    ");
+    "###);

    Ok(())
 }
@@ -2010,7 +2003,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2037,7 +2030,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2068,7 +2061,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2101,7 +2094,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2134,7 +2127,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2270,7 +2263,7 @@ requires-python = ">= 3.11"
        .check_command()
        .args(["--select","UP007"])
        .arg(".")
-        , @"
+        , @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2279,7 +2272,7 @@ requires-python = ">= 3.11"
    [*] 1 fixable with the `--fix` option.

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

@@ -2355,7 +2348,7 @@ from typing import Union;foo: Union[int, str] = 1"#,
    assert_cmd_snapshot!(fixture
        .check_command()
        .arg("test.py")
-        , @"
+        , @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2598,7 +2591,7 @@ fn checks_notebooks_in_stable() -> anyhow::Result<()> {
        .check_command()
        .arg("--select")
        .arg("F401")
-        , @"
+        , @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2626,7 +2619,7 @@ fn nested_implicit_namespace_package() -> Result<()> {
        .check_command()
        .arg("--select")
        .arg("INP")
-        , @"
+        , @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2640,7 +2633,7 @@ fn nested_implicit_namespace_package() -> Result<()> {
        .arg("--select")
        .arg("INP")
        .arg("--preview")
-        , @"
+        , @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2771,7 +2764,7 @@ fn flake8_import_convention_nfkc_normalization() -> Result<()> {
        .arg("ruff.toml")
        .arg("-")
        .pass_stdin("")
-        , @"
+        , @r###"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2779,7 +2772,7 @@ fn flake8_import_convention_nfkc_normalization() -> Result<()> {
    ----- stderr -----
    ruff failed
      Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
-    ");
+    "###);
    Ok(())
 }

@@ -2829,7 +2822,7 @@ fn pyupgrade_up026_respects_isort_required_import_fix() {
            .arg("--fix")
            .arg("--no-cache")
            .pass_stdin("1\n"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2856,7 +2849,7 @@ fn pyupgrade_up026_respects_isort_required_import_from_fix() {
            .arg("--fix")
            .arg("--no-cache")
            .pass_stdin("from mock import mock\n"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2890,7 +2883,7 @@ d: Literal[None,] | Literal[None]
        .arg("--preview")
        .arg("--diff")
        .arg("-")
-        .pass_stdin(snippet), @"
+        .pass_stdin(snippet), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2944,7 +2937,7 @@ def func(t: _T) -> _T:
    return x
 "#
        ),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2983,7 +2976,7 @@ class Foo[_T, __T]:
    pass
 "#
        ),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3048,7 +3041,7 @@ fn a005_module_shadowing_strict() -> Result<()> {
        .arg("--config")
        .arg(r#"lint.flake8-builtins.strict-checking = true"#)
        .args(["--select", "A005"]),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3076,7 +3069,7 @@ fn a005_module_shadowing_non_strict() -> Result<()> {
        .arg("--config")
        .arg(r#"lint.flake8-builtins.strict-checking = false"#)
        .args(["--select", "A005"]),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3101,7 +3094,7 @@ fn a005_module_shadowing_strict_default() -> Result<()> {

    assert_cmd_snapshot!(fixture.check_command()
        .args(["--select", "A005"]),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3134,7 +3127,7 @@ T = TypeVar("T")
 class A(Generic[T]):
    var: T
 "#),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3164,7 +3157,7 @@ T = TypeVar("T")
 class A(Generic[T]):
    var: T
 "#),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3184,7 +3177,7 @@ fn walrus_before_py38() {
        .arg("--target-version=py38")
        .arg("-")
        .pass_stdin(r#"(x := 1)"#),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3202,7 +3195,7 @@ fn walrus_before_py38() {
        .arg("--preview")
        .arg("-")
        .pass_stdin(r#"(x := 1)"#),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3229,7 +3222,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3252,7 +3245,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3277,7 +3270,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3303,7 +3296,7 @@ fn cache_syntax_errors() -> Result<()> {

    assert_cmd_snapshot!(
        cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3316,7 +3309,7 @@ fn cache_syntax_errors() -> Result<()> {
    // this should *not* be cached, like normal parse errors
    assert_cmd_snapshot!(
        cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3352,14 +3345,14 @@ fn cookiecutter_globbing() -> Result<()> {

    assert_cmd_snapshot!(fixture
        .check_command()
-        .arg("--select=F811"), @"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
+        .arg("--select=F811"), @r"
+		success: true
+		exit_code: 0
+		----- stdout -----
+		All checks passed!

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

    // after removing the config file with the ignore, F811 applies, so the glob worked above
    fs::remove_file(
@@ -3370,7 +3363,7 @@ fn cookiecutter_globbing() -> Result<()> {

    assert_cmd_snapshot!(fixture
        .check_command()
-        .arg("--select=F811"), @"
+        .arg("--select=F811"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3395,15 +3388,15 @@ fn cookiecutter_globbing_no_project_root() -> Result<()> {
    assert_cmd_snapshot!(fixture
        .check_command()
        .current_dir(fixture.root().join("{{cookiecutter.repo_name}}"))
-        .args(["--extend-per-file-ignores", "generated.py:Q"]), @"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
+        .args(["--extend-per-file-ignores", "generated.py:Q"]), @r"
+	success: true
+	exit_code: 0
+	----- stdout -----
+	All checks passed!

-    ----- stderr -----
-    warning: No Python files found under the given path(s)
-    ");
+	----- stderr -----
+	warning: No Python files found under the given path(s)
+	");

    Ok(())
 }
@@ -3424,7 +3417,7 @@ fn semantic_syntax_errors() -> Result<()> {

    assert_cmd_snapshot!(
        cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3438,7 +3431,7 @@ fn semantic_syntax_errors() -> Result<()> {
    // this should *not* be cached, like normal parse errors
    assert_cmd_snapshot!(
        cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3456,7 +3449,7 @@ fn semantic_syntax_errors() -> Result<()> {
            .arg("--preview")
            .arg("-")
            .pass_stdin(contents),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3490,7 +3483,7 @@ class Foo:
            .arg("--target-version=py39")
            .arg("-")
            .pass_stdin(contents),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3588,7 +3581,7 @@ nested_optional: Optional[Optional[Optional[str]]] = None
            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
            .arg("-")
            .pass_stdin(contents),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3613,7 +3606,7 @@ fn show_fixes_in_full_output_with_preview_enabled() {
            .arg("--preview")
            .arg("-")
            .pass_stdin("import math"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3644,7 +3637,7 @@ fn rule_panic_mixed_results_concise() -> Result<()> {
        fixture.check_command()
            .args(["--select", "RUF9", "--preview"])
            .args(["normal.py", "panic.py"]),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -3679,7 +3672,7 @@ fn rule_panic_mixed_results_full() -> Result<()> {
        fixture.command()
            .args(["check", "--select", "RUF9", "--preview", "--output-format=full", "--no-cache"])
            .args(["normal.py", "panic.py"]),
-        @"
+        @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -3788,7 +3781,7 @@ fn supported_file_extensions() -> Result<()> {
        fixture.check_command()
            .args(["--select", "F401"])
            .arg("src"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3868,7 +3861,7 @@ fn supported_file_extensions_preview_enabled() -> Result<()> {
        fixture.check_command()
            .args(["--select", "F401", "--preview"])
            .arg("src"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
--- a/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
@@ -14,6 +14,6 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,endLine=2::input.py:1:1: unformatted: File would be reformatted
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted

 ----- stderr -----
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
@@ -17,6 +17,7 @@ info:
    - "--fix"
    - "-"
  stdin: "1"
+snapshot_kind: text
 ---
 success: false
 exit_code: 2
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
@@ -12,6 +12,7 @@ info:
    - "--target-version"
    - py39
    - input.py
+snapshot_kind: text
 ---
 success: false
 exit_code: 1
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_extend_from_shared_config.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_extend_from_shared_config.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,7 +261,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
@@ -127,7 +127,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -263,7 +263,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_preview_enabled.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_preview_enabled.snap
@@ -129,7 +129,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -265,7 +265,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_target_version_override.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_target_version_override.snap
@@ -129,7 +129,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -265,7 +265,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
@@ -126,7 +126,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -262,7 +262,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above_with_tool.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above_with_tool.snap
@@ -126,7 +126,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -262,7 +262,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above-2.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above-2.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,7 +261,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,7 +261,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_no_target_fallback.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_no_target_fallback.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,7 +261,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/lint.rs
+source: crates/ruff/tests/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/direxist_guard.rs
+++ b/crates/ruff/tests/direxist_guard.rs
@@ -18,13 +18,13 @@ fn check_in_deleted_directory_errors() {
    set_current_dir(&temp_path).unwrap();
    drop(temp_dir);

-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @"
-    success: false
-    exit_code: 2
-    ----- stdout -----
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @r###"
+            success: false
+            exit_code: 2
+            ----- stdout -----

-    ----- stderr -----
-    ruff failed
-      Cause: Working directory does not exist
-    ");
+            ----- stderr -----
+            ruff failed
+              Cause: Working directory does not exist
+            "###);
 }
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -97,7 +97,7 @@ impl<'a> RuffCheck<'a> {
 fn stdin_success() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(""), @"
+        .pass_stdin(""), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -111,7 +111,7 @@ fn stdin_success() {
 fn stdin_error() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -136,7 +136,7 @@ fn stdin_filename() {
        .args(["--stdin-filename", "F401.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -172,7 +172,7 @@ import bar   # unused import
    )?;

    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @"
+        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -208,7 +208,7 @@ fn check_warn_stdin_filename_with_files() {
        .filename("foo.py")
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -235,7 +235,7 @@ fn stdin_source_type_py() {
        .args(["--stdin-filename", "TCH.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -261,7 +261,7 @@ fn stdin_source_type_pyi() {
        .args(["--stdin-filename", "TCH.pyi", "--select", "TCH"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -294,7 +294,7 @@ fn stdin_json() {
 fn stdin_fix_py() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @"
+        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -572,7 +572,7 @@ fn stdin_override_parser_ipynb() {
 },
 "nbformat": 4,
 "nbformat_minor": 5
-}"#), @"
+}"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -610,7 +610,7 @@ fn stdin_override_parser_py() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @"
+        .pass_stdin("import os\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -633,7 +633,7 @@ fn stdin_override_parser_py() {
 fn stdin_fix_when_not_fixable_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @"
+        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @r###"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -654,14 +654,14 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
      |

    Found 2 errors (1 fixed, 1 remaining).
-    ");
+    "###);
 }

 #[test]
 fn stdin_fix_when_no_issues_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import sys\n\nprint(sys.version)\n"), @"
+        .pass_stdin("import sys\n\nprint(sys.version)\n"), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -805,7 +805,7 @@ fn stdin_format_jupyter() {
 fn stdin_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\n"), @"
+        .pass_stdin("from foo import\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -826,7 +826,7 @@ fn stdin_parse_error() {
 fn stdin_multiple_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\nbar =\n"), @"
+        .pass_stdin("from foo import\nbar =\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -857,7 +857,7 @@ fn parse_error_not_included() {
    // Parse errors are always shown
    let mut cmd = RuffCheck::default().args(["--select=I"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("foo =\n"), @"
+        .pass_stdin("foo =\n"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -878,7 +878,7 @@ fn parse_error_not_included() {
 fn full_output_preview() {
    let mut cmd = RuffCheck::default().args(["--preview"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @"
+        .pass_stdin("l = 1"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -907,7 +907,7 @@ preview = true
 ",
    )?;
    let mut cmd = RuffCheck::default().config(&pyproject_toml).build();
-    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @"
+    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -929,7 +929,7 @@ preview = true
 fn full_output_format() {
    let mut cmd = RuffCheck::default().output_format("full").build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @"
+        .pass_stdin("l = 1"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -967,7 +967,7 @@ fn rule_f401_output_text() {

 #[test]
 fn rule_invalid_rule_name() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -981,7 +981,7 @@ fn rule_invalid_rule_name() {

 #[test]
 fn rule_invalid_rule_name_output_json() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -995,7 +995,7 @@ fn rule_invalid_rule_name_output_json() {

 #[test]
 fn rule_invalid_rule_name_output_text() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1016,7 +1016,7 @@ fn show_statistics() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1037,7 +1037,7 @@ fn show_statistics_unsafe_fixes() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @"
+"#), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1152,7 +1152,7 @@ fn show_statistics_partial_fix() {
        .args(["--select", "UP035", "--statistics"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @"
+        .pass_stdin("from typing import List, AsyncGenerator"), @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1173,7 +1173,7 @@ fn show_statistics_syntax_errors() {
    // ParseError
    assert_cmd_snapshot!(
        cmd.pass_stdin("x ="),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1186,7 +1186,7 @@ fn show_statistics_syntax_errors() {
    // match before 3.10, UnsupportedSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("match 2:\n  case 1: ..."),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1199,7 +1199,7 @@ fn show_statistics_syntax_errors() {
    // rebound comprehension variable, SemanticSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("[x := 1 for x in range(0)]"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1216,7 +1216,7 @@ fn preview_enabled_prefix() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF9", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1238,7 +1238,7 @@ fn preview_enabled_all() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "ALL", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1265,7 +1265,7 @@ fn preview_enabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1282,7 +1282,7 @@ fn preview_disabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1299,7 +1299,7 @@ fn preview_disabled_prefix_empty() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF91", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1316,7 +1316,7 @@ fn preview_disabled_does_not_warn_for_empty_ignore_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1332,7 +1332,7 @@ fn preview_disabled_does_not_warn_for_empty_fixable_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--fixable", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1354,7 +1354,7 @@ fn preview_group_selector() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("I=42\n"), @"
+        .pass_stdin("I=42\n"), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1379,7 +1379,7 @@ fn preview_enabled_group_ignore() {
            "--output-format=concise",
        ])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1400,7 +1400,7 @@ fn preview_enabled_group_ignore() {
 fn removed_direct() {
    // Selection of a removed rule should fail
    let mut cmd = RuffCheck::default().args(["--select", "RUF931"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1418,7 +1418,7 @@ fn removed_direct_multiple() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF930", "--select", "RUF931"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1436,7 +1436,7 @@ fn removed_indirect() {
    // Selection _including_ a removed rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF93"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1449,7 +1449,7 @@ fn removed_indirect() {
 #[test]
 fn removed_ignore_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "UP027"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1466,7 +1466,7 @@ fn removed_ignore_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "UP027", "--ignore", "PLR1706"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1482,7 +1482,7 @@ fn removed_ignore_multiple_direct() {
 #[test]
 fn removed_ignore_remapped_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "PGH001"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1498,7 +1498,7 @@ fn removed_ignore_indirect() {
    // `PLR170` includes removed rules but should not select or warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--ignore", "PLR170"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1512,7 +1512,7 @@ fn removed_ignore_indirect() {
 fn redirect_direct() {
    // Selection of a redirected rule directly should use the new rule and warn
    let mut cmd = RuffCheck::default().args(["--select", "RUF940"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1531,7 +1531,7 @@ fn redirect_indirect() {
    // Selection _including_ a redirected rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF94"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1546,7 +1546,7 @@ fn redirect_prefix() {
    // Selection using a redirected prefix should switch to all rules in the
    // new prefix
    let mut cmd = RuffCheck::default().args(["--select", "RUF96"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1565,7 +1565,7 @@ fn deprecated_direct() {
    // Selection of a deprecated rule without preview enabled should still work
    // but a warning should be displayed
    let mut cmd = RuffCheck::default().args(["--select", "RUF920"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1586,7 +1586,7 @@ fn deprecated_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1609,7 +1609,7 @@ fn deprecated_indirect() {
    // `RUF92` includes deprecated rules but should not warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1625,7 +1625,7 @@ fn deprecated_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1642,7 +1642,7 @@ fn deprecated_indirect_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF92", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1659,7 +1659,7 @@ fn deprecated_multiple_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1720,7 +1720,7 @@ fn unreadable_dir() -> Result<()> {
        .filename(unreadable_dir.to_str().unwrap())
        .args([])
        .build();
-    assert_cmd_snapshot!(cmd, @"
+    assert_cmd_snapshot!(cmd, @r###"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1728,7 +1728,7 @@ fn unreadable_dir() -> Result<()> {

    ----- stderr -----
    warning: Encountered error: Permission denied (os error 13)
-    ");
+    "###);
    Ok(())
 }

@@ -1758,7 +1758,7 @@ fn check_input_from_argfile() -> Result<()> {
        (file_a_path.display().to_string().as_str(), "/path/to/a.py"),
    ]}, {
        assert_cmd_snapshot!(cmd
-            .pass_stdin(""), @"
+            .pass_stdin(""), @r"
        success: false
        exit_code: 1
        ----- stdout -----
@@ -1787,17 +1787,17 @@ fn missing_argfile_reports_error() {
    insta::with_settings!({filters => vec![
        ("The system cannot find the file specified.", "No such file or directory")
    ]}, {
-        assert_cmd_snapshot!(cmd, @"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+        assert_cmd_snapshot!(cmd, @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----

-        ----- stderr -----
-        ruff failed
-          Cause: Failed to read CLI arguments from files
-          Cause: failed to open file `!.txt`
-          Cause: No such file or directory (os error 2)
-        ");
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to read CLI arguments from files
+      Cause: failed to open file `!.txt`
+      Cause: No such file or directory (os error 2)
+    ");
    });
 }

@@ -1807,7 +1807,7 @@ fn check_hints_hidden_unsafe_fixes() {
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1829,7 +1829,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    let mut cmd = RuffCheck::default().args(["--select", "RUF902"]).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1849,7 +1849,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
        .args(["--select", "RUF901,RUF902", "--no-unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1873,7 +1873,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1892,7 +1892,7 @@ fn check_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1915,7 +1915,7 @@ fn fix_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1936,7 +1936,7 @@ fn fix_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1955,7 +1955,7 @@ fn fix_does_not_apply_display_only_fixes() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1975,7 +1975,7 @@ fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1994,7 +1994,7 @@ fn fix_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2014,7 +2014,7 @@ fn fix_only_flag_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix-only"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2031,7 +2031,7 @@ fn fix_only_flag_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix-only", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2049,7 +2049,7 @@ fn diff_shows_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2069,7 +2069,7 @@ fn diff_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--diff", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2091,7 +2091,7 @@ fn diff_does_not_show_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2106,7 +2106,7 @@ fn diff_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2134,7 +2134,7 @@ extend-unsafe-fixes = ["RUF901"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2170,7 +2170,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2208,7 +2208,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2248,7 +2248,7 @@ extend-safe-fixes = ["RUF9"]
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\nprint(str('foo'))\nisinstance(x, (int, str))\n"),
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2307,7 +2307,7 @@ def log(x, base) -> float:
        .args(["--select", "D41"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(stdin), @"
+        .pass_stdin(stdin), @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2360,7 +2360,7 @@ select = ["RUF017"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2401,7 +2401,7 @@ unfixable = ["RUF"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @"
+            @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2431,7 +2431,7 @@ fn pyproject_toml_stdin_syntax_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2457,7 +2457,7 @@ fn pyproject_toml_stdin_schema_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2484,7 +2484,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2503,7 +2503,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected_2() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2522,7 +2522,7 @@ fn pyproject_toml_stdin_no_errors() {

    assert_cmd_snapshot!(
        cmd.pass_stdin(r#"[project]\nname = "ruff"\nversion = "0.0.0""#),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2547,7 +2547,7 @@ fn pyproject_toml_stdin_schema_error_fix() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @"
+        @r"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2581,7 +2581,7 @@ fn pyproject_toml_stdin_schema_error_fix_only() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2607,7 +2607,7 @@ fn pyproject_toml_stdin_schema_error_fix_diff() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @"
+        @r"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/resolve_files.rs
+++ b/crates/ruff/tests/resolve_files.rs
@@ -29,7 +29,7 @@ fn check_project_include_defaults() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -53,7 +53,7 @@ fn check_project_respects_direct_paths() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
+        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -72,7 +72,7 @@ fn check_project_respects_subdirectory_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
+        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -91,7 +91,7 @@ fn check_project_from_project_subdirectory_respects_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @r"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
+++ b/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
@@ -3,12 +3,11 @@ source: crates/ruff/tests/integration_test.rs
 info:
  program: ruff
  args:
-    - check
+    - "-"
+    - "--isolated"
+    - "--no-cache"
    - "--output-format"
    - json
-    - "--no-cache"
-    - "--isolated"
-    - "-"
    - "--stdin-filename"
    - F401.py
  stdin: "import os\n"
@@ -52,3 +51,4 @@ exit_code: 1
  }
 ]
 ----- stderr -----
+
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -238,7 +238,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.function_names = [
+linter.flake8_gettext.functions_names = [
 	_,
 	gettext,
 	ngettext,
@@ -374,7 +374,6 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/version.rs
+++ b/crates/ruff/tests/version.rs
@@ -16,7 +16,7 @@ const VERSION_FILTER: [(&str, &str); 1] = [(
 fn version_basics() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @r"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -42,7 +42,7 @@ fn config_option_allowed_but_ignored() -> Result<()> {
                .arg("version")
                .arg("--config")
                .arg(&ruff_dot_toml)
-                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @"
+                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @r"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -60,7 +60,7 @@ fn config_option_ignored_but_validated() {
        assert_cmd_snapshot!(
            Command::new(get_cargo_bin(BIN_NAME))
                .arg("version")
-                .args(["--config", "foo = bar"]), @"
+                .args(["--config", "foo = bar"]), @r"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -91,7 +91,7 @@ fn config_option_ignored_but_validated() {
 fn isolated_option_allowed() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @r"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff_annotate_snippets/Cargo.toml
+++ b/crates/ruff_annotate_snippets/Cargo.toml
@@ -12,6 +12,10 @@ license = "MIT OR Apache-2.0"

 [lib]

+[features]
+default = []
+testing-colors = []
+
 [dependencies]
 anstyle = { workspace = true }
 memchr = { workspace = true }
@@ -19,17 +23,12 @@ unicode-width = { workspace = true }

 [dev-dependencies]
 ruff_annotate_snippets = { workspace = true, features = ["testing-colors"] }
-
 anstream = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 snapbox = { workspace = true, features = ["diff", "term-svg", "cmd", "examples"] }
 toml = { workspace = true }
 tryfn = { workspace = true }

-[features]
-default = []
-testing-colors = []
-
 [[test]]
 name = "fixtures"
 harness = false
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -16,80 +16,77 @@ bench = false
 test = false
 doctest = false

+[[bench]]
+name = "linter"
+harness = false
+required-features = ["instrumented"]
+
+[[bench]]
+name = "lexer"
+harness = false
+required-features = ["instrumented"]
+
+[[bench]]
+name = "parser"
+harness = false
+required-features = ["instrumented"]
+
+[[bench]]
+name = "formatter"
+harness = false
+required-features = ["instrumented"]
+
+[[bench]]
+name = "ty"
+harness = false
+required-features = ["instrumented"]
+
+[[bench]]
+name = "ty_walltime"
+harness = false
+required-features = ["walltime"]
+
 [dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
-ruff_linter = { workspace = true, optional = true }
 ruff_python_ast = { workspace = true }
+ruff_linter = { workspace = true, optional = true }
 ruff_python_formatter = { workspace = true, optional = true }
 ruff_python_parser = { workspace = true, optional = true }
 ruff_python_trivia = { workspace = true, optional = true }
 ty_project = { workspace = true, optional = true }

+divan = { workspace = true, optional = true }
 anyhow = { workspace = true }
 codspeed-criterion-compat = { workspace = true, default-features = false, optional = true }
 criterion = { workspace = true, default-features = false, optional = true }
-divan = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { 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")))'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true, optional = true }
-
-[dev-dependencies]
-rayon = { workspace = true }
-rustc-hash = { workspace = true }
+[lints]
+workspace = true

 [features]
-default = ["ty_instrumented", "ty_walltime", "ruff_instrumented"]
-# Enables the ruff instrumented benchmarks
-ruff_instrumented = [
+default = ["instrumented", "walltime"]
+# Enables the benchmark that should only run with codspeed's instrumented runner
+instrumented = [
    "criterion",
    "ruff_linter",
    "ruff_python_formatter",
    "ruff_python_parser",
    "ruff_python_trivia",
-    "mimalloc",
-    "tikv-jemallocator",
+    "ty_project",
 ]
-# Enables the ty instrumented benchmarks
-ty_instrumented = ["criterion", "ty_project", "ruff_python_trivia"]
 codspeed = ["codspeed-criterion-compat"]
-# Enables the ty_walltime benchmarks
-ty_walltime = ["ruff_db/os", "ty_project", "divan"]
+# Enables benchmark that should only run with codspeed's walltime runner.
+walltime = ["ruff_db/os", "ty_project", "divan"]

-[[bench]]
-name = "linter"
-harness = false
-required-features = ["ruff_instrumented"]
+[target.'cfg(target_os = "windows")'.dev-dependencies]
+mimalloc = { workspace = true }

-[[bench]]
-name = "lexer"
-harness = false
-required-features = ["ruff_instrumented"]
+[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]
+tikv-jemallocator = { workspace = true }

-[[bench]]
-name = "parser"
-harness = false
-required-features = ["ruff_instrumented"]
-
-[[bench]]
-name = "formatter"
-harness = false
-required-features = ["ruff_instrumented"]
-
-[[bench]]
-name = "ty"
-harness = false
-required-features = ["ty_instrumented"]
-
-[[bench]]
-name = "ty_walltime"
-harness = false
-required-features = ["ty_walltime"]
-
-[lints]
-workspace = true
+[dev-dependencies]
+rustc-hash = { workspace = true }
+rayon = { workspace = true }
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -557,60 +557,6 @@ fn benchmark_many_enum_members(criterion: &mut Criterion) {
    });
 }

-fn benchmark_many_enum_members_2(criterion: &mut Criterion) {
-    const NUM_ENUM_MEMBERS: usize = 48;
-
-    setup_rayon();
-
-    let mut code = "\
-from enum import Enum
-from typing_extensions import assert_never
-
-class E(Enum):
-"
-    .to_string();
-
-    for i in 0..NUM_ENUM_MEMBERS {
-        writeln!(&mut code, "    m{i} = {i}").ok();
-    }
-
-    code.push_str(
-        "
-    def method(self):
-        match self:",
-    );
-
-    for i in 0..NUM_ENUM_MEMBERS {
-        write!(
-            &mut code,
-            "
-            case E.m{i}:
-                pass"
-        )
-        .ok();
-    }
-
-    write!(
-        &mut code,
-        "
-            case _:
-                assert_never(self)"
-    )
-    .ok();
-
-    criterion.bench_function("ty_micro[many_enum_members_2]", |b| {
-        b.iter_batched_ref(
-            || setup_micro_case(&code),
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 struct ProjectBenchmark<'a> {
    project: InstalledProject<'a>,
    fs: MemoryFileSystem,
@@ -771,7 +717,6 @@ criterion_group!(
    benchmark_complex_constrained_attributes_2,
    benchmark_complex_constrained_attributes_3,
    benchmark_many_enum_members,
-    benchmark_many_enum_members_2,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
 criterion_main!(check_file, micro, project);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    13116,
+    13100,
 );

 static TANJUN: Benchmark = Benchmark::new(
@@ -235,55 +235,30 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
        });
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn altair(bencher: Bencher) {
-    run_single_threaded(bencher, &ALTAIR);
+#[bench(args=[&ALTAIR, &FREQTRADE, &TANJUN], sample_size=2, sample_count=3)]
+fn small(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn freqtrade(bencher: Bencher) {
-    run_single_threaded(bencher, &FREQTRADE);
+#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
+fn medium(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn tanjun(bencher: Bencher) {
-    run_single_threaded(bencher, &TANJUN);
+#[bench(args=[&SYMPY, &PYDANTIC], sample_size=1, sample_count=2)]
+fn large(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn pydantic(bencher: Bencher) {
-    run_single_threaded(bencher, &PYDANTIC);
-}
-
-#[bench(sample_size = 1, sample_count = 3)]
-fn static_frame(bencher: Bencher) {
-    run_single_threaded(bencher, &STATIC_FRAME);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn colour_science(bencher: Bencher) {
-    run_single_threaded(bencher, &COLOUR_SCIENCE);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn pandas(bencher: Bencher) {
-    run_single_threaded(bencher, &PANDAS);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn sympy(bencher: Bencher) {
-    run_single_threaded(bencher, &SYMPY);
-}
-
-#[bench(sample_size = 3, sample_count = 8)]
-fn multithreaded(bencher: Bencher) {
+#[bench(args=[&ALTAIR], sample_size=3, sample_count=8)]
+fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
    let thread_pool = ThreadPoolBuilder::new().build().unwrap();

    bencher
-        .with_inputs(|| ALTAIR.setup_iteration())
+        .with_inputs(|| benchmark.setup_iteration())
        .bench_local_values(|db| {
            thread_pool.install(|| {
-                check_project(&db, ALTAIR.project.name, ALTAIR.max_diagnostics);
+                check_project(&db, benchmark.project.name, benchmark.max_diagnostics);
                db
            })
        });
--- a/crates/ruff_benchmark/src/lib.rs
+++ b/crates/ruff_benchmark/src/lib.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;

-#[cfg(any(feature = "ty_instrumented", feature = "ruff_instrumented"))]
+#[cfg(feature = "instrumented")]
 pub mod criterion;
 pub mod real_world_projects;

--- a/crates/ruff_cache/Cargo.toml
+++ b/crates/ruff_cache/Cargo.toml
@@ -11,11 +11,11 @@ repository = { workspace = true }
 license = { workspace = true }

 [dependencies]
-filetime = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
 itertools = { workspace = true }
 regex = { workspace = true }
+filetime = { workspace = true }
 seahash = { workspace = true }

 [dev-dependencies]
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -48,12 +48,12 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
 zip = { workspace = true }

-[target.'cfg(not(target_arch="wasm32"))'.dependencies]
-etcetera = { workspace = true, optional = true }
-
 [target.'cfg(target_arch="wasm32")'.dependencies]
 web-time = { version = "1.1.0" }

+[target.'cfg(not(target_arch="wasm32"))'.dependencies]
+etcetera = { workspace = true, optional = true }
+
 [dev-dependencies]
 insta = { workspace = true, features = ["filters"] }
 tempfile = { workspace = true }
--- a/crates/ruff_db/src/cancellation.rs
+++ b/crates/ruff_db/src/cancellation.rs
@@ -1,51 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-/// Signals a [`CancellationToken`] that it should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationTokenSource {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl Default for CancellationTokenSource {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CancellationTokenSource {
-    pub fn new() -> Self {
-        Self {
-            cancelled: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    pub fn is_cancellation_requested(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    /// Creates a new token that uses this source.
-    pub fn token(&self) -> CancellationToken {
-        CancellationToken {
-            cancelled: self.cancelled.clone(),
-        }
-    }
-
-    /// Requests cancellation for operations using this token.
-    pub fn cancel(&self) {
-        self.cancelled
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-}
-
-/// Token signals whether an operation should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationToken {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl CancellationToken {
-    pub fn is_cancelled(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-}
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fmt::Formatter, path::Path, sync::Arc};
+use std::{fmt::Formatter, path::Path, sync::Arc};

 use ruff_diagnostics::{Applicability, Fix};
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};
@@ -11,7 +11,6 @@ pub use self::render::{
    ceil_char_boundary,
    github::{DisplayGithubDiagnostics, GithubRenderer},
 };
-use crate::cancellation::CancellationToken;
 use crate::{Db, files::File};

 mod render;
@@ -411,6 +410,11 @@ impl Diagnostic {
        self.id().is_invalid_syntax()
    }

+    /// Returns the message body to display to the user.
+    pub fn body(&self) -> &str {
+        self.primary_message()
+    }
+
    /// Returns the message of the first sub-diagnostic with a `Help` severity.
    ///
    /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
@@ -1308,8 +1312,6 @@ pub struct DisplayDiagnosticConfig {
    show_fix_diff: bool,
    /// The lowest applicability that should be shown when reporting diagnostics.
    fix_applicability: Applicability,
-
-    cancellation_token: Option<CancellationToken>,
 }

 impl DisplayDiagnosticConfig {
@@ -1383,20 +1385,6 @@ impl DisplayDiagnosticConfig {
    pub fn fix_applicability(&self) -> Applicability {
        self.fix_applicability
    }
-
-    pub fn with_cancellation_token(
-        mut self,
-        token: Option<CancellationToken>,
-    ) -> DisplayDiagnosticConfig {
-        self.cancellation_token = token;
-        self
-    }
-
-    pub fn is_canceled(&self) -> bool {
-        self.cancellation_token
-            .as_ref()
-            .is_some_and(|token| token.is_cancelled())
-    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1410,7 +1398,6 @@ impl Default for DisplayDiagnosticConfig {
            show_fix_status: false,
            show_fix_diff: false,
            fix_applicability: Applicability::Safe,
-            cancellation_token: None,
        }
    }
 }
@@ -1487,15 +1474,6 @@ pub enum ConciseMessage<'a> {
    Custom(&'a str),
 }

-impl<'a> ConciseMessage<'a> {
-    pub fn to_str(&self) -> Cow<'a, str> {
-        match self {
-            ConciseMessage::MainDiagnostic(s) | ConciseMessage::Custom(s) => Cow::Borrowed(s),
-            ConciseMessage::Both { .. } => Cow::Owned(self.to_string()),
-        }
-    }
-}
-
 impl std::fmt::Display for ConciseMessage<'_> {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match *self {
@@ -1512,16 +1490,6 @@ impl std::fmt::Display for ConciseMessage<'_> {
    }
 }

-#[cfg(feature = "serde")]
-impl serde::Serialize for ConciseMessage<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.collect_str(self)
-    }
-}
-
 /// A diagnostic message string.
 ///
 /// This is, for all intents and purposes, equivalent to a `Box<str>`.
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -1284,7 +1284,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1308,7 +1308,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        warning[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1328,7 +1328,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        info[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1355,7 +1355,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1374,7 +1374,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1395,7 +1395,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:5:1
          |
@@ -1414,7 +1414,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "2:4", "2:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:2:2
          |
@@ -1438,7 +1438,7 @@ watermelon
        env.context(1);
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1455,7 +1455,7 @@ watermelon
        env.context(0);
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1470,7 +1470,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1487,7 +1487,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
@@ -1504,7 +1504,7 @@ watermelon
        env.context(200);
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:1
           |
@@ -1537,7 +1537,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1581,7 +1581,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1606,7 +1606,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1634,7 +1634,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1662,7 +1662,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1687,7 +1687,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1718,7 +1718,7 @@ watermelon
        // window.
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1756,7 +1756,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "8", "8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:8:1
          |
@@ -1773,7 +1773,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "12", "12", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:12:1
           |
@@ -1791,7 +1791,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "13", "13", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:13:1
           |
@@ -1831,7 +1831,7 @@ watermelon
        // instead of special casing the snippet assembly.
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:3:1
          |
@@ -1860,7 +1860,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1897,7 +1897,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1934,7 +1934,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1962,7 +1962,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1998,7 +1998,7 @@ watermelon
        diag.sub(env.sub_warn().primary("animals", "11", "11", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2037,7 +2037,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2085,7 +2085,7 @@ watermelon
        diag.sub(env.sub_warn().secondary("animals", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2121,7 +2121,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "6", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2144,7 +2144,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:0", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2164,7 +2164,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:1", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2184,7 +2184,7 @@ watermelon
        let diag = env.err().primary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2206,7 +2206,7 @@ watermelon
        let diag = env.err().secondary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2238,7 +2238,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2267,7 +2267,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2298,7 +2298,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2333,7 +2333,7 @@ watermelon
        // better using only ASCII art.
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2361,7 +2361,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2393,7 +2393,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2415,7 +2415,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2448,7 +2448,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:8:1
           |
@@ -2488,7 +2488,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2532,7 +2532,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
         --> fruits:1:1
          |
@@ -2567,7 +2567,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @"
+            @r"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -52,7 +52,7 @@ impl AzureRenderer<'_> {
                f,
                "code={code};]{body}",
                code = diag.secondary_code_or_id(),
-                body = diag.concise_message(),
+                body = diag.body(),
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -28,10 +28,6 @@ impl<'a> ConciseRenderer<'a> {

        let sep = fmt_styled(":", stylesheet.separator);
        for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
            if let Some(span) = diag.primary_span() {
                write!(
                    f,
@@ -137,7 +133,7 @@ mod tests {
    #[test]
    fn output() {
        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
        fib.py:1:8: error[unused-import] `os` imported but unused
        fib.py:6:5: error[unused-variable] Local variable `x` is assigned to but never used
        undef.py:1:4: error[undefined-name] Undefined name `a`
@@ -150,7 +146,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -164,7 +160,7 @@ mod tests {
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
        env.preview(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -177,7 +173,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        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
        ");
@@ -186,7 +182,7 @@ mod tests {
    #[test]
    fn syntax_errors() {
        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        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
        ");
@@ -195,7 +191,7 @@ mod tests {
    #[test]
    fn notebook_output() {
        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
        notebook.ipynb:cell 1:2:8: error[unused-import] `os` imported but unused
        notebook.ipynb:cell 2:2:8: error[unused-import] `math` imported but unused
        notebook.ipynb:cell 3:4:5: error[unused-variable] Local variable `x` is assigned to but never used
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -53,10 +53,6 @@ impl<'a> FullRenderer<'a> {
            .hyperlink(stylesheet.hyperlink);

        for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
            let resolved = Resolved::new(self.resolver, diag, self.config);
            let renderable = resolved.to_renderable(self.config.context);
            for diag in renderable.diagnostics.iter() {
--- a/crates/ruff_db/src/diagnostic/render/github.rs
+++ b/crates/ruff_db/src/diagnostic/render/github.rs
@@ -49,26 +49,14 @@ impl<'a> GithubRenderer<'a> {
                }
                .unwrap_or_default();

-                // GitHub Actions workflow commands have constraints on error annotations:
-                // - `col` and `endColumn` cannot be set if `line` and `endLine` are different
-                // See: https://github.com/astral-sh/ruff/issues/22074
-                if start_location.line == end_location.line {
-                    write!(
-                        f,
-                        ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                        row = start_location.line,
-                        column = start_location.column,
-                        end_row = end_location.line,
-                        end_column = end_location.column,
-                    )?;
-                } else {
-                    write!(
-                        f,
-                        ",line={row},endLine={end_row}::",
-                        row = start_location.line,
-                        end_row = end_location.line,
-                    )?;
-                }
+                write!(
+                    f,
+                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                    row = start_location.line,
+                    column = start_location.column,
+                    end_row = end_location.line,
+                    end_column = end_location.column,
+                )?;

                write!(
                    f,
@@ -87,7 +75,7 @@ impl<'a> GithubRenderer<'a> {
                write!(f, "{id}:", id = diagnostic.id())?;
            }

-            writeln!(f, " {}", diagnostic.concise_message())?;
+            writeln!(f, " {}", diagnostic.body())?;
        }

        Ok(())
--- a/crates/ruff_db/src/diagnostic/render/gitlab.rs
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -98,7 +98,7 @@ impl Serialize for SerializedMessages<'_> {
            }
            fingerprints.insert(message_fingerprint);

-            let description = diagnostic.concise_message();
+            let description = diagnostic.body();
            let check_name = diagnostic.secondary_code_or_id();
            let severity = match diagnostic.severity() {
                Severity::Info => "info",
--- 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::{ConciseMessage, Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};

 use super::FileResolver;

@@ -101,7 +101,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
            location: start_location.map(JsonLocation::from),
@@ -113,7 +113,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
            location: Some(start_location.unwrap_or_default().into()),
@@ -226,7 +226,7 @@ pub(crate) struct JsonDiagnostic<'a> {
    filename: Option<&'a str>,
    fix: Option<JsonFix<'a>>,
    location: Option<JsonLocation>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
    noqa_row: Option<OneIndexed>,
    url: Option<&'a str>,
 }
--- a/crates/ruff_db/src/diagnostic/render/junit.rs
+++ b/crates/ruff_db/src/diagnostic/render/junit.rs
@@ -56,17 +56,17 @@ impl<'a> JunitRenderer<'a> {
                        start_location: location,
                    } = diagnostic;
                    let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.concise_message().to_str());
+                    status.set_message(diagnostic.body());

                    if let Some(location) = location {
                        status.set_description(format!(
                            "line {row}, col {col}, {body}",
                            row = location.line,
                            col = location.column,
-                            body = diagnostic.concise_message()
+                            body = diagnostic.body()
                        ));
                    } else {
-                        status.set_description(diagnostic.concise_message().to_str());
+                        status.set_description(diagnostic.body());
                    }

                    let code = diagnostic
--- a/crates/ruff_db/src/diagnostic/render/pylint.rs
+++ b/crates/ruff_db/src/diagnostic/render/pylint.rs
@@ -55,7 +55,7 @@ impl PylintRenderer<'_> {
                f,
                "{path}:{row}: [{code}] {body}",
                path = filename,
-                body = diagnostic.concise_message()
+                body = diagnostic.body()
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/rdjson.rs
+++ b/crates/ruff_db/src/diagnostic/render/rdjson.rs
@@ -5,7 +5,7 @@ use ruff_diagnostics::{Edit, Fix};
 use ruff_source_file::{LineColumn, SourceCode};
 use ruff_text_size::Ranged;

-use crate::diagnostic::{ConciseMessage, Diagnostic};
+use crate::diagnostic::Diagnostic;

 use super::FileResolver;

@@ -76,7 +76,7 @@ fn diagnostic_to_rdjson<'a>(
    let edits = diagnostic.fix().map(Fix::edits).unwrap_or_default();

    RdjsonDiagnostic {
-        message: diagnostic.concise_message(),
+        message: diagnostic.body(),
        location,
        code: RdjsonCode {
            value: diagnostic
@@ -155,7 +155,7 @@ struct RdjsonDiagnostic<'a> {
    code: RdjsonCode<'a>,
    #[serde(skip_serializing_if = "Option::is_none")]
    location: Option<RdjsonLocation<'a>>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
    #[serde(skip_serializing_if = "Vec::is_empty")]
    suggestions: Vec<RdjsonSuggestion<'a>>,
 }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,endLine=2::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,endLine=4::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -526,7 +526,7 @@ impl VirtualFile {
    }

    /// Increments the revision of the underlying [`File`].
-    pub fn sync(&self, db: &mut dyn Db) {
+    fn sync(&self, db: &mut dyn Db) {
        let file = self.0;
        tracing::debug!("Updating the revision of `{}`", file.path(db));
        let current_revision = file.revision(db);
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -12,7 +12,6 @@ use std::hash::BuildHasherDefault;
 use std::num::NonZeroUsize;
 use ty_static::EnvVars;

-pub mod cancellation;
 pub mod diagnostic;
 pub mod display;
 pub mod file_revision;
--- a/crates/ruff_db/src/system/os.rs
+++ b/crates/ruff_db/src/system/os.rs
@@ -275,16 +275,16 @@ impl OsSystem {
    /// instead of at least one system call for each component between `path` and `prefix`.
    ///
    /// However, using `canonicalize` to resolve the path's casing doesn't work in two cases:
-    /// * if `path` is a symlink, `canonicalize` returns the symlink's target and not the symlink's source path.
-    /// * on Windows: If `path` is a mapped network drive, `canonicalize` returns the UNC path
-    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` returns `\\?\UNC\server\share`).
+    /// * if `path` is a symlink because `canonicalize` then returns the symlink's target and not the symlink's source path.
+    /// * on Windows: If `path` is a mapped network drive because `canonicalize` then returns the UNC path
+    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` then returns `\\?\UNC\server\share`).
    ///
    /// Symlinks and mapped network drives should be rare enough that this fast path is worth trying first,
    /// even if it comes at a cost for those rare use cases.
    fn path_exists_case_sensitive_fast(&self, path: &SystemPath) -> Option<bool> {
        // This is a more forgiving version of `dunce::simplified` that removes all `\\?\` prefixes on Windows.
        // We use this more forgiving version because we don't intend on using either path for anything other than comparison
-        // and the prefix is only relevant when passing the path to other programs and it's longer than 200 something
+        // and the prefix is only relevant when passing the path to other programs and its longer than 200 something
        // characters.
        fn simplify_ignore_verbatim(path: &SystemPath) -> &SystemPath {
            if cfg!(windows) {
@@ -298,7 +298,9 @@ impl OsSystem {
            }
        }

-        let Ok(canonicalized) = path.as_std_path().canonicalize() else {
+        let simplified = simplify_ignore_verbatim(path);
+
+        let Ok(canonicalized) = simplified.as_std_path().canonicalize() else {
            // The path doesn't exist or can't be accessed. The path doesn't exist.
            return Some(false);
        };
@@ -307,13 +309,12 @@ impl OsSystem {
            // The original path is valid UTF8 but the canonicalized path isn't. This definitely suggests
            // that a symlink is involved. Fall back to the slow path.
            tracing::debug!(
-                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{path}` is not valid UTF-8"
+                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{simplified}` is not valid UTF-8"
            );
            return None;
        };

        let simplified_canonicalized = simplify_ignore_verbatim(&canonicalized);
-        let simplified = simplify_ignore_verbatim(path);

        // Test if the paths differ by anything other than casing. If so, that suggests that
        // `path` pointed to a symlink (or some other none reversible path normalization happened).
--- a/crates/ruff_db/src/vendored.rs
+++ b/crates/ruff_db/src/vendored.rs
@@ -619,19 +619,19 @@ pub(crate) mod tests {
    fn read_directory_stdlib() {
        let mock_typeshed = mock_typeshed();

-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib"), @"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib"), @r"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib/"), @"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib/"), @r"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib"), @"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib"), @r"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib/"), @"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib/"), @r"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -11,6 +11,10 @@ repository = { workspace = true }
 license = { workspace = true }

 [dependencies]
+ty = { workspace = true }
+ty_project = { workspace = true, features = ["schemars"] }
+ty_python_semantic = { workspace = true }
+ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
 ruff_linter = { workspace = true, features = ["schemars"] }
@@ -22,10 +26,6 @@ ruff_python_formatter = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_workspace = { workspace = true, features = ["schemars"] }
-ty = { workspace = true }
-ty_project = { workspace = true, features = ["schemars"] }
-ty_python_semantic = { workspace = true }
-ty_static = { workspace = true }

 anyhow = { workspace = true }
 clap = { workspace = true, features = ["wrap_help"] }
--- a/crates/ruff_dev/src/generate_ty_options.rs
+++ b/crates/ruff_dev/src/generate_ty_options.rs
@@ -1,13 +1,11 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.

-use std::borrow::Cow;
-use std::{fmt::Write, path::PathBuf};
-
 use anyhow::bail;
 use itertools::Itertools;
 use pretty_assertions::StrComparison;
+use std::{fmt::Write, path::PathBuf};
+
 use ruff_options_metadata::{OptionField, OptionSet, OptionsMetadata, Visit};
-use ruff_python_trivia::textwrap;
 use ty_project::metadata::Options;

 use crate::{
@@ -167,69 +165,62 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
    let _ = writeln!(output, "**Default value**: `{}`", field.default);
    output.push('\n');
    let _ = writeln!(output, "**Type**: `{}`", field.value_type);
-
    output.push('\n');
    output.push_str("**Example usage**:\n\n");
+    output.push_str(&format_example(
+        "pyproject.toml",
+        &format_header(
+            field.scope,
+            field.example,
+            parents,
+            ConfigurationFile::PyprojectToml,
+        ),
+        field.example,
+    ));
+    output.push('\n');
+}

-    for configuration_file in [ConfigurationFile::PyprojectToml, ConfigurationFile::TyToml] {
-        let (header, example) =
-            format_snippet(field.scope, field.example, parents, configuration_file);
-        output.push_str(&format_tab(configuration_file.name(), &header, &example));
-
-        output.push('\n');
+fn format_example(title: &str, header: &str, content: &str) -> String {
+    if header.is_empty() {
+        format!("```toml title=\"{title}\"\n{content}\n```\n",)
+    } else {
+        format!("```toml title=\"{title}\"\n{header}\n{content}\n```\n",)
    }
 }

-fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
-    let header = if header.is_empty() {
-        String::new()
-    } else {
-        format!("\n    {header}")
-    };
-    format!(
-        "=== \"{}\"\n\n    ```toml{}\n{}\n    ```\n",
-        tab_name,
-        header,
-        textwrap::indent(content, "    ")
-    )
-}
 /// Format the TOML header for the example usage for a given option.
 ///
-/// For example: `[tool.ty.rules]`.
-fn format_snippet<'a>(
+/// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
+fn format_header(
    scope: Option<&str>,
-    example: &'a str,
+    example: &str,
    parents: &[Set],
    configuration: ConfigurationFile,
-) -> (String, Cow<'a, str>) {
-    let mut example = Cow::Borrowed(example);
+) -> String {
+    let tool_parent = match configuration {
+        ConfigurationFile::PyprojectToml => Some("tool.ty"),
+        ConfigurationFile::TyToml => None,
+    };

-    let header = configuration
-        .parent_table()
+    let header = tool_parent
        .into_iter()
        .chain(parents.iter().filter_map(|parent| parent.name()))
        .chain(scope)
        .join(".");

-    // Rewrite examples starting with `[tool.ty]` or `[[tool.ty]]` to their `ty.toml` equivalent.
-    if matches!(configuration, ConfigurationFile::TyToml) {
-        example = example.replace("[tool.ty.", "[").into();
-    }
-
    // Ex) `[[tool.ty.xx]]`
    if example.starts_with(&format!("[[{header}")) {
-        return (String::new(), example);
+        return String::new();
    }
-
    // Ex) `[tool.ty.rules]`
    if example.starts_with(&format!("[{header}")) {
-        return (String::new(), example);
+        return String::new();
    }

    if header.is_empty() {
-        (String::new(), example)
+        String::new()
    } else {
-        (format!("[{header}]"), example)
+        format!("[{header}]")
    }
 }

@@ -252,25 +243,10 @@ impl Visit for CollectOptionsVisitor {
 #[derive(Debug, Copy, Clone)]
 enum ConfigurationFile {
    PyprojectToml,
+    #[expect(dead_code)]
    TyToml,
 }

-impl ConfigurationFile {
-    const fn name(self) -> &'static str {
-        match self {
-            Self::PyprojectToml => "pyproject.toml",
-            Self::TyToml => "ty.toml",
-        }
-    }
-
-    const fn parent_table(self) -> Option<&'static str> {
-        match self {
-            Self::PyprojectToml => Some("tool.ty"),
-            Self::TyToml => None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use anyhow::Result;
--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -63,7 +63,12 @@ fn generate_markdown() -> String {
    let _ = writeln!(&mut output, "# Rules\n");

    let mut lints: Vec<_> = registry.lints().iter().collect();
-    lints.sort_by_key(|a| a.name());
+    lints.sort_by(|a, b| {
+        a.default_level()
+            .cmp(&b.default_level())
+            .reverse()
+            .then_with(|| a.name().cmp(&b.name()))
+    });

    for lint in lints {
        let _ = writeln!(&mut output, "## `{rule_name}`\n", rule_name = lint.name());
@@ -114,7 +119,7 @@ fn generate_markdown() -> String {
        let _ = writeln!(
            &mut output,
            r#"<small>
-Default level: <a href="../../rules#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
+Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
 {status_text} ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}" target="_blank">Related issues</a> ·
 <a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>
--- a/crates/ruff_formatter/Cargo.toml
+++ b/crates/ruff_formatter/Cargo.toml
@@ -10,10 +10,6 @@ documentation = { workspace = true }
 repository = { workspace = true }
 license = { workspace = true }

-[package.metadata.cargo-shear]
-# Used via `CacheKey` macro expansion.
-ignored = ["ruff_cache"]
-
 [dependencies]
 ruff_cache = { workspace = true }
 ruff_macros = { workspace = true }
@@ -29,6 +25,10 @@ unicode-width = { workspace = true }

 [dev-dependencies]

+[package.metadata.cargo-shear]
+# Used via `CacheKey` macro expansion.
+ignored = ["ruff_cache"]
+
 [features]
 serde = ["dep:serde", "ruff_text_size/serde"]
 schemars = ["dep:schemars", "ruff_text_size/schemars"]
--- a/crates/ruff_graph/Cargo.toml
+++ b/crates/ruff_graph/Cargo.toml
@@ -9,10 +9,6 @@ repository.workspace = true
 authors.workspace = true
 license.workspace = true

-[package.metadata.cargo-shear]
-# Used via `CacheKey` macro expansion.
-ignored = ["ruff_cache"]
-
 [dependencies]
 ruff_cache = { workspace = true }
 ruff_db = { workspace = true, features = ["os", "serde"] }
@@ -20,7 +16,6 @@ ruff_linter = { workspace = true }
 ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }

 anyhow = { workspace = true }
@@ -33,3 +28,7 @@ zip = { workspace = true, features = [] }

 [lints]
 workspace = true
+
+[package.metadata.cargo-shear]
+# Used via `CacheKey` macro expansion.
+ignored = ["ruff_cache"]
--- a/crates/ruff_graph/src/collector.rs
+++ b/crates/ruff_graph/src/collector.rs
@@ -3,7 +3,7 @@ use ruff_python_ast::visitor::source_order::{
    SourceOrderVisitor, walk_expr, walk_module, walk_stmt,
 };
 use ruff_python_ast::{self as ast, Expr, Mod, Stmt};
-use ty_module_resolver::ModuleName;
+use ty_python_semantic::ModuleName;

 /// Collect all imports for a given Python file.
 #[derive(Default, Debug)]
--- a/crates/ruff_graph/src/db.rs
+++ b/crates/ruff_graph/src/db.rs
@@ -7,11 +7,10 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{SearchPathSettings, SearchPaths};
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionSource, PythonVersionWithSource, SysPrefixPathOrigin, default_lint_registry,
+    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };

 static EMPTY_VENDORED: std::sync::LazyLock<VendoredFileSystem> = std::sync::LazyLock::new(|| {
@@ -27,7 +26,6 @@ pub struct ModuleDb {
    files: Files,
    system: OsSystem,
    rule_selection: Arc<RuleSelection>,
-    analysis_settings: Arc<AnalysisSettings>,
 }

 impl ModuleDb {
@@ -87,13 +85,6 @@ impl SourceDb for ModuleDb {
    }
 }

-#[salsa::db]
-impl ty_module_resolver::Db for ModuleDb {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl Db for ModuleDb {
    fn should_check_file(&self, file: File) -> bool {
@@ -111,10 +102,6 @@ impl Db for ModuleDb {
    fn verbose(&self) -> bool {
        false
    }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        &self.analysis_settings
-    }
 }

 #[salsa::db]
--- a/crates/ruff_graph/src/resolver.rs
+++ b/crates/ruff_graph/src/resolver.rs
@@ -1,6 +1,6 @@
 use ruff_db::files::{File, FilePath, system_path_to_file};
 use ruff_db::system::SystemPath;
-use ty_module_resolver::{
+use ty_python_semantic::{
    ModuleName, resolve_module, resolve_module_confident, resolve_real_module,
    resolve_real_module_confident,
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zanie Blue	c3b4fab764	[ty] Track narrowing unions to prevent exponential blowup When inferring a call expression with a union type context, we try narrowing to each element of the union. If nested calls have the same union as their parameter type, this would lead to exponential blowup. By tracking which unions we're already narrowing against, we skip redundant nested narrowing. On a synthetic benchmark with nested `list_schema()` calls: - 4-level nesting: >120s → 0.13s	2025-12-18 20:24:33 -06:00
Zanie Blue	abf17c6ef4	[ty] Add short-circuits for union type relation checks - Short-circuit union-vs-union comparisons when both sides are identical - Add fast membership check before full relation checking when comparing a type against a union	2025-12-18 20:24:18 -06:00
Zanie Blue	b9f65213d0	[ty] Cache `Type::is_assignable_to` Add salsa caching to `Type::is_assignable_to` to memoize repeated assignability checks.	2025-12-18 20:24:03 -06:00
Zanie Blue	ff2553665c	[ty] Cache `ClassType::is_subclass_of` Add salsa caching to `ClassType::is_subclass_of` to avoid repeated MRO traversals when checking class relationships.	2025-12-18 20:23:28 -06:00
Zanie Blue	8ebbe6b0f6	Invert case	2025-12-18 18:35:38 -06:00
Zanie Blue	6bc88c90b2	[ty] Cache `Type::is_disjoint_from`	2025-12-18 18:35:38 -06:00
Zanie Blue	3c694c7d86	[ty] Cache `Type::is_subtype_of`	2025-12-18 18:35:38 -06:00
Zanie Blue	1603948aae	[ty] Cache `ClassType::nearest_disjoint_base`	2025-12-18 18:35:38 -06:00
Micha Reiser	cb6ba23b0a	More lazy negated computations	2025-12-18 18:32:39 -06:00
Micha Reiser	a918833d19	Defer insertion	2025-12-18 18:32:39 -06:00
Micha Reiser	bcf9295973	[ty] Small union builder nits	2025-12-18 18:32:39 -06:00