update handle_unary_op_comment docs

factor out has_parenthesis_between, add some docs
try a different approach
2025-11-14 17:42:47 -05:00 · 2025-11-14 15:50:33 -05:00 · 2025-11-13 10:09:37 -05:00 · 2025-11-13 09:37:15 -05:00 · 2025-11-12 15:33:48 -05:00 · 2025-11-12 15:33:48 -05:00
822 changed files with 14673 additions and 257776 deletions
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -2,11 +2,12 @@
  $schema: "https://docs.renovatebot.com/renovate-schema.json",
  dependencyDashboard: true,
  suppressNotifications: ["prEditedNotification"],
-  extends: ["github>astral-sh/renovate-config"],
+  extends: ["config:recommended"],
  labels: ["internal"],
  schedule: ["before 4am on Monday"],
  semanticCommits: "disabled",
  separateMajorMinor: false,
+  prHourlyLimit: 10,
  enabledManagers: ["github-actions", "pre-commit", "cargo", "pep621", "pip_requirements", "npm"],
  cargo: {
    // See https://docs.renovatebot.com/configuration-options/#rangestrategy
@@ -15,7 +16,7 @@
  pep621: {
    // The default for this package manager is to only search for `pyproject.toml` files
    // found at the repository root: https://docs.renovatebot.com/modules/manager/pep621/#file-matching
-    managerFilePatterns: ["^(python|scripts)/.*pyproject\\.toml$"],
+    fileMatch: ["^(python|scripts)/.*pyproject\\.toml$"],
  },
  pip_requirements: {
    // The default for this package manager is to run on all requirements.txt files:
@@ -33,7 +34,7 @@
  npm: {
    // The default for this package manager is to only search for `package.json` files
    // found at the repository root: https://docs.renovatebot.com/modules/manager/npm/#file-matching
-    managerFilePatterns: ["^playground/.*package\\.json$"],
+    fileMatch: ["^playground/.*package\\.json$"],
  },
  "pre-commit": {
    enabled: true,
@@ -75,6 +76,14 @@
      matchManagers: ["cargo"],
      enabled: false,
    },
+    {
+      // `mkdocs-material` requires a manual update to keep the version in sync
+      // with `mkdocs-material-insider`.
+      // See: https://squidfunk.github.io/mkdocs-material/insiders/upgrade/
+      matchManagers: ["pip_requirements"],
+      matchPackageNames: ["mkdocs-material"],
+      enabled: false,
+    },
    {
      groupName: "pre-commit dependencies",
      matchManagers: ["pre-commit"],
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -43,7 +43,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
@@ -72,7 +72,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -114,7 +114,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: arm64
@@ -170,7 +170,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.platform.arch }}
@@ -223,7 +223,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -300,7 +300,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
@@ -365,7 +365,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -431,7 +431,7 @@ jobs:
        with:
          submodules: recursive
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,8 +24,6 @@ env:
  PACKAGE_NAME: ruff
  PYTHON_VERSION: "3.14"
  NEXTEST_PROFILE: ci
-  # Enable mdtests that require external dependencies
-  MDTEST_EXTERNAL: "1"

 jobs:
  determine_changes:
@@ -232,7 +230,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -254,7 +252,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          shared-key: ruff-linux-debug
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -263,15 +261,15 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
        with:
          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
@@ -286,10 +284,6 @@ jobs:
        run: cargo insta test --all-features --unreferenced reject --test-runner nextest
      - name: Dogfood ty on py-fuzzer
        run: uv run --project=./python/py-fuzzer cargo run -p ty check --project=./python/py-fuzzer
-      - name: Dogfood ty on the scripts directory
-        run: uv run --project=./scripts cargo run -p ty check --project=./scripts
-      - name: Dogfood ty on ty_benchmark
-        run: uv run --project=./scripts/ty_benchmark cargo run -p ty check --project=./scripts/ty_benchmark
      # Check for broken links in the documentation.
      - run: cargo doc --all --no-deps
        env:
@@ -317,7 +311,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -325,17 +319,19 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-nextest
+      - name: "Install cargo insta"
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
+        with:
+          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
        with:
          enable-cache: "true"
      - name: "Run tests"
-        run: cargo nextest run --cargo-profile profiling --all-features
-      - name: "Run doctests"
-        run: cargo test --doc --profile profiling --all-features
+        run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest

  cargo-test-other:
    strategy:
@@ -352,17 +348,17 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -380,7 +376,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -417,7 +413,7 @@ jobs:
        with:
          file: "Cargo.toml"
          field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -441,7 +437,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "fuzz -> target"
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -450,7 +446,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
+        uses: cargo-bins/cargo-binstall@ae04fb5e853ae6cd3ad7de4a1d554a8b646d12aa # v1.15.11
      - 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
@@ -468,8 +464,8 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          shared-key: ruff-linux-debug
          save-if: false
@@ -500,10 +496,10 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -538,7 +534,7 @@ jobs:
          ref: ${{ github.event.pull_request.base.ref }}
          persist-credentials: false

-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          activate-environment: true
@@ -549,7 +545,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          shared-key: ruff-linux-debug
          save-if: false
@@ -644,8 +640,8 @@ jobs:
        with:
          fetch-depth: 0
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -690,7 +686,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
+      - uses: cargo-bins/cargo-binstall@ae04fb5e853ae6cd3ad7de4a1d554a8b646d12aa # v1.15.11
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -703,8 +699,8 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -725,11 +721,11 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Prep README.md"
@@ -754,8 +750,8 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -781,21 +777,32 @@ jobs:
    name: "mkdocs"
    runs-on: ubuntu-latest
    timeout-minutes: 10
+    env:
+      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - name: "Add SSH key"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
        with:
          python-version: 3.13
          activate-environment: true
+      - name: "Install Insiders dependencies"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        run: uv pip install -r docs/requirements-insiders.txt
      - name: "Install dependencies"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
        run: uv pip install -r docs/requirements.txt
      - name: "Update README File"
        run: python scripts/transform_readme.py --target mkdocs
@@ -803,8 +810,12 @@ jobs:
        run: python scripts/generate_mkdocs.py
      - name: "Check docs formatting"
        run: python scripts/check_docs_formatted.py
+      - name: "Build Insiders docs"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        run: mkdocs build --strict -f mkdocs.insiders.yml
      - name: "Build docs"
-        run: mkdocs build --strict -f mkdocs.yml
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
+        run: mkdocs build --strict -f mkdocs.public.yml

  check-formatter-instability-and-black-similarity:
    name: "formatter instabilities and black similarity"
@@ -816,7 +827,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
@@ -844,7 +855,7 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          shared-key: ruff-linux-debug
          save-if: false
@@ -862,7 +873,7 @@ jobs:
          repository: "astral-sh/ruff-lsp"
          path: ruff-lsp

-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          # installation fails on 3.13 and newer
          python-version: "3.12"
@@ -895,7 +906,7 @@ jobs:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -905,7 +916,7 @@ jobs:
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
-        run: npm ci --ignore-scripts
+        run: npm ci
        working-directory: playground
      - name: "Build playgrounds"
        run: npm run dev:wasm
@@ -929,25 +940,22 @@ jobs:
        needs.determine_changes.outputs.linter == '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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

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

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-codspeed

@@ -955,10 +963,11 @@ jobs:
        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@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@bb005fe1c1eea036d3894f02c049cb6b154a1c27 # v4.3.3
        with:
-          mode: simulation
+          mode: instrumentation
          run: cargo codspeed run
+          token: ${{ secrets.CODSPEED_TOKEN }}

  benchmarks-instrumented-ty:
    name: "benchmarks instrumented (ty)"
@@ -971,25 +980,22 @@ jobs:
        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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false

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

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-codspeed

@@ -997,10 +1003,11 @@ jobs:
        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@bb005fe1c1eea036d3894f02c049cb6b154a1c27 # v4.3.3
        with:
-          mode: simulation
+          mode: instrumentation
          run: cargo codspeed run
+          token: ${{ secrets.CODSPEED_TOKEN }}

  benchmarks-walltime:
    name: "benchmarks walltime (${{ matrix.benchmarks }})"
@@ -1008,9 +1015,6 @@ jobs:
    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:
        benchmarks:
@@ -1022,16 +1026,16 @@ jobs:
        with:
          persist-credentials: false

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

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

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-codspeed

@@ -1039,7 +1043,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@bb005fe1c1eea036d3894f02c049cb6b154a1c27 # v4.3.3
        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
@@ -1048,3 +1052,4 @@ jobs:
        with:
          mode: walltime
          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
+          token: ${{ secrets.CODSPEED_TOKEN }}
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,12 +34,12 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
        # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -43,9 +43,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

@@ -55,7 +55,6 @@ jobs:
      - name: Run mypy_primer
        env:
          PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
-          CLICOLOR_FORCE: "1"
          DIFF_FILE: mypy_primer.diff
        run: |
          cd ruff
@@ -81,9 +80,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -20,13 +20,15 @@ on:
 jobs:
  mkdocs:
    runs-on: ubuntu-latest
+    env:
+      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: true

-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: 3.12

@@ -57,12 +59,23 @@ jobs:
          echo "branch_name=update-docs-$branch_display_name-$timestamp" >> "$GITHUB_ENV"
          echo "timestamp=$timestamp" >> "$GITHUB_ENV"

+      - name: "Add SSH key"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
+
      - name: "Install Rust toolchain"
        run: rustup show

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+
+      - name: "Install Insiders dependencies"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        run: pip install -r docs/requirements-insiders.txt

      - name: "Install dependencies"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
        run: pip install -r docs/requirements.txt

      - name: "Copy README File"
@@ -70,8 +83,13 @@ jobs:
          python scripts/transform_readme.py --target mkdocs
          python scripts/generate_mkdocs.py

+      - name: "Build Insiders docs"
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
+        run: mkdocs build --strict -f mkdocs.insiders.yml
+
      - name: "Build docs"
-        run: mkdocs build --strict -f mkdocs.yml
+        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
+        run: mkdocs build --strict -f mkdocs.public.yml

      - name: "Clone docs repo"
        run: git clone https://${{ secrets.ASTRAL_DOCS_PAT }}@github.com/astral-sh/docs.git astral-docs
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -37,7 +37,7 @@ jobs:
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
-        run: npm ci --ignore-scripts
+        run: npm ci
        working-directory: playground
      - name: "Run TypeScript checks"
        run: npm run check
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          pattern: wheels-*
--- a/.github/workflows/publish-ty-playground.yml
+++ b/.github/workflows/publish-ty-playground.yml
@@ -41,7 +41,7 @@ jobs:
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
-        run: npm ci --ignore-scripts
+        run: npm ci
        working-directory: playground
      - name: "Run TypeScript checks"
        run: npm run check
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
        with:
          persist-credentials: false
          submodules: recursive
@@ -123,7 +123,7 @@ jobs:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
        with:
          persist-credentials: false
          submodules: recursive
@@ -174,7 +174,7 @@ jobs:
    outputs:
      val: ${{ steps.host.outputs.manifest }}
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
        with:
          persist-credentials: false
          submodules: recursive
@@ -250,7 +250,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
        with:
          persist-credentials: false
          submodules: recursive
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -77,7 +77,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -131,7 +131,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -170,7 +170,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -198,7 +198,7 @@ jobs:
        run: |
          rm "${VENDORED_TYPESHED}/pyproject.toml"
          git commit -am "Remove pyproject.toml file"
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        if: ${{ success() }}
        run: rustup show
@@ -207,22 +207,17 @@ jobs:
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
        if: ${{ success() }}
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
        if: ${{ success() }}
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        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`.
          #
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -33,11 +33,11 @@ jobs:
          persist-credentials: false

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

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

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"

          ecosystem-analyzer \
            --repository ruff \
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -29,11 +29,11 @@ jobs:
          persist-credentials: false

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

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

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"

          ecosystem-analyzer \
            --verbose \
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -45,7 +45,7 @@ jobs:
          path: typing
          persist-credentials: false

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,6 +5,5 @@
    "rust-analyzer.check.command": "clippy",
    "search.exclude": {
        "**/*.snap": true
-    },
-    "ty.diagnosticMode": "openFilesOnly"
+    }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,165 +1,5 @@
 # Changelog

-## 0.14.8
-
-Released on 2025-12-04.
-
-### Preview features
-
- \[`flake8-bugbear`\] Catch `yield` expressions within other statements (`B901`) ([#21200](https://github.com/astral-sh/ruff/pull/21200))
- \[`flake8-use-pathlib`\] Mark fixes unsafe for return type changes (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#21440](https://github.com/astral-sh/ruff/pull/21440))
-
-### Bug fixes
-
- Fix syntax error false positives for `await` outside functions ([#21763](https://github.com/astral-sh/ruff/pull/21763))
- \[`flake8-simplify`\] Fix truthiness assumption for non-iterable arguments in tuple/list/set calls (`SIM222`, `SIM223`) ([#21479](https://github.com/astral-sh/ruff/pull/21479))
-
-### Documentation
-
- Suggest using `--output-file` option in GitLab integration ([#21706](https://github.com/astral-sh/ruff/pull/21706))
-
-### Other changes
-
- [syntax-error] Default type parameter followed by non-default type parameter ([#21657](https://github.com/astral-sh/ruff/pull/21657))
-
-### Contributors
-
- [@kieran-ryan](https://github.com/kieran-ryan)
- [@11happy](https://github.com/11happy)
- [@danparizher](https://github.com/danparizher)
- [@ntBre](https://github.com/ntBre)
-
-## 0.14.7
-
-Released on 2025-11-28.
-
-### Preview features
-
- \[`flake8-bandit`\] Handle string literal bindings in suspicious-url-open-usage (`S310`) ([#21469](https://github.com/astral-sh/ruff/pull/21469))
- \[`pylint`\] Fix `PLR1708` false positives on nested functions ([#21177](https://github.com/astral-sh/ruff/pull/21177))
- \[`pylint`\] Fix suppression for empty dict without tuple key annotation (`PLE1141`) ([#21290](https://github.com/astral-sh/ruff/pull/21290))
- \[`ruff`\] Add rule `RUF066` to detect unnecessary class properties ([#21535](https://github.com/astral-sh/ruff/pull/21535))
- \[`ruff`\] Catch more dummy variable uses (`RUF052`) ([#19799](https://github.com/astral-sh/ruff/pull/19799))
-
-### Bug fixes
-
- [server] Set severity for non-rule diagnostics ([#21559](https://github.com/astral-sh/ruff/pull/21559))
- \[`flake8-implicit-str-concat`\] Avoid invalid fix in (`ISC003`) ([#21517](https://github.com/astral-sh/ruff/pull/21517))
- \[`parser`\] Fix panic when parsing IPython escape command expressions ([#21480](https://github.com/astral-sh/ruff/pull/21480))
-
-### CLI
-
- Show partial fixability indicator in statistics output ([#21513](https://github.com/astral-sh/ruff/pull/21513))
-
-### Contributors
-
- [@mikeleppane](https://github.com/mikeleppane)
- [@senekor](https://github.com/senekor)
- [@ShaharNaveh](https://github.com/ShaharNaveh)
- [@JumboBear](https://github.com/JumboBear)
- [@prakhar1144](https://github.com/prakhar1144)
- [@tsvikas](https://github.com/tsvikas)
- [@danparizher](https://github.com/danparizher)
- [@chirizxc](https://github.com/chirizxc)
- [@AlexWaygood](https://github.com/AlexWaygood)
- [@MichaReiser](https://github.com/MichaReiser)
-
-## 0.14.6
-
-Released on 2025-11-21.
-
-### Preview features
-
- \[`flake8-bandit`\] Support new PySNMP API paths (`S508`, `S509`) ([#21374](https://github.com/astral-sh/ruff/pull/21374))
-
-### Bug fixes
-
- Adjust own-line comment placement between branches ([#21185](https://github.com/astral-sh/ruff/pull/21185))
- Avoid syntax error when formatting attribute expressions with outer parentheses, parenthesized value, and trailing comment on value ([#20418](https://github.com/astral-sh/ruff/pull/20418))
- Fix panic when formatting comments in unary expressions ([#21501](https://github.com/astral-sh/ruff/pull/21501))
- Respect `fmt: skip` for compound statements on a single line ([#20633](https://github.com/astral-sh/ruff/pull/20633))
- \[`refurb`\] Fix `FURB103` autofix ([#21454](https://github.com/astral-sh/ruff/pull/21454))
- \[`ruff`\] Fix false positive for complex conversion specifiers in `logging-eager-conversion` (`RUF065`) ([#21464](https://github.com/astral-sh/ruff/pull/21464))
-
-### Rule changes
-
- \[`ruff`\] Avoid false positive on `ClassVar` reassignment (`RUF012`) ([#21478](https://github.com/astral-sh/ruff/pull/21478))
-
-### CLI
-
- Render hyperlinks for lint errors ([#21514](https://github.com/astral-sh/ruff/pull/21514))
- Add a `ruff analyze` option to skip over imports in `TYPE_CHECKING` blocks ([#21472](https://github.com/astral-sh/ruff/pull/21472))
-
-### Documentation
-
- Limit `eglot-format` hook to eglot-managed Python buffers ([#21459](https://github.com/astral-sh/ruff/pull/21459))
- Mention `force-exclude` in "Configuration > Python file discovery" ([#21500](https://github.com/astral-sh/ruff/pull/21500))
-
-### Contributors
-
- [@ntBre](https://github.com/ntBre)
- [@dylwil3](https://github.com/dylwil3)
- [@gauthsvenkat](https://github.com/gauthsvenkat)
- [@MichaReiser](https://github.com/MichaReiser)
- [@thamer](https://github.com/thamer)
- [@Ruchir28](https://github.com/Ruchir28)
- [@thejcannon](https://github.com/thejcannon)
- [@danparizher](https://github.com/danparizher)
- [@chirizxc](https://github.com/chirizxc)
-
-## 0.14.5
-
-Released on 2025-11-13.
-
-### Preview features
-
- \[`flake8-simplify`\] Apply `SIM113` when index variable is of type `int` ([#21395](https://github.com/astral-sh/ruff/pull/21395))
- \[`pydoclint`\] Fix false positive when Sphinx directives follow a "Raises" section (`DOC502`) ([#20535](https://github.com/astral-sh/ruff/pull/20535))
- \[`pydoclint`\] Support NumPy-style comma-separated parameters (`DOC102`) ([#20972](https://github.com/astral-sh/ruff/pull/20972))
- \[`refurb`\] Auto-fix annotated assignments (`FURB101`) ([#21278](https://github.com/astral-sh/ruff/pull/21278))
- \[`ruff`\] Ignore `str()` when not used for simple conversion (`RUF065`) ([#21330](https://github.com/astral-sh/ruff/pull/21330))
-
-### Bug fixes
-
- Fix syntax error false positive on alternative `match` patterns ([#21362](https://github.com/astral-sh/ruff/pull/21362))
- \[`flake8-simplify`\] Fix false positive for iterable initializers with generator arguments (`SIM222`) ([#21187](https://github.com/astral-sh/ruff/pull/21187))
- \[`pyupgrade`\] Fix false positive on relative imports from local `.builtins` module (`UP029`) ([#21309](https://github.com/astral-sh/ruff/pull/21309))
- \[`pyupgrade`\] Consistently set the deprecated tag (`UP035`) ([#21396](https://github.com/astral-sh/ruff/pull/21396))
-
-### Rule changes
-
- \[`refurb`\] Detect empty f-strings (`FURB105`) ([#21348](https://github.com/astral-sh/ruff/pull/21348))
-
-### CLI
-
- Add option to provide a reason to `--add-noqa` ([#21294](https://github.com/astral-sh/ruff/pull/21294))
- Add upstream linter URL to `ruff linter --output-format=json` ([#21316](https://github.com/astral-sh/ruff/pull/21316))
- Add color to `--help` ([#21337](https://github.com/astral-sh/ruff/pull/21337))
-
-### Documentation
-
- Add a new "Opening a PR" section to the contribution guide ([#21298](https://github.com/astral-sh/ruff/pull/21298))
- Added the PyScripter IDE to the list of "Who is using Ruff?" ([#21402](https://github.com/astral-sh/ruff/pull/21402))
- Update PyCharm setup instructions ([#21409](https://github.com/astral-sh/ruff/pull/21409))
- \[`flake8-annotations`\] Add link to `allow-star-arg-any` option (`ANN401`) ([#21326](https://github.com/astral-sh/ruff/pull/21326))
-
-### Other changes
-
- \[`configuration`\] Improve error message when `line-length` exceeds `u16::MAX` ([#21329](https://github.com/astral-sh/ruff/pull/21329))
-
-### Contributors
-
- [@njhearp](https://github.com/njhearp)
- [@11happy](https://github.com/11happy)
- [@hugovk](https://github.com/hugovk)
- [@Gankra](https://github.com/Gankra)
- [@ntBre](https://github.com/ntBre)
- [@pyscripter](https://github.com/pyscripter)
- [@danparizher](https://github.com/danparizher)
- [@MichaReiser](https://github.com/MichaReiser)
- [@henryiii](https://github.com/henryiii)
- [@charliecloudberry](https://github.com/charliecloudberry)
-
 ## 0.14.4

 Released on 2025-11-06.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -331,6 +331,13 @@ you addressed them.

 ## MkDocs

+> [!NOTE]
+>
+> The documentation uses Material for MkDocs Insiders, which is closed-source software.
+> This means only members of the Astral organization can preview the documentation exactly as it
+> will appear in production.
+> Outside contributors can still preview the documentation, but there will be some differences. Consult [the Material for MkDocs documentation](https://squidfunk.github.io/mkdocs-material/insiders/benefits/#features) for which features are exclusively available in the insiders version.
+
 To preview any changes to the documentation locally:

 1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
@@ -344,7 +351,11 @@ To preview any changes to the documentation locally:
 1. Run the development server with:

    ```shell
-    uvx --with-requirements docs/requirements.txt -- mkdocs serve -f mkdocs.yml
+    # For contributors.
+    uvx --with-requirements docs/requirements.txt -- mkdocs serve -f mkdocs.public.yml
+
+    # For members of the Astral org, which has access to MkDocs Insiders via sponsorship.
+    uvx --with-requirements docs/requirements-insiders.txt -- mkdocs serve -f mkdocs.insiders.yml
    ```

 The documentation should then be available locally at
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -442,9 +442,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.53"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -452,9 +452,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.53"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 dependencies = [
 "anstream",
 "anstyle",
@@ -642,7 +642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

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

 [[package]]
@@ -1016,7 +1016,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

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

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

 [[package]]
 name = "get-size-derive2"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff47daa61505c85af126e9dd64af6a342a33dc0cccfe1be74ceadc7d352e6efd"
+checksum = "46b134aa084df7c3a513a1035c52f623e4b3065dfaf3d905a4f28a2e79b5bb3f"
 dependencies = [
 "attribute-derive",
 "quote",
@@ -1249,14 +1249,13 @@ dependencies = [

 [[package]]
 name = "get-size2"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7bb8710e1f09672102be7ddf39f764d8440ae74a9f4e30aaa4820dcdffa4af"
+checksum = "c0d51c9f2e956a517619ad9e7eaebc7a573f9c49b38152e12eade750f89156f9"
 dependencies = [
 "compact_str",
 "get-size-derive2",
- "hashbrown 0.16.1",
- "indexmap",
+ "hashbrown 0.16.0",
 "smallvec",
 ]

@@ -1353,9 +1352,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 dependencies = [
 "equivalent",
 ]
@@ -1564,21 +1563,21 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
 "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
 "serde",
 "serde_core",
 ]

 [[package]]
 name = "indicatif"
-version = "0.18.3"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88"
+checksum = "ade6dfcba0dfb62ad59e59e7241ec8912af34fd29e0e743e3db992bd278e8b65"
 dependencies = [
 "console 0.16.1",
 "portable-atomic",
@@ -1699,7 +1698,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi",
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -1763,7 +1762,7 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde_core",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -2607,9 +2606,9 @@ dependencies = [

 [[package]]
 name = "quick-junit"
-version = "0.5.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee9342d671fae8d66b3ae9fd7a9714dfd089c04d2a8b1ec0436ef77aee15e5f"
+checksum = "3ed1a693391a16317257103ad06a88c6529ac640846021da7c435a06fffdacd7"
 dependencies = [
 "chrono",
 "indexmap",
@@ -2622,9 +2621,9 @@ dependencies = [

 [[package]]
 name = "quick-xml"
-version = "0.38.4"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
 "memchr",
 ]
@@ -2859,7 +2858,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.14.8"
+version = "0.14.4"
 dependencies = [
 "anyhow",
 "argfile",
@@ -3005,7 +3004,6 @@ dependencies = [
 "serde",
 "serde_json",
 "similar",
- "supports-hyperlinks",
 "tempfile",
 "thiserror 2.0.17",
 "tracing",
@@ -3117,18 +3115,17 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.14.8"
+version = "0.14.4"
 dependencies = [
 "aho-corasick",
 "anyhow",
 "bitflags 2.10.0",
 "clap",
 "colored 3.0.0",
- "compact_str",
 "fern",
 "glob",
 "globset",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
 "imperative",
 "insta",
 "is-macro",
@@ -3473,7 +3470,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.14.8"
+version = "0.14.4"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3571,7 +3568,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3589,7 +3586,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3613,12 +3610,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"

 [[package]]
 name = "salsa-macros"
 version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0#59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=05a9af7f554b64b8aadc2eeb6f2caf73d0408d09#05a9af7f554b64b8aadc2eeb6f2caf73d0408d09"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3928,17 +3925,11 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "supports-hyperlinks"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
-
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3972,7 +3963,7 @@ dependencies = [
 "getrandom 0.3.4",
 "once_cell",
 "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -4217,9 +4208,9 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"

 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
 "log",
 "pin-project-lite",
@@ -4229,9 +4220,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.31"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4240,9 +4231,9 @@ dependencies = [

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

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
 "chrono",
 "matchers",
@@ -4463,7 +4454,7 @@ dependencies = [
 "drop_bomb",
 "get-size2",
 "glob",
- "hashbrown 0.16.1",
+ "hashbrown 0.16.0",
 "indexmap",
 "indoc",
 "insta",
@@ -4475,7 +4466,6 @@ dependencies = [
 "quickcheck_macros",
 "ruff_annotate_snippets",
 "ruff_db",
- "ruff_diagnostics",
 "ruff_index",
 "ruff_macros",
 "ruff_memory_usage",
@@ -4521,7 +4511,6 @@ dependencies = [
 "lsp-types",
 "regex",
 "ruff_db",
- "ruff_diagnostics",
 "ruff_macros",
 "ruff_notebook",
 "ruff_python_ast",
@@ -4532,7 +4521,6 @@ dependencies = [
 "serde",
 "serde_json",
 "shellexpand",
- "smallvec",
 "tempfile",
 "thiserror 2.0.17",
 "tracing",
@@ -4557,13 +4545,11 @@ dependencies = [
 "anyhow",
 "camino",
 "colored 3.0.0",
- "dunce",
 "insta",
 "memchr",
 "path-slash",
 "regex",
 "ruff_db",
- "ruff_diagnostics",
 "ruff_index",
 "ruff_notebook",
 "ruff_python_ast",
@@ -4605,7 +4591,6 @@ dependencies = [
 "js-sys",
 "log",
 "ruff_db",
- "ruff_diagnostics",
 "ruff_notebook",
 "ruff_python_formatter",
 "ruff_source_file",
@@ -5026,7 +5011,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -146,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 = "59aa1075e837f5deb0d6ffb24b68fedc0f4bc5e0", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "05a9af7f554b64b8aadc2eeb6f2caf73d0408d09", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
@@ -173,7 +173,6 @@ snapbox = { version = "0.6.0", features = [
 static_assertions = "1.1.0"
 strum = { version = "0.27.0", features = ["strum_macros"] }
 strum_macros = { version = "0.27.0" }
-supports-hyperlinks = { version = "3.1.0" }
 syn = { version = "2.0.55" }
 tempfile = { version = "3.9.0" }
 test-case = { version = "3.3.1" }
@@ -272,12 +271,6 @@ large_stack_arrays = "allow"
 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.
--- a/README.md
+++ b/README.md
@@ -147,8 +147,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

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

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -181,7 +181,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.14.8
+  rev: v0.14.4
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.14.8"
+version = "0.14.4"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff/src/args.rs
+++ b/crates/ruff/src/args.rs
@@ -167,7 +167,6 @@ pub enum AnalyzeCommand {
 }

 #[derive(Clone, Debug, clap::Parser)]
-#[expect(clippy::struct_excessive_bools)]
 pub struct AnalyzeGraphCommand {
    /// List of files or directories to include.
    #[clap(help = "List of files or directories to include [default: .]")]
@@ -194,12 +193,6 @@ pub struct AnalyzeGraphCommand {
    /// Path to a virtual environment to use for resolving additional dependencies
    #[arg(long)]
    python: Option<PathBuf>,
-    /// Include imports that are only used for type checking (i.e., imports within `if TYPE_CHECKING:` blocks).
-    /// Use `--no-type-checking-imports` to exclude imports that are only used for type checking.
-    #[arg(long, overrides_with("no_type_checking_imports"))]
-    type_checking_imports: bool,
-    #[arg(long, overrides_with("type_checking_imports"), hide = true)]
-    no_type_checking_imports: bool,
 }

 // The `Parser` derive is for ruff_dev, for ruff `Args` would be sufficient
@@ -846,10 +839,6 @@ impl AnalyzeGraphCommand {
            string_imports_min_dots: self.min_dots,
            preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
            target_version: self.target_version.map(ast::PythonVersion::from),
-            type_checking_imports: resolve_bool_arg(
-                self.type_checking_imports,
-                self.no_type_checking_imports,
-            ),
            ..ExplicitConfigOverrides::default()
        };

@@ -1346,7 +1335,6 @@ struct ExplicitConfigOverrides {
    extension: Option<Vec<ExtensionPair>>,
    detect_string_imports: Option<bool>,
    string_imports_min_dots: Option<usize>,
-    type_checking_imports: Option<bool>,
 }

 impl ConfigurationTransformer for ExplicitConfigOverrides {
@@ -1437,9 +1425,6 @@ impl ConfigurationTransformer for ExplicitConfigOverrides {
        if let Some(string_imports_min_dots) = &self.string_imports_min_dots {
            config.analyze.string_imports_min_dots = Some(*string_imports_min_dots);
        }
-        if let Some(type_checking_imports) = &self.type_checking_imports {
-            config.analyze.type_checking_imports = Some(*type_checking_imports);
-        }

        config
    }
--- a/crates/ruff/src/commands/analyze_graph.rs
+++ b/crates/ruff/src/commands/analyze_graph.rs
@@ -105,7 +105,6 @@ pub(crate) fn analyze_graph(
                let settings = resolver.resolve(path);
                let string_imports = settings.analyze.string_imports;
                let include_dependencies = settings.analyze.include_dependencies.get(path).cloned();
-                let type_checking_imports = settings.analyze.type_checking_imports;

                // Skip excluded files.
                if (settings.file_resolver.force_exclude || !resolved_file.is_root())
@@ -168,7 +167,6 @@ pub(crate) fn analyze_graph(
                        &path,
                        package.as_deref(),
                        string_imports,
-                        type_checking_imports,
                    )
                    .unwrap_or_else(|err| {
                        warn!("Failed to generate import map for {path}: {err}");
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -34,21 +34,9 @@ struct ExpandedStatistics<'a> {
    code: Option<&'a SecondaryCode>,
    name: &'static str,
    count: usize,
-    #[serde(rename = "fixable")]
-    all_fixable: bool,
-    fixable_count: usize,
+    fixable: bool,
 }

-impl ExpandedStatistics<'_> {
-    fn any_fixable(&self) -> bool {
-        self.fixable_count > 0
-    }
-}
-
-/// Accumulator type for grouping diagnostics by code.
-/// Format: (`code`, `representative_diagnostic`, `total_count`, `fixable_count`)
-type DiagnosticGroup<'a> = (Option<&'a SecondaryCode>, &'a Diagnostic, usize, usize);
-
 pub(crate) struct Printer {
    format: OutputFormat,
    log_level: LogLevel,
@@ -145,7 +133,7 @@ impl Printer {
                        if fixables.applicable > 0 {
                            writeln!(
                                writer,
-                                "{fix_prefix} {} fixable with the `--fix` option.",
+                                "{fix_prefix} {} fixable with the --fix option.",
                                fixables.applicable
                            )?;
                        }
@@ -268,41 +256,35 @@ impl Printer {
        diagnostics: &Diagnostics,
        writer: &mut dyn Write,
    ) -> Result<()> {
-        let required_applicability = self.unsafe_fixes.required_applicability();
        let statistics: Vec<ExpandedStatistics> = diagnostics
            .inner
            .iter()
-            .sorted_by_key(|diagnostic| diagnostic.secondary_code())
-            .fold(vec![], |mut acc: Vec<DiagnosticGroup>, diagnostic| {
-                let is_fixable = diagnostic
-                    .fix()
-                    .is_some_and(|fix| fix.applies(required_applicability));
-                let code = diagnostic.secondary_code();
-
-                if let Some((prev_code, _prev_message, count, fixable_count)) = acc.last_mut() {
-                    if *prev_code == code {
-                        *count += 1;
-                        if is_fixable {
-                            *fixable_count += 1;
+            .map(|message| (message.secondary_code(), message))
+            .sorted_by_key(|(code, message)| (*code, message.fixable()))
+            .fold(
+                vec![],
+                |mut acc: Vec<((Option<&SecondaryCode>, &Diagnostic), usize)>, (code, message)| {
+                    if let Some(((prev_code, _prev_message), count)) = acc.last_mut() {
+                        if *prev_code == code {
+                            *count += 1;
+                            return acc;
                        }
-                        return acc;
                    }
-                }
-                acc.push((code, diagnostic, 1, usize::from(is_fixable)));
-                acc
-            })
-            .iter()
-            .map(
-                |&(code, message, count, fixable_count)| ExpandedStatistics {
-                    code,
-                    name: message.name(),
-                    count,
-                    // Backward compatibility: `fixable` is true only when all violations are fixable.
-                    // See: https://github.com/astral-sh/ruff/pull/21513
-                    all_fixable: fixable_count == count,
-                    fixable_count,
+                    acc.push(((code, message), 1));
+                    acc
                },
            )
+            .iter()
+            .map(|&((code, message), count)| ExpandedStatistics {
+                code,
+                name: message.name(),
+                count,
+                fixable: if let Some(fix) = message.fix() {
+                    fix.applies(self.unsafe_fixes.required_applicability())
+                } else {
+                    false
+                },
+            })
            .sorted_by_key(|statistic| Reverse(statistic.count))
            .collect();

@@ -326,14 +308,13 @@ impl Printer {
                    .map(|statistic| statistic.code.map_or(0, |s| s.len()))
                    .max()
                    .unwrap();
-                let any_fixable = statistics.iter().any(ExpandedStatistics::any_fixable);
+                let any_fixable = statistics.iter().any(|statistic| statistic.fixable);

-                let all_fixable = format!("[{}] ", "*".cyan());
-                let partially_fixable = format!("[{}] ", "-".cyan());
+                let fixable = format!("[{}] ", "*".cyan());
                let unfixable = "[ ] ";

                // By default, we mimic Flake8's `--statistics` format.
-                for statistic in &statistics {
+                for statistic in statistics {
                    writeln!(
                        writer,
                        "{:>count_width$}\t{:<code_width$}\t{}{}",
@@ -345,10 +326,8 @@ impl Printer {
                            .red()
                            .bold(),
                        if any_fixable {
-                            if statistic.all_fixable {
-                                &all_fixable
-                            } else if statistic.any_fixable() {
-                                &partially_fixable
+                            if statistic.fixable {
+                                &fixable
                            } else {
                                unfixable
                            }
--- a/crates/ruff/tests/cli/analyze_graph.rs
+++ b/crates/ruff/tests/cli/analyze_graph.rs
@@ -1,193 +0,0 @@
-use std::process::Command;
-
-use insta_cmd::assert_cmd_snapshot;
-
-use crate::CliTest;
-
-#[test]
-fn type_checking_imports() -> anyhow::Result<()> {
-    let test = AnalyzeTest::with_files([
-        ("ruff/__init__.py", ""),
-        (
-            "ruff/a.py",
-            r#"
-            from typing import TYPE_CHECKING
-
-            import ruff.b
-
-            if TYPE_CHECKING:
-                import ruff.c
-        "#,
-        ),
-        (
-            "ruff/b.py",
-            r#"
-            if TYPE_CHECKING:
-                from ruff import c
-            "#,
-        ),
-        ("ruff/c.py", ""),
-    ])?;
-
-    assert_cmd_snapshot!(test.command(), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-      "ruff/__init__.py": [],
-      "ruff/a.py": [
-        "ruff/b.py",
-        "ruff/c.py"
-      ],
-      "ruff/b.py": [
-        "ruff/c.py"
-      ],
-      "ruff/c.py": []
-    }
-
-    ----- stderr -----
-    "###);
-
-    assert_cmd_snapshot!(
-        test.command()
-            .arg("--no-type-checking-imports"),
-        @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-      "ruff/__init__.py": [],
-      "ruff/a.py": [
-        "ruff/b.py"
-      ],
-      "ruff/b.py": [],
-      "ruff/c.py": []
-    }
-
-    ----- stderr -----
-    "###
-    );
-
-    Ok(())
-}
-
-#[test]
-fn type_checking_imports_from_config() -> anyhow::Result<()> {
-    let test = AnalyzeTest::with_files([
-        ("ruff/__init__.py", ""),
-        (
-            "ruff/a.py",
-            r#"
-            from typing import TYPE_CHECKING
-
-            import ruff.b
-
-            if TYPE_CHECKING:
-                import ruff.c
-        "#,
-        ),
-        (
-            "ruff/b.py",
-            r#"
-            if TYPE_CHECKING:
-                from ruff import c
-            "#,
-        ),
-        ("ruff/c.py", ""),
-        (
-            "ruff.toml",
-            r#"
-            [analyze]
-            type-checking-imports = false
-            "#,
-        ),
-    ])?;
-
-    assert_cmd_snapshot!(test.command(), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-      "ruff/__init__.py": [],
-      "ruff/a.py": [
-        "ruff/b.py"
-      ],
-      "ruff/b.py": [],
-      "ruff/c.py": []
-    }
-
-    ----- stderr -----
-    "###);
-
-    test.write_file(
-        "ruff.toml",
-        r#"
-        [analyze]
-        type-checking-imports = true
-        "#,
-    )?;
-
-    assert_cmd_snapshot!(test.command(), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-      "ruff/__init__.py": [],
-      "ruff/a.py": [
-        "ruff/b.py",
-        "ruff/c.py"
-      ],
-      "ruff/b.py": [
-        "ruff/c.py"
-      ],
-      "ruff/c.py": []
-    }
-
-    ----- stderr -----
-    "###
-    );
-
-    Ok(())
-}
-
-struct AnalyzeTest {
-    cli_test: CliTest,
-}
-
-impl AnalyzeTest {
-    pub(crate) fn new() -> anyhow::Result<Self> {
-        Ok(Self {
-            cli_test: CliTest::with_settings(|_, mut settings| {
-                settings.add_filter(r#"\\\\"#, "/");
-                settings
-            })?,
-        })
-    }
-
-    fn with_files<'a>(files: impl IntoIterator<Item = (&'a str, &'a str)>) -> anyhow::Result<Self> {
-        let case = Self::new()?;
-        case.write_files(files)?;
-        Ok(case)
-    }
-
-    #[expect(unused)]
-    fn with_file(path: impl AsRef<std::path::Path>, content: &str) -> anyhow::Result<Self> {
-        let fixture = Self::new()?;
-        fixture.write_file(path, content)?;
-        Ok(fixture)
-    }
-
-    fn command(&self) -> Command {
-        let mut command = self.cli_test.command();
-        command.arg("analyze").arg("graph").arg("--preview");
-        command
-    }
-}
-
-impl std::ops::Deref for AnalyzeTest {
-    type Target = CliTest;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cli_test
-    }
-}
--- a/crates/ruff/tests/cli/lint.rs
+++ b/crates/ruff/tests/cli/lint.rs
@@ -1440,78 +1440,6 @@ def function():
    Ok(())
 }

-#[test]
-fn ignore_noqa() -> Result<()> {
-    let fixture = CliTest::new()?;
-    fixture.write_file(
-        "ruff.toml",
-        r#"
-[lint]
-select = ["F401"]
-"#,
-    )?;
-
-    fixture.write_file(
-        "noqa.py",
-        r#"
-import os  # noqa: F401
-
-# ruff: disable[F401]
-import sys
-"#,
-    )?;
-
-    // without --ignore-noqa
-    assert_cmd_snapshot!(fixture
-        .check_command()
-        .args(["--config", "ruff.toml"])
-        .arg("noqa.py"),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    noqa.py:5:8: F401 [*] `sys` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-
-    assert_cmd_snapshot!(fixture
-        .check_command()
-        .args(["--config", "ruff.toml"])
-        .arg("noqa.py")
-        .args(["--preview"]),
-        @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-
-    // with --ignore-noqa --preview
-    assert_cmd_snapshot!(fixture
-        .check_command()
-        .args(["--config", "ruff.toml"])
-        .arg("noqa.py")
-        .args(["--ignore-noqa", "--preview"]),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    noqa.py:2:8: F401 [*] `os` imported but unused
-    noqa.py:5:8: F401 [*] `sys` imported but unused
-    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-
-    Ok(())
-}
-
 #[test]
 fn add_noqa() -> Result<()> {
    let fixture = CliTest::new()?;
@@ -1704,100 +1632,6 @@ def unused(x):  # noqa: ANN001, ARG001, D103
    Ok(())
 }

-#[test]
-fn add_noqa_existing_file_level_noqa() -> Result<()> {
-    let fixture = CliTest::new()?;
-    fixture.write_file(
-        "ruff.toml",
-        r#"
-[lint]
-select = ["F401"]
-"#,
-    )?;
-
-    fixture.write_file(
-        "noqa.py",
-        r#"
-# ruff: noqa F401
-import os
-"#,
-    )?;
-
-    assert_cmd_snapshot!(fixture
-        .check_command()
-        .args(["--config", "ruff.toml"])
-        .arg("noqa.py")
-        .arg("--preview")
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    ");
-
-    let test_code =
-        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    # ruff: noqa F401
-    import os
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn add_noqa_existing_range_suppression() -> Result<()> {
-    let fixture = CliTest::new()?;
-    fixture.write_file(
-        "ruff.toml",
-        r#"
-[lint]
-select = ["F401"]
-"#,
-    )?;
-
-    fixture.write_file(
-        "noqa.py",
-        r#"
-# ruff: disable[F401]
-import os
-"#,
-    )?;
-
-    assert_cmd_snapshot!(fixture
-        .check_command()
-        .args(["--config", "ruff.toml"])
-        .arg("noqa.py")
-        .arg("--preview")
-        .args(["--add-noqa"])
-        .arg("-")
-        .pass_stdin(r#"
-
-"#), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    ");
-
-    let test_code =
-        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");
-
-    insta::assert_snapshot!(test_code, @r"
-    # ruff: disable[F401]
-    import os
-    ");
-
-    Ok(())
-}
-
 #[test]
 fn add_noqa_multiline_comment() -> Result<()> {
    let fixture = CliTest::new()?;
--- a/crates/ruff/tests/cli/main.rs
+++ b/crates/ruff/tests/cli/main.rs
@@ -15,7 +15,6 @@ use std::{
 };
 use tempfile::TempDir;

-mod analyze_graph;
 mod format;
 mod lint;

@@ -63,7 +62,9 @@ impl CliTest {
        files: impl IntoIterator<Item = (&'a str, &'a str)>,
    ) -> anyhow::Result<Self> {
        let case = Self::new()?;
-        case.write_files(files)?;
+        for file in files {
+            case.write_file(file.0, file.1)?;
+        }
        Ok(case)
    }

@@ -152,16 +153,6 @@ impl CliTest {
        Ok(())
    }

-    pub(crate) fn write_files<'a>(
-        &self,
-        files: impl IntoIterator<Item = (&'a str, &'a str)>,
-    ) -> Result<()> {
-        for file in files {
-            self.write_file(file.0, file.1)?;
-        }
-        Ok(())
-    }
-
    /// Returns the path to the test directory root.
    pub(crate) fn root(&self) -> &Path {
        &self.project_dir
--- 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
@@ -9,6 +9,7 @@ info:
    - concise
    - "--show-settings"
    - test.py
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -283,6 +284,5 @@ analyze.target_version = 3.10
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
@@ -12,6 +12,7 @@ info:
    - UP007
    - test.py
    - "-"
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -285,6 +286,5 @@ analyze.target_version = 3.11
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- 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
@@ -13,6 +13,7 @@ info:
    - UP007
    - test.py
    - "-"
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -287,6 +288,5 @@ analyze.target_version = 3.11
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- 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
@@ -14,6 +14,7 @@ info:
    - py310
    - test.py
    - "-"
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -287,6 +288,5 @@ analyze.target_version = 3.10
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
@@ -11,6 +11,7 @@ info:
    - "--select"
    - UP007
    - foo/test.py
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -284,6 +285,5 @@ analyze.target_version = 3.11
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- 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
@@ -11,6 +11,7 @@ info:
    - "--select"
    - UP007
    - foo/test.py
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -284,6 +285,5 @@ analyze.target_version = 3.10
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- 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
@@ -283,6 +283,5 @@ analyze.target_version = 3.10
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
@@ -283,6 +283,5 @@ analyze.target_version = 3.10
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- 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
@@ -9,6 +9,7 @@ info:
    - concise
    - test.py
    - "--show-settings"
+snapshot_kind: text
 ---
 success: true
 exit_code: 0
@@ -283,6 +284,5 @@ analyze.target_version = 3.11
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -1043,7 +1043,7 @@ def mvce(keys, values):
    ----- stdout -----
    1	C416	[*] unnecessary-comprehension
    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 fixable with the --fix option.

    ----- stderr -----
    ");
@@ -1073,8 +1073,7 @@ def mvce(keys, values):
        "code": "C416",
        "name": "unnecessary-comprehension",
        "count": 1,
-        "fixable": false,
-        "fixable_count": 0
+        "fixable": false
      }
    ]

@@ -1107,8 +1106,7 @@ def mvce(keys, values):
        "code": "C416",
        "name": "unnecessary-comprehension",
        "count": 1,
-        "fixable": true,
-        "fixable_count": 1
+        "fixable": true
      }
    ]

@@ -1116,54 +1114,6 @@ def mvce(keys, values):
    "#);
 }

-#[test]
-fn show_statistics_json_partial_fix() {
-    let mut cmd = RuffCheck::default()
-        .args([
-            "--select",
-            "UP035",
-            "--statistics",
-            "--output-format",
-            "json",
-        ])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r#"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    [
-      {
-        "code": "UP035",
-        "name": "deprecated-import",
-        "count": 2,
-        "fixable": false,
-        "fixable_count": 1
-      }
-    ]
-
-    ----- stderr -----
-    "#);
-}
-
-#[test]
-fn show_statistics_partial_fix() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "UP035", "--statistics"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    2	UP035	[-] deprecated-import
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    ");
-}
-
 #[test]
 fn show_statistics_syntax_errors() {
    let mut cmd = RuffCheck::default()
@@ -1860,7 +1810,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
    --> -:1:1

    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 fixable with the --fix option.

    ----- stderr -----
    ");
@@ -1903,7 +1853,7 @@ fn check_shows_unsafe_fixes_with_opt_in() {
    --> -:1:1

    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
+    [*] 2 fixable with the --fix option.

    ----- stderr -----
    ");
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -396,6 +396,5 @@ analyze.target_version = 3.7
 analyze.string_imports = disabled
 analyze.extension = ExtensionMapping({})
 analyze.include_dependencies = {}
-analyze.type_checking_imports = true

 ----- stderr -----
--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -31,7 +31,7 @@
 //! styling.
 //!
 //! The above snippet has been built out of the following structure:
-use crate::{Id, snippet};
+use crate::snippet;
 use std::cmp::{Reverse, max, min};
 use std::collections::HashMap;
 use std::fmt::Display;
@@ -189,7 +189,6 @@ impl DisplaySet<'_> {
        }
        Ok(())
    }
-
    fn format_annotation(
        &self,
        line_offset: usize,
@@ -200,13 +199,11 @@ impl DisplaySet<'_> {
    ) -> fmt::Result {
        let hide_severity = annotation.annotation_type.is_none();
        let color = get_annotation_style(&annotation.annotation_type, stylesheet);
-
        let formatted_len = if let Some(id) = &annotation.id {
-            let id_len = id.id.len();
            if hide_severity {
-                id_len
+                id.len()
            } else {
-                2 + id_len + annotation_type_len(&annotation.annotation_type)
+                2 + id.len() + annotation_type_len(&annotation.annotation_type)
            }
        } else {
            annotation_type_len(&annotation.annotation_type)
@@ -259,20 +256,9 @@ impl DisplaySet<'_> {
            let annotation_type = annotation_type_str(&annotation.annotation_type);
            if let Some(id) = annotation.id {
                if hide_severity {
-                    buffer.append(
-                        line_offset,
-                        &format!("{id} ", id = fmt_with_hyperlink(id.id, id.url, stylesheet)),
-                        *stylesheet.error(),
-                    );
+                    buffer.append(line_offset, &format!("{id} "), *stylesheet.error());
                } else {
-                    buffer.append(
-                        line_offset,
-                        &format!(
-                            "{annotation_type}[{id}]",
-                            id = fmt_with_hyperlink(id.id, id.url, stylesheet)
-                        ),
-                        *color,
-                    );
+                    buffer.append(line_offset, &format!("{annotation_type}[{id}]"), *color);
                }
            } else {
                buffer.append(line_offset, annotation_type, *color);
@@ -721,7 +707,7 @@ impl DisplaySet<'_> {
                            let style =
                                get_annotation_style(&annotation.annotation_type, stylesheet);
                            let mut formatted_len = if let Some(id) = &annotation.annotation.id {
-                                2 + id.id.len()
+                                2 + id.len()
                                    + annotation_type_len(&annotation.annotation.annotation_type)
                            } else {
                                annotation_type_len(&annotation.annotation.annotation_type)
@@ -738,10 +724,7 @@ impl DisplaySet<'_> {
                            } else if formatted_len != 0 {
                                formatted_len += 2;
                                let id = match &annotation.annotation.id {
-                                    Some(id) => format!(
-                                        "[{id}]",
-                                        id = fmt_with_hyperlink(&id.id, id.url, stylesheet)
-                                    ),
+                                    Some(id) => format!("[{id}]"),
                                    None => String::new(),
                                };
                                buffer.puts(
@@ -844,7 +827,7 @@ impl DisplaySet<'_> {
 #[derive(Clone, Debug, PartialEq)]
 pub(crate) struct Annotation<'a> {
    pub(crate) annotation_type: DisplayAnnotationType,
-    pub(crate) id: Option<Id<'a>>,
+    pub(crate) id: Option<&'a str>,
    pub(crate) label: Vec<DisplayTextFragment<'a>>,
    pub(crate) is_fixable: bool,
 }
@@ -1157,7 +1140,7 @@ fn format_message<'m>(

 fn format_title<'a>(
    level: crate::Level,
-    id: Option<Id<'a>>,
+    id: Option<&'a str>,
    label: &'a str,
    is_fixable: bool,
 ) -> DisplayLine<'a> {
@@ -1175,7 +1158,7 @@ fn format_title<'a>(

 fn format_footer<'a>(
    level: crate::Level,
-    id: Option<Id<'a>>,
+    id: Option<&'a str>,
    label: &'a str,
 ) -> Vec<DisplayLine<'a>> {
    let mut result = vec![];
@@ -1723,7 +1706,6 @@ fn format_body<'m>(
                            annotation: Annotation {
                                annotation_type,
                                id: None,
-
                                label: format_label(annotation.label, None),
                                is_fixable: false,
                            },
@@ -1905,40 +1887,3 @@ fn char_width(c: char) -> Option<usize> {
        unicode_width::UnicodeWidthChar::width(c)
    }
 }
-
-pub(super) fn fmt_with_hyperlink<'a, T>(
-    content: T,
-    url: Option<&'a str>,
-    stylesheet: &Stylesheet,
-) -> impl std::fmt::Display + 'a
-where
-    T: std::fmt::Display + 'a,
-{
-    struct FmtHyperlink<'a, T> {
-        content: T,
-        url: Option<&'a str>,
-    }
-
-    impl<T> std::fmt::Display for FmtHyperlink<'_, T>
-    where
-        T: std::fmt::Display,
-    {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            if let Some(url) = self.url {
-                write!(f, "\x1B]8;;{url}\x1B\\")?;
-            }
-
-            self.content.fmt(f)?;
-
-            if self.url.is_some() {
-                f.write_str("\x1B]8;;\x1B\\")?;
-            }
-
-            Ok(())
-        }
-    }
-
-    let url = if stylesheet.hyperlink { url } else { None };
-
-    FmtHyperlink { content, url }
-}
--- a/crates/ruff_annotate_snippets/src/renderer/mod.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/mod.rs
@@ -76,7 +76,6 @@ impl Renderer {
                }
                .effects(Effects::BOLD),
                none: Style::new(),
-                hyperlink: true,
            },
            ..Self::plain()
        }
@@ -155,11 +154,6 @@ impl Renderer {
        self
    }

-    pub const fn hyperlink(mut self, hyperlink: bool) -> Self {
-        self.stylesheet.hyperlink = hyperlink;
-        self
-    }
-
    /// Set the string used for when a long line is cut.
    ///
    /// The default is `...` (three `U+002E` characters).
--- a/crates/ruff_annotate_snippets/src/renderer/stylesheet.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/stylesheet.rs
@@ -10,7 +10,6 @@ pub(crate) struct Stylesheet {
    pub(crate) line_no: Style,
    pub(crate) emphasis: Style,
    pub(crate) none: Style,
-    pub(crate) hyperlink: bool,
 }

 impl Default for Stylesheet {
@@ -30,7 +29,6 @@ impl Stylesheet {
            line_no: Style::new(),
            emphasis: Style::new(),
            none: Style::new(),
-            hyperlink: false,
        }
    }
 }
--- a/crates/ruff_annotate_snippets/src/snippet.rs
+++ b/crates/ruff_annotate_snippets/src/snippet.rs
@@ -12,19 +12,13 @@

 use std::ops::Range;

-#[derive(Copy, Clone, Debug, Default, PartialEq)]
-pub(crate) struct Id<'a> {
-    pub(crate) id: &'a str,
-    pub(crate) url: Option<&'a str>,
-}
-
 /// Primary structure provided for formatting
 ///
 /// See [`Level::title`] to create a [`Message`]
 #[derive(Debug)]
 pub struct Message<'a> {
    pub(crate) level: Level,
-    pub(crate) id: Option<Id<'a>>,
+    pub(crate) id: Option<&'a str>,
    pub(crate) title: &'a str,
    pub(crate) snippets: Vec<Snippet<'a>>,
    pub(crate) footer: Vec<Message<'a>>,
@@ -34,12 +28,7 @@ pub struct Message<'a> {

 impl<'a> Message<'a> {
    pub fn id(mut self, id: &'a str) -> Self {
-        self.id = Some(Id { id, url: None });
-        self
-    }
-
-    pub fn id_with_url(mut self, id: &'a str, url: Option<&'a str>) -> Self {
-        self.id = Some(Id { id, url });
+        self.id = Some(id);
        self
    }

--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -59,6 +59,8 @@ 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 }
+rayon = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
@@ -86,7 +88,3 @@ mimalloc = { workspace = true }

 [target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
 tikv-jemallocator = { workspace = true }
-
-[dev-dependencies]
-rustc-hash = { workspace = true }
-rayon = { workspace = true }
--- a/crates/ruff_benchmark/benches/lexer.rs
+++ b/crates/ruff_benchmark/benches/lexer.rs
@@ -6,8 +6,7 @@ use criterion::{
 use ruff_benchmark::{
    LARGE_DATASET, NUMPY_CTYPESLIB, NUMPY_GLOBALS, PYDANTIC_TYPES, TestCase, UNICODE_PYPINYIN,
 };
-use ruff_python_ast::token::TokenKind;
-use ruff_python_parser::{Mode, lexer};
+use ruff_python_parser::{Mode, TokenKind, lexer};

 #[cfg(target_os = "windows")]
 #[global_allocator]
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -667,7 +667,7 @@ fn attrs(criterion: &mut Criterion) {
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY313,
        },
-        120,
+        110,
    );

    bench_project(&benchmark, criterion);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -120,7 +120,7 @@ static COLOUR_SCIENCE: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY310,
    },
-    1070,
+    600,
 );

 static FREQTRADE: Benchmark = Benchmark::new(
@@ -143,7 +143,7 @@ static FREQTRADE: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    600,
+    525,
 );

 static PANDAS: Benchmark = Benchmark::new(
@@ -163,7 +163,7 @@ static PANDAS: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    4000,
+    3000,
 );

 static PYDANTIC: Benchmark = Benchmark::new(
@@ -181,7 +181,7 @@ static PYDANTIC: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY39,
    },
-    7000,
+    3000,
 );

 static SYMPY: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
        max_dep_date: "2025-08-09",
        python_version: PythonVersion::PY311,
    },
-    950,
+    900,
 );

 #[track_caller]
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -42,7 +42,6 @@ schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 similar = { workspace = true }
-supports-hyperlinks = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -64,8 +64,6 @@ impl Diagnostic {
            id,
            severity,
            message: message.into_diagnostic_message(),
-            custom_concise_message: None,
-            documentation_url: None,
            annotations: vec![],
            subs: vec![],
            fix: None,
@@ -166,8 +164,28 @@ impl Diagnostic {
    /// Returns the primary message for this diagnostic.
    ///
    /// A diagnostic always has a message, but it may be empty.
+    ///
+    /// NOTE: At present, this routine will return the first primary
+    /// annotation's message as the primary message when the main diagnostic
+    /// message is empty. This is meant to facilitate an incremental migration
+    /// in ty over to the new diagnostic data model. (The old data model
+    /// didn't distinguish between messages on the entire diagnostic and
+    /// messages attached to a particular span.)
    pub fn primary_message(&self) -> &str {
-        self.inner.message.as_str()
+        if !self.inner.message.as_str().is_empty() {
+            return self.inner.message.as_str();
+        }
+        // FIXME: As a special case, while we're migrating ty
+        // to the new diagnostic data model, we'll look for a primary
+        // message from the primary annotation. This is because most
+        // ty diagnostics are created with an empty diagnostic
+        // message and instead attach the message to the annotation.
+        // Fixing this will require touching basically every diagnostic
+        // in ty, so we do it this way for now to match the old
+        // semantics. ---AG
+        self.primary_annotation()
+            .and_then(|ann| ann.get_message())
+            .unwrap_or_default()
    }

    /// Introspects this diagnostic and returns what kind of "primary" message
@@ -179,35 +197,35 @@ impl Diagnostic {
    /// contains *essential* information or context for understanding the
    /// diagnostic.
    ///
+    /// The reason why we don't just always return both the main diagnostic
+    /// message and the primary annotation message is because this was written
+    /// in the midst of an incremental migration of ty over to the new
+    /// diagnostic data model. At time of writing, diagnostics were still
+    /// constructed in the old model where the main diagnostic message and the
+    /// primary annotation message were not distinguished from each other. So
+    /// for now, we carefully return what kind of messages this diagnostic
+    /// contains. In effect, if this diagnostic has a non-empty main message
+    /// *and* a non-empty primary annotation message, then the diagnostic is
+    /// 100% using the new diagnostic data model and we can format things
+    /// appropriately.
+    ///
    /// The type returned implements the `std::fmt::Display` trait. In most
    /// cases, just converting it to a string (or printing it) will do what
    /// you want.
    pub fn concise_message(&self) -> ConciseMessage<'_> {
-        if let Some(custom_message) = &self.inner.custom_concise_message {
-            return ConciseMessage::Custom(custom_message.as_str());
-        }
-
        let main = self.inner.message.as_str();
        let annotation = self
            .primary_annotation()
            .and_then(|ann| ann.get_message())
            .unwrap_or_default();
-        if annotation.is_empty() {
-            ConciseMessage::MainDiagnostic(main)
-        } else {
-            ConciseMessage::Both { main, annotation }
+        match (main.is_empty(), annotation.is_empty()) {
+            (false, true) => ConciseMessage::MainDiagnostic(main),
+            (true, false) => ConciseMessage::PrimaryAnnotation(annotation),
+            (false, false) => ConciseMessage::Both { main, annotation },
+            (true, true) => ConciseMessage::Empty,
        }
    }

-    /// Set a custom message for the concise formatting of this diagnostic.
-    ///
-    /// This overrides the default behavior of generating a concise message
-    /// from the main diagnostic message and the primary annotation.
-    pub fn set_concise_message(&mut self, message: impl IntoDiagnosticMessage) {
-        Arc::make_mut(&mut self.inner).custom_concise_message =
-            Some(message.into_diagnostic_message());
-    }
-
    /// Returns the severity of this diagnostic.
    ///
    /// Note that this may be different than the severity of sub-diagnostics.
@@ -321,13 +339,6 @@ impl Diagnostic {
        Arc::make_mut(&mut self.inner).fix = Some(fix);
    }

-    /// If `fix` is `Some`, set the fix for this diagnostic.
-    pub fn set_optional_fix(&mut self, fix: Option<Fix>) {
-        if let Some(fix) = fix {
-            self.set_fix(fix);
-        }
-    }
-
    /// Remove the fix for this diagnostic.
    pub fn remove_fix(&mut self) {
        Arc::make_mut(&mut self.inner).fix = None;
@@ -345,14 +356,6 @@ impl Diagnostic {
            .is_some_and(|fix| fix.applies(config.fix_applicability))
    }

-    pub fn documentation_url(&self) -> Option<&str> {
-        self.inner.documentation_url.as_deref()
-    }
-
-    pub fn set_documentation_url(&mut self, url: Option<String>) {
-        Arc::make_mut(&mut self.inner).documentation_url = url;
-    }
-
    /// Returns the offset of the parent statement for this diagnostic if it exists.
    ///
    /// This is primarily used for checking noqa/secondary code suppressions.
@@ -426,6 +429,28 @@ impl Diagnostic {
            .map(|sub| sub.inner.message.as_str())
    }

+    /// Returns the URL for the rule documentation, if it exists.
+    pub fn to_ruff_url(&self) -> Option<String> {
+        match self.id() {
+            DiagnosticId::Panic
+            | DiagnosticId::Io
+            | DiagnosticId::InvalidSyntax
+            | DiagnosticId::RevealedType
+            | DiagnosticId::UnknownRule
+            | DiagnosticId::InvalidGlob
+            | DiagnosticId::EmptyInclude
+            | DiagnosticId::UnnecessaryOverridesSection
+            | DiagnosticId::UselessOverridesSection
+            | DiagnosticId::DeprecatedSetting
+            | DiagnosticId::Unformatted
+            | DiagnosticId::InvalidCliOption
+            | DiagnosticId::InternalError => None,
+            DiagnosticId::Lint(lint_name) => {
+                Some(format!("{}/rules/{lint_name}", env!("CARGO_PKG_HOMEPAGE")))
+            }
+        }
+    }
+
    /// Returns the filename for the message.
    ///
    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
@@ -505,10 +530,8 @@ impl Diagnostic {
 #[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 struct DiagnosticInner {
    id: DiagnosticId,
-    documentation_url: Option<String>,
    severity: Severity,
    message: DiagnosticMessage,
-    custom_concise_message: Option<DiagnosticMessage>,
    annotations: Vec<Annotation>,
    subs: Vec<SubDiagnostic>,
    fix: Option<Fix>,
@@ -660,6 +683,18 @@ impl SubDiagnostic {
    /// contains *essential* information or context for understanding the
    /// diagnostic.
    ///
+    /// The reason why we don't just always return both the main diagnostic
+    /// message and the primary annotation message is because this was written
+    /// in the midst of an incremental migration of ty over to the new
+    /// diagnostic data model. At time of writing, diagnostics were still
+    /// constructed in the old model where the main diagnostic message and the
+    /// primary annotation message were not distinguished from each other. So
+    /// for now, we carefully return what kind of messages this diagnostic
+    /// contains. In effect, if this diagnostic has a non-empty main message
+    /// *and* a non-empty primary annotation message, then the diagnostic is
+    /// 100% using the new diagnostic data model and we can format things
+    /// appropriately.
+    ///
    /// The type returned implements the `std::fmt::Display` trait. In most
    /// cases, just converting it to a string (or printing it) will do what
    /// you want.
@@ -669,10 +704,11 @@ impl SubDiagnostic {
            .primary_annotation()
            .and_then(|ann| ann.get_message())
            .unwrap_or_default();
-        if annotation.is_empty() {
-            ConciseMessage::MainDiagnostic(main)
-        } else {
-            ConciseMessage::Both { main, annotation }
+        match (main.is_empty(), annotation.is_empty()) {
+            (false, true) => ConciseMessage::MainDiagnostic(main),
+            (true, false) => ConciseMessage::PrimaryAnnotation(annotation),
+            (false, false) => ConciseMessage::Both { main, annotation },
+            (true, true) => ConciseMessage::Empty,
        }
    }
 }
@@ -842,10 +878,6 @@ impl Annotation {
    pub fn hide_snippet(&mut self, yes: bool) {
        self.hide_snippet = yes;
    }
-
-    pub fn is_primary(&self) -> bool {
-        self.is_primary
-    }
 }

 /// Tags that can be associated with an annotation.
@@ -1466,12 +1498,28 @@ pub enum DiagnosticFormat {
 pub enum ConciseMessage<'a> {
    /// A diagnostic contains a non-empty main message and an empty
    /// primary annotation message.
+    ///
+    /// This strongly suggests that the diagnostic is using the
+    /// "new" data model.
    MainDiagnostic(&'a str),
+    /// A diagnostic contains an empty main message and a non-empty
+    /// primary annotation message.
+    ///
+    /// This strongly suggests that the diagnostic is using the
+    /// "old" data model.
+    PrimaryAnnotation(&'a str),
    /// A diagnostic contains a non-empty main message and a non-empty
    /// primary annotation message.
+    ///
+    /// This strongly suggests that the diagnostic is using the
+    /// "new" data model.
    Both { main: &'a str, annotation: &'a str },
-    /// A custom concise message has been provided.
-    Custom(&'a str),
+    /// A diagnostic contains an empty main message and an empty
+    /// primary annotation message.
+    ///
+    /// This indicates that the diagnostic is probably using the old
+    /// model.
+    Empty,
 }

 impl std::fmt::Display for ConciseMessage<'_> {
@@ -1480,12 +1528,13 @@ impl std::fmt::Display for ConciseMessage<'_> {
            ConciseMessage::MainDiagnostic(main) => {
                write!(f, "{main}")
            }
+            ConciseMessage::PrimaryAnnotation(annotation) => {
+                write!(f, "{annotation}")
+            }
            ConciseMessage::Both { main, annotation } => {
                write!(f, "{main}: {annotation}")
            }
-            ConciseMessage::Custom(message) => {
-                write!(f, "{message}")
-            }
+            ConciseMessage::Empty => Ok(()),
        }
    }
 }
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -205,7 +205,6 @@ impl<'a> Resolved<'a> {
 struct ResolvedDiagnostic<'a> {
    level: AnnotateLevel,
    id: Option<String>,
-    documentation_url: Option<String>,
    message: String,
    annotations: Vec<ResolvedAnnotation<'a>>,
    is_fixable: bool,
@@ -241,12 +240,12 @@ impl<'a> ResolvedDiagnostic<'a> {
            // `DisplaySet::format_annotation` for both cases, but this is a small hack to improve
            // the formatting of syntax errors for now. This should also be kept consistent with the
            // concise formatting.
-            diag.secondary_code().map_or_else(
+            Some(diag.secondary_code().map_or_else(
                || format!("{id}:", id = diag.inner.id),
                |code| code.to_string(),
-            )
+            ))
        } else {
-            diag.inner.id.to_string()
+            Some(diag.inner.id.to_string())
        };

        let level = if config.hide_severity {
@@ -257,8 +256,7 @@ impl<'a> ResolvedDiagnostic<'a> {

        ResolvedDiagnostic {
            level,
-            id: Some(id),
-            documentation_url: diag.documentation_url().map(ToString::to_string),
+            id,
            message: diag.inner.message.as_str().to_string(),
            annotations,
            is_fixable: config.show_fix_status && diag.has_applicable_fix(config),
@@ -289,7 +287,6 @@ impl<'a> ResolvedDiagnostic<'a> {
        ResolvedDiagnostic {
            level: diag.inner.severity.to_annotate(),
            id: None,
-            documentation_url: None,
            message: diag.inner.message.as_str().to_string(),
            annotations,
            is_fixable: false,
@@ -388,7 +385,6 @@ impl<'a> ResolvedDiagnostic<'a> {
        RenderableDiagnostic {
            level: self.level,
            id: self.id.as_deref(),
-            documentation_url: self.documentation_url.as_deref(),
            message: &self.message,
            snippets_by_input,
            is_fixable: self.is_fixable,
@@ -489,7 +485,6 @@ struct RenderableDiagnostic<'r> {
    /// An ID is always present for top-level diagnostics and always absent for
    /// sub-diagnostics.
    id: Option<&'r str>,
-    documentation_url: Option<&'r str>,
    /// The message emitted with the diagnostic, before any snippets are
    /// rendered.
    message: &'r str,
@@ -524,7 +519,7 @@ impl RenderableDiagnostic<'_> {
            .is_fixable(self.is_fixable)
            .lineno_offset(self.header_offset);
        if let Some(id) = self.id {
-            message = message.id_with_url(id, self.documentation_url);
+            message = message.id(id);
        }
        message.snippets(snippets)
    }
@@ -2881,12 +2876,6 @@ watermelon
            self.diag.help(message);
            self
        }
-
-        /// Set the documentation URL for the diagnostic.
-        pub(super) fn documentation_url(mut self, url: impl Into<String>) -> DiagnosticBuilder<'e> {
-            self.diag.set_documentation_url(Some(url.into()));
-            self
-        }
    }

    /// A helper builder for tersely populating a `SubDiagnostic`.
@@ -3001,7 +2990,6 @@ def fibonacci(n):
                    TextSize::from(10),
                ))))
                .noqa_offset(TextSize::from(7))
-                .documentation_url("https://docs.astral.sh/ruff/rules/unused-import")
                .build(),
            env.builder(
                "unused-variable",
@@ -3016,13 +3004,11 @@ def fibonacci(n):
                TextSize::from(99),
            )))
            .noqa_offset(TextSize::from(94))
-            .documentation_url("https://docs.astral.sh/ruff/rules/unused-variable")
            .build(),
            env.builder("undefined-name", Severity::Error, "Undefined name `a`")
                .primary("undef.py", "1:3", "1:4", "")
                .secondary_code("F821")
                .noqa_offset(TextSize::from(3))
-                .documentation_url("https://docs.astral.sh/ruff/rules/undefined-name")
                .build(),
        ];

@@ -3137,7 +3123,6 @@ if call(foo
                    TextSize::from(19),
                ))))
                .noqa_offset(TextSize::from(16))
-                .documentation_url("https://docs.astral.sh/ruff/rules/unused-import")
                .build(),
            env.builder(
                "unused-import",
@@ -3152,7 +3137,6 @@ if call(foo
                TextSize::from(40),
            ))))
            .noqa_offset(TextSize::from(35))
-            .documentation_url("https://docs.astral.sh/ruff/rules/unused-import")
            .build(),
            env.builder(
                "unused-variable",
@@ -3167,7 +3151,6 @@ if call(foo
                TextSize::from(104),
            ))))
            .noqa_offset(TextSize::from(98))
-            .documentation_url("https://docs.astral.sh/ruff/rules/unused-variable")
            .build(),
        ];

--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -1,6 +1,6 @@
 use crate::diagnostic::{
    Diagnostic, DisplayDiagnosticConfig, Severity,
-    stylesheet::{DiagnosticStylesheet, fmt_styled, fmt_with_hyperlink},
+    stylesheet::{DiagnosticStylesheet, fmt_styled},
 };

 use super::FileResolver;
@@ -62,29 +62,18 @@ impl<'a> ConciseRenderer<'a> {
                }
                write!(f, "{sep} ")?;
            }
-
            if self.config.hide_severity {
                if let Some(code) = diag.secondary_code() {
                    write!(
                        f,
                        "{code} ",
-                        code = fmt_styled(
-                            fmt_with_hyperlink(&code, diag.documentation_url(), &stylesheet),
-                            stylesheet.secondary_code
-                        )
+                        code = fmt_styled(code, stylesheet.secondary_code)
                    )?;
                } else {
                    write!(
                        f,
                        "{id}: ",
-                        id = fmt_styled(
-                            fmt_with_hyperlink(
-                                &diag.inner.id,
-                                diag.documentation_url(),
-                                &stylesheet
-                            ),
-                            stylesheet.secondary_code
-                        )
+                        id = fmt_styled(diag.inner.id.as_str(), stylesheet.secondary_code)
                    )?;
                }
                if self.config.show_fix_status {
@@ -104,10 +93,7 @@ impl<'a> ConciseRenderer<'a> {
                    f,
                    "{severity}[{id}] ",
                    severity = fmt_styled(severity, severity_style),
-                    id = fmt_styled(
-                        fmt_with_hyperlink(&diag.id(), diag.documentation_url(), &stylesheet),
-                        stylesheet.emphasis
-                    )
+                    id = fmt_styled(diag.id(), stylesheet.emphasis)
                )?;
            }

--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -49,8 +49,7 @@ impl<'a> FullRenderer<'a> {
            .help(stylesheet.help)
            .line_no(stylesheet.line_no)
            .emphasis(stylesheet.emphasis)
-            .none(stylesheet.none)
-            .hyperlink(stylesheet.hyperlink);
+            .none(stylesheet.none);

        for diag in diagnostics {
            let resolved = Resolved::new(self.resolver, diag, self.config);
@@ -704,7 +703,52 @@ print()
        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"
+        error[unused-import][*]: `os` imported but unused
+         --> notebook.ipynb:cell 1:2:8
+          |
+        1 | # cell 1
+        2 | import os
+          |        ^^
+          |
+        help: Remove unused import: `os`
+         ::: cell 1
+        1 | # cell 1
+          - import os
+
+        error[unused-import][*]: `math` imported but unused
+         --> notebook.ipynb:cell 2:2:8
+          |
+        1 | # cell 2
+        2 | import math
+          |        ^^^^
+        3 |
+        4 | print('hello world')
+          |
+        help: Remove unused import: `math`
+         ::: cell 2
+        1 | # cell 2
+          - import math
+        2 | 
+        3 | print('hello world')
+
+        error[unused-variable][*]: Local variable `x` is assigned to but never used
+         --> notebook.ipynb:cell 3:4:5
+          |
+        2 | def foo():
+        3 |     print()
+        4 |     x = 1
+          |     ^
+          |
+        help: Remove assignment to unused variable `x`
+         ::: cell 3
+        1 | # cell 3
+        2 | def foo():
+        3 |     print()
+          -     x = 1
+        4 | 
+        note: This is an unsafe fix and may change runtime behavior
+        ");
    }

    #[test]
@@ -724,7 +768,31 @@ print()
        }
        *fix = Fix::unsafe_edits(edits.remove(0), edits);

-        insta::assert_snapshot!(env.render(&diagnostic));
+        insta::assert_snapshot!(env.render(&diagnostic), @r"
+        error[unused-import][*]: `os` imported but unused
+         --> notebook.ipynb:cell 1:2:8
+          |
+        1 | # cell 1
+        2 | import os
+          |        ^^
+          |
+        help: Remove unused import: `os`
+         ::: cell 1
+        1 | # cell 1
+          - import os
+         ::: cell 2
+        1 | # cell 2
+          - import math
+        2 | 
+        3 | print('hello world')
+         ::: cell 3
+        1 | # cell 3
+        2 | def foo():
+        3 |     print()
+          -     x = 1
+        4 | 
+        note: This is an unsafe fix and may change runtime behavior
+        ");
    }

    /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -100,7 +100,7 @@ pub(super) fn diagnostic_to_json<'a>(
    if config.preview {
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
-            url: diagnostic.documentation_url(),
+            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
@@ -112,7 +112,7 @@ pub(super) fn diagnostic_to_json<'a>(
    } else {
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
-            url: diagnostic.documentation_url(),
+            url: diagnostic.to_ruff_url(),
            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
@@ -228,7 +228,7 @@ pub(crate) struct JsonDiagnostic<'a> {
    location: Option<JsonLocation>,
    message: &'a str,
    noqa_row: Option<OneIndexed>,
-    url: Option<&'a str>,
+    url: Option<String>,
 }

 #[derive(Serialize)]
@@ -294,10 +294,7 @@ mod tests {
        env.format(DiagnosticFormat::Json);
        env.preview(false);

-        let diag = env
-            .err()
-            .documentation_url("https://docs.astral.sh/ruff/rules/test-diagnostic")
-            .build();
+        let diag = env.err().build();

        insta::assert_snapshot!(
            env.render(&diag),
@@ -331,10 +328,7 @@ mod tests {
        env.format(DiagnosticFormat::Json);
        env.preview(true);

-        let diag = env
-            .err()
-            .documentation_url("https://docs.astral.sh/ruff/rules/test-diagnostic")
-            .build();
+        let diag = env.err().build();

        insta::assert_snapshot!(
            env.render(&diag),
--- a/crates/ruff_db/src/diagnostic/render/rdjson.rs
+++ b/crates/ruff_db/src/diagnostic/render/rdjson.rs
@@ -82,7 +82,7 @@ fn diagnostic_to_rdjson<'a>(
            value: diagnostic
                .secondary_code()
                .map_or_else(|| diagnostic.name(), |code| code.as_str()),
-            url: diagnostic.documentation_url(),
+            url: diagnostic.to_ruff_url(),
        },
        suggestions: rdjson_suggestions(
            edits,
@@ -182,7 +182,7 @@ impl RdjsonRange {
 #[derive(Serialize)]
 struct RdjsonCode<'a> {
    #[serde(skip_serializing_if = "Option::is_none")]
-    url: Option<&'a str>,
+    url: Option<String>,
    value: &'a str,
 }

@@ -217,10 +217,7 @@ mod tests {
        env.format(DiagnosticFormat::Rdjson);
        env.preview(false);

-        let diag = env
-            .err()
-            .documentation_url("https://docs.astral.sh/ruff/rules/test-diagnostic")
-            .build();
+        let diag = env.err().build();

        insta::assert_snapshot!(env.render(&diag));
    }
@@ -231,10 +228,7 @@ mod tests {
        env.format(DiagnosticFormat::Rdjson);
        env.preview(true);

-        let diag = env
-            .err()
-            .documentation_url("https://docs.astral.sh/ruff/rules/test-diagnostic")
-            .build();
+        let diag = env.err().build();

        insta::assert_snapshot!(env.render(&diag));
    }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderfulltests__notebook_output_with_diff.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderfulltests__notebook_output_with_diff.snap
@@ -1,48 +0,0 @@
---
-source: crates/ruff_db/src/diagnostic/render/full.rs
-expression: env.render_diagnostics(&diagnostics)
---
-error[unused-import][*]: `os` imported but unused
- --> notebook.ipynb:cell 1:2:8
-  |
-1 | # cell 1
-2 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
- ::: cell 1
-1 | # cell 1
-  - import os
-
-error[unused-import][*]: `math` imported but unused
- --> notebook.ipynb:cell 2:2:8
-  |
-1 | # cell 2
-2 | import math
-  |        ^^^^
-3 |
-4 | print('hello world')
-  |
-help: Remove unused import: `math`
- ::: cell 2
-1 | # cell 2
-  - import math
-2 | 
-3 | print('hello world')
-
-error[unused-variable][*]: Local variable `x` is assigned to but never used
- --> notebook.ipynb:cell 3:4:5
-  |
-2 | def foo():
-3 |     print()
-4 |     x = 1
-  |     ^
-  |
-help: Remove assignment to unused variable `x`
- ::: cell 3
-1 | # cell 3
-2 | def foo():
-3 |     print()
-  -     x = 1
-4 | 
-note: This is an unsafe fix and may change runtime behavior
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderfulltests__notebook_output_with_diff_spanning_cells.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderfulltests__notebook_output_with_diff_spanning_cells.snap
@@ -1,27 +0,0 @@
---
-source: crates/ruff_db/src/diagnostic/render/full.rs
-expression: env.render(&diagnostic)
---
-error[unused-import][*]: `os` imported but unused
- --> notebook.ipynb:cell 1:2:8
-  |
-1 | # cell 1
-2 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
- ::: cell 1
-1 | # cell 1
-  - import os
- ::: cell 2
-1 | # cell 2
-  - import math
-2 | 
-3 | print('hello world')
- ::: cell 3
-1 | # cell 3
-2 | def foo():
-3 |     print()
-  -     x = 1
-4 | 
-note: This is an unsafe fix and may change runtime behavior
--- a/crates/ruff_db/src/diagnostic/stylesheet.rs
+++ b/crates/ruff_db/src/diagnostic/stylesheet.rs
@@ -31,43 +31,6 @@ where
    FmtStyled { content, style }
 }

-pub(super) fn fmt_with_hyperlink<'a, T>(
-    content: T,
-    url: Option<&'a str>,
-    stylesheet: &DiagnosticStylesheet,
-) -> impl std::fmt::Display + 'a
-where
-    T: std::fmt::Display + 'a,
-{
-    struct FmtHyperlink<'a, T> {
-        content: T,
-        url: Option<&'a str>,
-    }
-
-    impl<T> std::fmt::Display for FmtHyperlink<'_, T>
-    where
-        T: std::fmt::Display,
-    {
-        fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-            if let Some(url) = self.url {
-                write!(f, "\x1B]8;;{url}\x1B\\")?;
-            }
-
-            self.content.fmt(f)?;
-
-            if self.url.is_some() {
-                f.write_str("\x1B]8;;\x1B\\")?;
-            }
-
-            Ok(())
-        }
-    }
-
-    let url = if stylesheet.hyperlink { url } else { None };
-
-    FmtHyperlink { content, url }
-}
-
 #[derive(Clone, Debug)]
 pub struct DiagnosticStylesheet {
    pub(crate) error: Style,
@@ -84,7 +47,6 @@ pub struct DiagnosticStylesheet {
    pub(crate) deletion: Style,
    pub(crate) insertion_line_no: Style,
    pub(crate) deletion_line_no: Style,
-    pub(crate) hyperlink: bool,
 }

 impl Default for DiagnosticStylesheet {
@@ -97,8 +59,6 @@ impl DiagnosticStylesheet {
    /// Default terminal styling
    pub fn styled() -> Self {
        let bright_blue = AnsiColor::BrightBlue.on_default();
-
-        let hyperlink = supports_hyperlinks::supports_hyperlinks();
        Self {
            error: AnsiColor::BrightRed.on_default().effects(Effects::BOLD),
            warning: AnsiColor::Yellow.on_default().effects(Effects::BOLD),
@@ -114,7 +74,6 @@ impl DiagnosticStylesheet {
            deletion: AnsiColor::Red.on_default(),
            insertion_line_no: AnsiColor::Green.on_default().effects(Effects::BOLD),
            deletion_line_no: AnsiColor::Red.on_default().effects(Effects::BOLD),
-            hyperlink,
        }
    }

@@ -134,7 +93,6 @@ impl DiagnosticStylesheet {
            deletion: Style::new(),
            insertion_line_no: Style::new(),
            deletion_line_no: Style::new(),
-            hyperlink: false,
        }
    }
 }
--- a/crates/ruff_db/src/parsed.rs
+++ b/crates/ruff_db/src/parsed.rs
@@ -21,11 +21,7 @@ use crate::source::source_text;
 /// reflected in the changed AST offsets.
 /// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
 /// for determining if a query result is unchanged.
-///
-/// The LRU capacity of 200 was picked without any empirical evidence that it's optimal,
-/// instead it's a wild guess that it should be unlikely that incremental changes involve
-/// more than 200 modules. Parsed ASTs within the same revision are never evicted by Salsa.
-#[salsa::tracked(returns(ref), no_eq, heap_size=ruff_memory_usage::heap_size, lru=200)]
+#[salsa::tracked(returns(ref), no_eq, heap_size=ruff_memory_usage::heap_size)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
    let _span = tracing::trace_span!("parsed_module", ?file).entered();

@@ -96,9 +92,14 @@ impl ParsedModule {
        self.inner.store(None);
    }

-    /// Returns the file to which this module belongs.
-    pub fn file(&self) -> File {
-        self.file
+    /// Returns the pointer address of this [`ParsedModule`].
+    ///
+    /// The pointer uniquely identifies the module within the current Salsa revision,
+    /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected.
+    pub fn addr(&self) -> usize {
+        // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner
+        // `Arc` within the `ArcSwap` may change.
+        Arc::as_ptr(&self.inner).addr()
    }
 }

--- a/crates/ruff_db/src/source.rs
+++ b/crates/ruff_db/src/source.rs
@@ -7,7 +7,6 @@ use ruff_source_file::LineIndex;

 use crate::Db;
 use crate::files::{File, FilePath};
-use crate::system::System;

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

-    let kind = if is_notebook(db.system(), path) {
+    let kind = if is_notebook(file.path(db)) {
        file.read_to_notebook(db)
            .unwrap_or_else(|error| {
                tracing::debug!("Failed to read notebook '{path}': {error}");
@@ -41,17 +40,18 @@ pub fn source_text(db: &dyn Db, file: File) -> SourceText {
    }
 }

-fn is_notebook(system: &dyn System, path: &FilePath) -> bool {
-    let source_type = match path {
-        FilePath::System(path) => system.source_type(path),
-        FilePath::SystemVirtual(system_virtual) => system.virtual_path_source_type(system_virtual),
-        FilePath::Vendored(_) => return false,
-    };
-
-    let with_extension_fallback =
-        source_type.or_else(|| PySourceType::try_from_extension(path.extension()?));
-
-    with_extension_fallback == Some(PySourceType::Ipynb)
+fn is_notebook(path: &FilePath) -> bool {
+    match path {
+        FilePath::System(system) => system.extension().is_some_and(|extension| {
+            PySourceType::try_from_extension(extension) == Some(PySourceType::Ipynb)
+        }),
+        FilePath::SystemVirtual(system_virtual) => {
+            system_virtual.extension().is_some_and(|extension| {
+                PySourceType::try_from_extension(extension) == Some(PySourceType::Ipynb)
+            })
+        }
+        FilePath::Vendored(_) => false,
+    }
 }

 /// The source text of a file containing python code.
--- a/crates/ruff_db/src/system.rs
+++ b/crates/ruff_db/src/system.rs
@@ -9,7 +9,6 @@ pub use os::OsSystem;

 use filetime::FileTime;
 use ruff_notebook::{Notebook, NotebookError};
-use ruff_python_ast::PySourceType;
 use std::error::Error;
 use std::fmt::{Debug, Formatter};
 use std::path::{Path, PathBuf};
@@ -17,11 +16,12 @@ use std::{fmt, io};
 pub use test::{DbWithTestSystem, DbWithWritableSystem, InMemorySystem, TestSystem};
 use walk_directory::WalkDirectoryBuilder;

+use crate::file_revision::FileRevision;
+
 pub use self::path::{
    DeduplicatedNestedPathsIter, SystemPath, SystemPathBuf, SystemVirtualPath,
    SystemVirtualPathBuf, deduplicate_nested_paths,
 };
-use crate::file_revision::FileRevision;

 mod memory_fs;
 #[cfg(feature = "os")]
@@ -66,35 +66,6 @@ pub trait System: Debug + Sync + Send {
    /// See [dunce::canonicalize] for more information.
    fn canonicalize_path(&self, path: &SystemPath) -> Result<SystemPathBuf>;

-    /// Returns the source type for `path` if known or `None`.
-    ///
-    /// The default is to always return `None`, assuming the system
-    /// has no additional information and that the caller should
-    /// rely on the file extension instead.
-    ///
-    /// This is primarily used for the LSP integration to respect
-    /// the chosen language (or the fact that it is a notebook) in
-    /// the editor.
-    fn source_type(&self, path: &SystemPath) -> Option<PySourceType> {
-        let _ = path;
-        None
-    }
-
-    /// Returns the source type for `path` if known or `None`.
-    ///
-    /// The default is to always return `None`, assuming the system
-    /// has no additional information and that the caller should
-    /// rely on the file extension instead.
-    ///
-    /// This is primarily used for the LSP integration to respect
-    /// the chosen language (or the fact that it is a notebook) in
-    /// the editor.
-    fn virtual_path_source_type(&self, path: &SystemVirtualPath) -> Option<PySourceType> {
-        let _ = path;
-
-        None
-    }
-
    /// Reads the content of the file at `path` into a [`String`].
    fn read_to_string(&self, path: &SystemPath) -> Result<String>;

--- a/crates/ruff_db/src/system/path.rs
+++ b/crates/ruff_db/src/system/path.rs
@@ -667,13 +667,6 @@ impl Deref for SystemPathBuf {
    }
 }

-impl AsRef<Path> for SystemPathBuf {
-    #[inline]
-    fn as_ref(&self) -> &Path {
-        self.0.as_std_path()
-    }
-}
-
 impl<P: AsRef<SystemPath>> FromIterator<P> for SystemPathBuf {
    fn from_iter<I: IntoIterator<Item = P>>(iter: I) -> Self {
        let mut buf = SystemPathBuf::new();
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -149,10 +149,6 @@ impl Fix {
        &self.edits
    }

-    pub fn into_edits(self) -> Vec<Edit> {
-        self.edits
-    }
-
    /// Return the [`Applicability`] of the [`Fix`].
    pub fn applicability(&self) -> Applicability {
        self.applicability
--- a/crates/ruff_graph/src/collector.rs
+++ b/crates/ruff_graph/src/collector.rs
@@ -14,21 +14,14 @@ pub(crate) struct Collector<'a> {
    string_imports: StringImports,
    /// The collected imports from the Python AST.
    imports: Vec<CollectedImport>,
-    /// Whether to detect type checking imports
-    type_checking_imports: bool,
 }

 impl<'a> Collector<'a> {
-    pub(crate) fn new(
-        module_path: Option<&'a [String]>,
-        string_imports: StringImports,
-        type_checking_imports: bool,
-    ) -> Self {
+    pub(crate) fn new(module_path: Option<&'a [String]>, string_imports: StringImports) -> Self {
        Self {
            module_path,
            string_imports,
            imports: Vec::new(),
-            type_checking_imports,
        }
    }

@@ -98,25 +91,10 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
                    }
                }
            }
-            Stmt::If(ast::StmtIf {
-                test,
-                body,
-                elif_else_clauses,
-                range: _,
-                node_index: _,
-            }) => {
-                // Skip TYPE_CHECKING blocks if not requested
-                if self.type_checking_imports || !is_type_checking_condition(test) {
-                    self.visit_body(body);
-                }
-
-                for clause in elif_else_clauses {
-                    self.visit_elif_else_clause(clause);
-                }
-            }
            Stmt::FunctionDef(_)
            | Stmt::ClassDef(_)
            | Stmt::While(_)
+            | Stmt::If(_)
            | Stmt::With(_)
            | Stmt::Match(_)
            | Stmt::Try(_)
@@ -174,30 +152,6 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
    }
 }

-/// Check if an expression is a `TYPE_CHECKING` condition.
-///
-/// Returns `true` for:
-/// - `TYPE_CHECKING`
-/// - `typing.TYPE_CHECKING`
-///
-/// NOTE: Aliased `TYPE_CHECKING`, i.e. `import typing.TYPE_CHECKING as TC; if TC: ...`
-/// will not be detected!
-fn is_type_checking_condition(expr: &Expr) -> bool {
-    match expr {
-        // `if TYPE_CHECKING:`
-        Expr::Name(ast::ExprName { id, .. }) => id.as_str() == "TYPE_CHECKING",
-        // `if typing.TYPE_CHECKING:`
-        Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
-            attr.as_str() == "TYPE_CHECKING"
-                && matches!(
-                    value.as_ref(),
-                    Expr::Name(ast::ExprName { id, .. }) if id.as_str() == "typing"
-                )
-        }
-        _ => false,
-    }
-}
-
 #[derive(Debug)]
 pub(crate) enum CollectedImport {
    /// The import was part of an `import` statement.
--- a/crates/ruff_graph/src/lib.rs
+++ b/crates/ruff_graph/src/lib.rs
@@ -30,7 +30,6 @@ impl ModuleImports {
        path: &SystemPath,
        package: Option<&SystemPath>,
        string_imports: StringImports,
-        type_checking_imports: bool,
    ) -> Result<Self> {
        // Parse the source code.
        let parsed = parse(source, ParseOptions::from(source_type))?;
@@ -39,17 +38,13 @@ impl ModuleImports {
            package.and_then(|package| to_module_path(package.as_std_path(), path.as_std_path()));

        // Collect the imports.
-        let imports = Collector::new(
-            module_path.as_deref(),
-            string_imports,
-            type_checking_imports,
-        )
-        .collect(parsed.syntax());
+        let imports =
+            Collector::new(module_path.as_deref(), string_imports).collect(parsed.syntax());

        // Resolve the imports.
        let mut resolved_imports = ModuleImports::default();
        for import in imports {
-            for resolved in Resolver::new(db, path).resolve(import) {
+            for resolved in Resolver::new(db).resolve(import) {
                if let Some(path) = resolved.as_system_path() {
                    resolved_imports.insert(path.to_path_buf());
                }
--- a/crates/ruff_graph/src/resolver.rs
+++ b/crates/ruff_graph/src/resolver.rs
@@ -1,9 +1,5 @@
-use ruff_db::files::{File, FilePath, system_path_to_file};
-use ruff_db::system::SystemPath;
-use ty_python_semantic::{
-    ModuleName, resolve_module, resolve_module_confident, resolve_real_module,
-    resolve_real_module_confident,
-};
+use ruff_db::files::FilePath;
+use ty_python_semantic::{ModuleName, resolve_module, resolve_real_module};

 use crate::ModuleDb;
 use crate::collector::CollectedImport;
@@ -11,15 +7,12 @@ use crate::collector::CollectedImport;
 /// Collect all imports for a given Python file.
 pub(crate) struct Resolver<'a> {
    db: &'a ModuleDb,
-    file: Option<File>,
 }

 impl<'a> Resolver<'a> {
    /// Initialize a [`Resolver`] with a given [`ModuleDb`].
-    pub(crate) fn new(db: &'a ModuleDb, path: &SystemPath) -> Self {
-        // If we know the importing file we can potentially resolve more imports
-        let file = system_path_to_file(db, path).ok();
-        Self { db, file }
+    pub(crate) fn new(db: &'a ModuleDb) -> Self {
+        Self { db }
    }

    /// Resolve the [`CollectedImport`] into a [`FilePath`].
@@ -77,21 +70,13 @@ impl<'a> Resolver<'a> {

    /// Resolves a module name to a module.
    pub(crate) fn resolve_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = if let Some(file) = self.file {
-            resolve_module(self.db, file, module_name)?
-        } else {
-            resolve_module_confident(self.db, module_name)?
-        };
+        let module = resolve_module(self.db, module_name)?;
        Some(module.file(self.db)?.path(self.db))
    }

    /// Resolves a module name to a module (stubs not allowed).
    fn resolve_real_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
-        let module = if let Some(file) = self.file {
-            resolve_real_module(self.db, file, module_name)?
-        } else {
-            resolve_real_module_confident(self.db, module_name)?
-        };
+        let module = resolve_real_module(self.db, module_name)?;
        Some(module.file(self.db)?.path(self.db))
    }
 }
--- a/crates/ruff_graph/src/settings.rs
+++ b/crates/ruff_graph/src/settings.rs
@@ -6,7 +6,7 @@ use std::collections::BTreeMap;
 use std::fmt;
 use std::path::PathBuf;

-#[derive(Debug, Clone, CacheKey)]
+#[derive(Debug, Default, Clone, CacheKey)]
 pub struct AnalyzeSettings {
    pub exclude: FilePatternSet,
    pub preview: PreviewMode,
@@ -14,21 +14,6 @@ pub struct AnalyzeSettings {
    pub string_imports: StringImports,
    pub include_dependencies: BTreeMap<PathBuf, (PathBuf, Vec<String>)>,
    pub extension: ExtensionMapping,
-    pub type_checking_imports: bool,
-}
-
-impl Default for AnalyzeSettings {
-    fn default() -> Self {
-        Self {
-            exclude: FilePatternSet::default(),
-            preview: PreviewMode::default(),
-            target_version: PythonVersion::default(),
-            string_imports: StringImports::default(),
-            include_dependencies: BTreeMap::default(),
-            extension: ExtensionMapping::default(),
-            type_checking_imports: true,
-        }
-    }
 }

 impl fmt::Display for AnalyzeSettings {
@@ -44,7 +29,6 @@ impl fmt::Display for AnalyzeSettings {
                self.string_imports,
                self.extension | debug,
                self.include_dependencies | debug,
-                self.type_checking_imports,
            ]
        }
        Ok(())
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.14.8"
+version = "0.14.4"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -35,7 +35,6 @@ anyhow = { workspace = true }
 bitflags = { workspace = true }
 clap = { workspace = true, features = ["derive", "string"], optional = true }
 colored = { workspace = true }
-compact_str = { workspace = true }
 fern = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S310.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S310.py
@@ -45,22 +45,3 @@ urllib.request.urlopen(urllib.request.Request(url))
 # https://github.com/astral-sh/ruff/issues/15522
 map(urllib.request.urlopen, [])
 foo = urllib.request.urlopen
-
-# https://github.com/astral-sh/ruff/issues/21462
-path = "https://example.com/data.csv"
-urllib.request.urlretrieve(path, "data.csv")
-url = "https://example.com/api"
-urllib.request.Request(url)
-
-# Test resolved f-strings and concatenated string literals
-fstring_url = f"https://example.com/data.csv"
-urllib.request.urlopen(fstring_url)
-urllib.request.Request(fstring_url)
-
-concatenated_url = "https://" + "example.com/data.csv"
-urllib.request.urlopen(concatenated_url)
-urllib.request.Request(concatenated_url)
-
-nested_concatenated = "http://" + "example.com" + "/data.csv"
-urllib.request.urlopen(nested_concatenated)
-urllib.request.Request(nested_concatenated)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S506.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S506.py
@@ -28,11 +28,9 @@ yaml.load("{}", SafeLoader)
 yaml.load("{}", yaml.SafeLoader)
 yaml.load("{}", CSafeLoader)
 yaml.load("{}", yaml.CSafeLoader)
-yaml.load("{}", yaml.cyaml.CSafeLoader)
 yaml.load("{}", NewSafeLoader)
 yaml.load("{}", Loader=SafeLoader)
 yaml.load("{}", Loader=yaml.SafeLoader)
 yaml.load("{}", Loader=CSafeLoader)
 yaml.load("{}", Loader=yaml.CSafeLoader)
-yaml.load("{}", Loader=yaml.cyaml.CSafeLoader)
 yaml.load("{}", Loader=NewSafeLoader)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S508.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S508.py
@@ -4,31 +4,3 @@ CommunityData("public", mpModel=0)  # S508
 CommunityData("public", mpModel=1)  # S508

 CommunityData("public", mpModel=2)  # OK
-
-# New API paths
-import pysnmp.hlapi.asyncio
-import pysnmp.hlapi.v1arch
-import pysnmp.hlapi.v1arch.asyncio
-import pysnmp.hlapi.v1arch.asyncio.auth
-import pysnmp.hlapi.v3arch
-import pysnmp.hlapi.v3arch.asyncio
-import pysnmp.hlapi.v3arch.asyncio.auth
-import pysnmp.hlapi.auth
-
-pysnmp.hlapi.asyncio.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v1arch.asyncio.auth.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v1arch.asyncio.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v1arch.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v3arch.asyncio.auth.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v3arch.asyncio.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.v3arch.CommunityData("public", mpModel=0)  # S508
-pysnmp.hlapi.auth.CommunityData("public", mpModel=0)  # S508
-
-pysnmp.hlapi.asyncio.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v1arch.asyncio.auth.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v1arch.asyncio.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v1arch.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v3arch.asyncio.auth.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v3arch.asyncio.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.v3arch.CommunityData("public", mpModel=2)  # OK
-pysnmp.hlapi.auth.CommunityData("public", mpModel=2)  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S509.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S509.py
@@ -5,19 +5,3 @@ insecure = UsmUserData("securityName")  # S509
 auth_no_priv = UsmUserData("securityName", "authName")  # S509

 less_insecure = UsmUserData("securityName", "authName", "privName")  # OK
-
-# New API paths
-import pysnmp.hlapi.asyncio
-import pysnmp.hlapi.v3arch.asyncio
-import pysnmp.hlapi.v3arch.asyncio.auth
-import pysnmp.hlapi.auth
-
-pysnmp.hlapi.asyncio.UsmUserData("user")  # S509
-pysnmp.hlapi.v3arch.asyncio.UsmUserData("user")  # S509
-pysnmp.hlapi.v3arch.asyncio.auth.UsmUserData("user")  # S509
-pysnmp.hlapi.auth.UsmUserData("user")  # S509
-
-pysnmp.hlapi.asyncio.UsmUserData("user", "authkey", "privkey")  # OK
-pysnmp.hlapi.v3arch.asyncio.UsmUserData("user", "authkey", "privkey")  # OK
-pysnmp.hlapi.v3arch.asyncio.auth.UsmUserData("user", "authkey", "privkey")  # OK
-pysnmp.hlapi.auth.UsmUserData("user", "authkey", "privkey")  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_B008.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_B008.py
@@ -199,9 +199,6 @@ def bytes_okay(value=bytes(1)):
 def int_okay(value=int("12")):
    pass

-# Allow immutable slice()
-def slice_okay(value=slice(1,2)):
-    pass

 # Allow immutable complex() value
 def complex_okay(value=complex(1,2)):
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B901.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B901.py
@@ -52,16 +52,16 @@ def not_broken5():
    yield inner()


-def broken3():
+def not_broken6():
    return (yield from [])


-def broken4():
+def not_broken7():
    x = yield from []
    return x


-def broken5():
+def not_broken8():
    x = None

    def inner(ex):
@@ -76,13 +76,3 @@ class NotBroken9(object):
    def __await__(self):
        yield from function()
        return 42
-
-
-async def broken6():
-    yield 1
-    return foo()
-
-
-async def broken7():
-    yield 1
-    return [1, 2, 3]
--- a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
@@ -208,17 +208,3 @@ _ = t"b {f"c" f"d {t"e" t"f"} g"} h"
 _ = f"b {t"abc" \
    t"def"} g"

-
-# Explicit concatenation with either operand being
-# a string literal that wraps across multiple lines (in parentheses)
-# reports diagnostic - no autofix.
-# See https://github.com/astral-sh/ruff/issues/19757
-_ = "abc" + (
-    "def"
-    "ghi"
-)
-
-_ = (
-    "abc"
-    "def"
-) + "ghi"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
@@ -216,15 +216,3 @@ def get_items_list():

 def get_items_set():
    return tuple({item for item in items}) or None  # OK
-
-
-# https://github.com/astral-sh/ruff/issues/21473
-tuple("") or True  # SIM222
-tuple(t"") or True  # OK
-tuple(0) or True  # OK
-tuple(1) or True  # OK
-tuple(False) or True  # OK
-tuple(None) or True  # OK
-tuple(...) or True  # OK
-tuple(lambda x: x) or True  # OK
-tuple(x for x in range(0)) or True  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM223.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM223.py
@@ -157,15 +157,3 @@ print(f"{1}{''}" and "bar")

 # https://github.com/astral-sh/ruff/issues/7127
 def f(a: "'' and 'b'"): ...
-
-
-# https://github.com/astral-sh/ruff/issues/21473
-tuple("") and False  # SIM223
-tuple(t"") and False  # OK
-tuple(0) and False  # OK
-tuple(1) and False  # OK
-tuple(False) and False  # OK
-tuple(None) and False  # OK
-tuple(...) and False  # OK
-tuple(lambda x: x) and False  # OK
-tuple(x for x in range(0)) and False  # OK
--- a/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC502_google.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC502_google.py
@@ -83,37 +83,6 @@ def calculate_speed(distance: float, time: float) -> float:
        raise


-# DOC502 regression for Sphinx directive after Raises (issue #18959)
-def foo():
-    """First line.
-
-    Raises:
-        ValueError:
-            some text
-
-    .. versionadded:: 0.7.0
-        The ``init_kwargs`` argument.
-    """
-    raise ValueError
-
-
-# DOC502 regression for following section with colons
-def example_with_following_section():
-    """Summary.
-    
-    Returns:
-        str: The resulting expression.
-    
-    Raises:
-        ValueError: If the unit is not valid.
-    
-    Relation to `time_range_lookup`:
-        - Handles the "start of" modifier.
-        - Example: "start of month" → `DATETRUNC()`.
-    """
-    raise ValueError
-
-
 # This should NOT trigger DOC502 because OSError is explicitly re-raised
 def f():
    """Do nothing.
--- a/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC502_numpy.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydoclint/DOC502_numpy.py
@@ -117,33 +117,3 @@ def calculate_speed(distance: float, time: float) -> float:
    except TypeError:
        print("Not a number? Shame on you!")
        raise
-
-
-# DOC502 regression for Sphinx directive after Raises (issue #18959)
-def foo():
-    """First line.
-
-    Raises
-    ------
-    ValueError
-        some text
-
-    .. versionadded:: 0.7.0
-        The ``init_kwargs`` argument.
-    """
-    raise ValueError
-
-# Make sure we don't bail out on a Sphinx directive in the description of one
-# of the exceptions
-def foo():
-    """First line.
-
-    Raises
-    ------
-    ValueError
-        some text
-        .. math:: e^{xception}
-    ZeroDivisionError
-        Will not be raised, DOC502
-    """
-    raise ValueError
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D417.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D417.py
@@ -218,26 +218,3 @@ def should_not_fail(payload, Args):
        Args:
            The other arguments.
    """
-
-
-# Test cases for Unpack[TypedDict] kwargs
-from typing import TypedDict
-from typing_extensions import Unpack
-
-class User(TypedDict):
-    id: int
-    name: str
-
-def function_with_unpack_args_should_not_fail(query: str, **kwargs: Unpack[User]):
-    """Function with Unpack kwargs.
-
-    Args:
-        query: some arg
-    """
-
-def function_with_unpack_and_missing_arg_doc_should_fail(query: str, **kwargs: Unpack[User]):
-    """Function with Unpack kwargs but missing query arg documentation.
-
-    Args:
-        **kwargs: keyword arguments
-    """
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F704.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F704.py
@@ -17,24 +17,3 @@ def _():

    # Valid yield scope
    yield 3
-
-
-# await is valid in any generator, sync or async
-(await cor async for cor in f())  # ok
-(await cor for cor in f())  # ok
-
-# but not in comprehensions
-[await cor async for cor in f()]  # F704
-{await cor async for cor in f()}  # F704
-{await cor: 1 async for cor in f()}  # F704
-[await cor for cor in f()]  # F704
-{await cor for cor in f()}  # F704
-{await cor: 1 for cor in f()}  # F704
-
-# or in the iterator of an async generator, which is evaluated in the parent
-# scope
-(cor async for cor in await f())  # F704
-(await cor async for cor in [await c for c in f()])  # F704
-
-# this is also okay because the comprehension is within the generator scope
-([await c for c in cor] async for cor in f())  # ok
--- a/crates/ruff_linter/resources/test/fixtures/pylint/dict_iter_missing_items.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/dict_iter_missing_items.py
@@ -30,23 +30,3 @@ for a, b in d_tuple:
    pass
 for a, b in d_tuple_annotated: 
    pass
-
-# Empty dict cases
-empty_dict = {}
-empty_dict["x"] = 1
-for k, v in empty_dict:
-    pass
-
-empty_dict_annotated_tuple_keys: dict[tuple[int, str], bool] = {}
-for k, v in empty_dict_annotated_tuple_keys:
-    pass
-
-empty_dict_unannotated = {}
-empty_dict_unannotated[("x", "y")] = True
-for k, v in empty_dict_unannotated:
-    pass
-
-empty_dict_annotated_str_keys: dict[str, int] = {}
-empty_dict_annotated_str_keys["x"] = 1
-for k, v in empty_dict_annotated_str_keys:
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/pylint/stop_iteration_return.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/stop_iteration_return.py
@@ -129,26 +129,3 @@ def generator_with_lambda():
    yield 1
    func = lambda x: x  # Just a regular lambda
    yield 2
-
-# See: https://github.com/astral-sh/ruff/issues/21162
-def foo():
-    def g():
-        yield 1
-    raise StopIteration  # Should not trigger
-
-
-def foo():
-    def g():
-        raise StopIteration  # Should not trigger
-    yield 1
-
-# https://github.com/astral-sh/ruff/pull/21177#pullrequestreview-3430209718
-def foo():
-    yield 1
-    class C:
-        raise StopIteration  # Should trigger
-    yield C
-
-# https://github.com/astral-sh/ruff/pull/21177#discussion_r2539702728
-def foo():
-    raise StopIteration((yield 1))  # Should trigger
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB103.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB103.py
@@ -152,13 +152,4 @@ import json
 data = {"price": 100}

 with open("test.json", "wb") as f:
-    f.write(json.dumps(data, indent=4).encode("utf-8"))
-
-# See: https://github.com/astral-sh/ruff/issues/21381
-with open("tmp_path/pyproject.toml", "w") as f:
-    f.write(dedent(
-        """
-        [project]
-        other = 1.234
-        """,
-    ))
+    f.write(json.dumps(data, indent=4).encode("utf-8"))
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF012.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF012.py
@@ -132,9 +132,3 @@ class AWithQuotes:
    final_variable: 'Final[list[int]]' = []
    class_variable_without_subscript: 'ClassVar' = []
    final_variable_without_subscript: 'Final' = []
-
-
-# Reassignment of a ClassVar should not trigger RUF012
-class P:
-    class_variable: ClassVar[list] = [10, 20, 30, 40, 50]
-    class_variable = [*class_variable[0::1], *class_variable[2::3]]
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF052_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF052_0.py
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF052_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF052_1.py
@@ -1,109 +0,0 @@
-# Correct usage in loop and comprehension
-def process_data():
-    return 42
-def test_correct_dummy_usage():
-    my_list = [{"foo": 1}, {"foo": 2}]
-
-    # Should NOT detect - dummy variable is not used
-    [process_data() for _ in my_list]  # OK: `_` is ignored by rule
-
-    # Should NOT detect - dummy variable is not used
-    [item["foo"] for item in my_list]  # OK: not a dummy variable name
-
-    # Should NOT detect - dummy variable is not used
-    [42 for _unused in my_list]  # OK: `_unused` is not accessed
-
-# Regular For Loops
-def test_for_loops():
-    my_list = [{"foo": 1}, {"foo": 2}]
-
-    # Should detect used dummy variable
-    for _item in my_list:
-        print(_item["foo"])  # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect used dummy variable
-    for _index, _value in enumerate(my_list):
-        result = _index + _value["foo"]  # RUF052: Both `_index` and `_value` are accessed
-
-# List Comprehensions
-def test_list_comprehensions():
-    my_list = [{"foo": 1}, {"foo": 2}]
-
-    # Should detect used dummy variable
-    result = [_item["foo"] for _item in my_list]  # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect used dummy variable in nested comprehension
-    nested = [[_item["foo"] for _item in _sublist] for _sublist in [my_list, my_list]]
-    # RUF052: Both `_item` and `_sublist` are accessed
-
-    # Should detect with conditions
-    filtered = [_item["foo"] for _item in my_list if _item["foo"] > 0]
-    # RUF052: Local dummy variable `_item` is accessed
-
-# Dict Comprehensions
-def test_dict_comprehensions():
-    my_list = [{"key": "a", "value": 1}, {"key": "b", "value": 2}]
-
-    # Should detect used dummy variable
-    result = {_item["key"]: _item["value"] for _item in my_list}
-    # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect with enumerate
-    indexed = {_index: _item["value"] for _index, _item in enumerate(my_list)}
-    # RUF052: Both `_index` and `_item` are accessed
-
-    # Should detect in nested dict comprehension
-    nested = {_outer: {_inner["key"]: _inner["value"] for _inner in sublist}
-              for _outer, sublist in enumerate([my_list])}
-    # RUF052: `_outer`, `_inner` are accessed
-
-# Set Comprehensions
-def test_set_comprehensions():
-    my_list = [{"foo": 1}, {"foo": 2}, {"foo": 1}]  # Note: duplicate values
-
-    # Should detect used dummy variable
-    unique_values = {_item["foo"] for _item in my_list}
-    # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect with conditions
-    filtered_set = {_item["foo"] for _item in my_list if _item["foo"] > 0}
-    # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect with complex expression
-    processed = {_item["foo"] * 2 for _item in my_list}
-    # RUF052: Local dummy variable `_item` is accessed
-
-# Generator Expressions
-def test_generator_expressions():
-    my_list = [{"foo": 1}, {"foo": 2}]
-
-    # Should detect used dummy variable
-    gen = (_item["foo"] for _item in my_list)
-    # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect when passed to function
-    total = sum(_item["foo"] for _item in my_list)
-    # RUF052: Local dummy variable `_item` is accessed
-
-    # Should detect with multiple generators
-    pairs = ((_x, _y) for _x in range(3) for _y in range(3) if _x != _y)
-    # RUF052: Both `_x` and `_y` are accessed
-
-    # Should detect in nested generator
-    nested_gen = (sum(_inner["foo"] for _inner in sublist) for _sublist in [my_list] for sublist in _sublist)
-    # RUF052: `_inner` and `_sublist` are accessed
-
-# Complex Examples with Multiple Comprehension Types
-def test_mixed_comprehensions():
-    data = [{"items": [1, 2, 3]}, {"items": [4, 5, 6]}]
-
-    # Should detect in mixed comprehensions
-    result = [
-        {_key: [_val * 2 for _val in _record["items"]] for _key in ["doubled"]}
-        for _record in data
-    ]
-    # RUF052: `_key`, `_val`, and `_record` are all accessed
-
-    # Should detect in generator passed to list constructor
-    gen_list = list(_item["items"][0] for _item in data)
-    # RUF052: Local dummy variable `_item` is accessed
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF065_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF065_1.py
@@ -16,19 +16,3 @@ logging.warning("%s", str(**{"object": b"\xf0\x9f\x9a\xa8", "encoding": "utf-8"}
 # str() with single keyword argument - should be flagged (equivalent to str("!"))
 logging.warning("%s", str(object="!"))

-
-# Complex conversion specifiers that make oct() and hex() necessary
-# These should NOT be flagged because the behavior differs between %s and %#o/%#x
-# https://github.com/astral-sh/ruff/issues/21458
-
-# %06s with oct() - zero-pad flag with width (should NOT be flagged)
-logging.warning("%06s", oct(123))
-
-# % s with oct() - blank sign flag (should NOT be flagged)
-logging.warning("% s", oct(123))
-
-# %+s with oct() - sign char flag (should NOT be flagged)
-logging.warning("%+s", oct(123))
-
-# %.3s with hex() - precision (should NOT be flagged)
-logging.warning("%.3s", hex(123))
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF066.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF066.py
@@ -1,70 +0,0 @@
-import abc
-import typing
-
-
-class User:  # Test normal class properties
-    @property
-    def name(self):  # ERROR: No return
-        f"{self.first_name} {self.last_name}"
-
-    @property
-    def age(self):  # OK: Returning something
-        return 100
-
-    def method(self):  # OK: Not a property
-        x = 1
-
-    @property
-    def nested(self):  # ERROR: Property itself doesn't return
-        def inner():
-            return 0
-
-    @property
-    def stub(self): ...  # OK: A stub; doesn't return anything
-
-
-class UserMeta(metaclass=abc.ABCMeta):  # Test properies inside of an ABC class
-    @property
-    @abc.abstractmethod
-    def abstr_prop1(self): ...  # OK: Abstract methods doesn't need to return anything
-
-    @property
-    @abc.abstractmethod
-    def abstr_prop2(self):  # OK: Abstract methods doesn't need to return anything
-        """
-        A cool docstring
-        """
-
-    @property
-    def prop1(self):  # OK: Returning a value
-        return 1
-
-    @property
-    def prop2(self):  # ERROR: Not returning something (even when we are inside an ABC)
-        50
-
-    def method(self):  # OK: Not a property
-        x = 1
-
-
-def func():  # OK: Not a property
-    x = 1
-
-
-class Proto(typing.Protocol):  # Tests for a Protocol class
-    @property
-    def prop1(self) -> int: ...  # OK: A stub property
-
-
-class File:  # Extra tests for things like yield/yield from/raise
-    @property
-    def stream1(self):  # OK: Yields something
-        yield
-
-    @property
-    def stream2(self):  # OK: Yields from something
-        yield from self.stream1
-
-    @property
-    def children(self):  # OK: Raises
-        raise ValueError("File does not have children")
--- a/crates/ruff_linter/resources/test/fixtures/ruff/suppressions.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/suppressions.py
@@ -1,56 +0,0 @@
-def f():
-    # These should both be ignored by the range suppression.
-    # ruff: disable[E741, F841]
-    I = 1
-    # ruff: enable[E741, F841]
-
-
-def f():
-    # These should both be ignored by the implicit range suppression.
-    # Should also generate an "unmatched suppression" warning.
-    # ruff:disable[E741,F841]
-    I = 1
-
-
-def f():
-    # Neither warning is ignored, and an "unmatched suppression"
-    # should be generated.
-    I = 1
-    # ruff: enable[E741, F841]
-
-
-def f():
-    # One should be ignored by the range suppression, and
-    # the other logged to the user.
-    # ruff: disable[E741]
-    I = 1
-    # ruff: enable[E741]
-
-
-def f():
-    # Test interleaved range suppressions. The first and last
-    # lines should each log a different warning, while the
-    # middle line should be completely silenced.
-    # ruff: disable[E741]
-    l = 0
-    # ruff: disable[F841]
-    O = 1
-    # ruff: enable[E741]
-    I = 2
-    # ruff: enable[F841]
-
-
-def f():
-    # Neither of these are ignored and warnings are
-    # logged to user
-    # ruff: disable[E501]
-    I = 1
-    # ruff: enable[E501]
-
-
-def f():
-    # These should both be ignored by the range suppression,
-    # and an unusued noqa diagnostic should be logged.
-    # ruff:disable[E741,F841]
-    I = 1  # noqa: E741,F841
-    # ruff:enable[E741,F841]
--- a/crates/ruff_linter/resources/test/fixtures/syntax_errors/await_outside_async_function.py
+++ b/crates/ruff_linter/resources/test/fixtures/syntax_errors/await_outside_async_function.py
@@ -3,5 +3,3 @@ def func():

 # Top-level await
 await 1
-
-([await c for c in cor] async for cor in func())  # ok
--- a/crates/ruff_linter/resources/test/fixtures/syntax_errors/return_in_generator.py
+++ b/crates/ruff_linter/resources/test/fixtures/syntax_errors/return_in_generator.py
@@ -1,24 +0,0 @@
-async def gen():
-    yield 1
-    return 42
-
-def gen(): # B901 but not a syntax error - not an async generator
-    yield 1
-    return 42
-
-async def gen(): # ok - no value in return
-    yield 1
-    return
-
-async def gen():
-    yield 1
-    return foo()
-
-async def gen():
-    yield 1
-    return [1, 2, 3]
-
-async def gen():
-    if True:
-        yield 1
-    return 10
--- a/crates/ruff_linter/resources/test/project/README.md
+++ b/crates/ruff_linter/resources/test/project/README.md
@@ -17,7 +17,7 @@ crates/ruff_linter/resources/test/project/examples/docs/docs/file.py:8:5: F841 [
 crates/ruff_linter/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
 crates/ruff_linter/resources/test/project/project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 Found 7 errors.
-[*] 7 potentially fixable with the `--fix` option.
+[*] 7 potentially fixable with the --fix option.
 ```

 Running from the project directory itself should exhibit the same behavior:
@@ -32,7 +32,7 @@ examples/docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but n
 project/file.py:1:8: F401 [*] `os` imported but unused
 project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 Found 7 errors.
-[*] 7 potentially fixable with the `--fix` option.
+[*] 7 potentially fixable with the --fix option.
 ```

 Running from the sub-package directory should exhibit the same behavior, but omit the top-level
@@ -43,7 +43,7 @@ files:
 docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
 Found 2 errors.
-[*] 2 potentially fixable with the `--fix` option.
+[*] 2 potentially fixable with the --fix option.
 ```

 `--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
@@ -61,7 +61,7 @@ crates/ruff_linter/resources/test/project/examples/docs/docs/file.py:4:27: F401
 crates/ruff_linter/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
 crates/ruff_linter/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
 Found 9 errors.
-[*] 9 potentially fixable with the `--fix` option.
+[*] 9 potentially fixable with the --fix option.
 ```

 Running from a parent directory should "ignore" the `exclude` (hence, `concepts/file.py` gets
@@ -74,7 +74,7 @@ docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
 excluded/script.py:5:5: F841 [*] Local variable `x` is assigned to but never used
 Found 4 errors.
-[*] 4 potentially fixable with the `--fix` option.
+[*] 4 potentially fixable with the --fix option.
 ```

 Passing an excluded directory directly should report errors in the contained files:
@@ -83,7 +83,7 @@ Passing an excluded directory directly should report errors in the contained fil
 ∴ cargo run -p ruff -- check crates/ruff_linter/resources/test/project/examples/excluded/
 crates/ruff_linter/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
 Found 1 error.
-[*] 1 potentially fixable with the `--fix` option.
+[*] 1 potentially fixable with the --fix option.
 ```

 Unless we `--force-exclude`:
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -131,9 +131,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.is_rule_enabled(Rule::GeneratorReturnFromIterMethod) {
                flake8_pyi::rules::bad_generator_return_type(function_def, checker);
            }
-            if checker.is_rule_enabled(Rule::StopIterationReturn) {
-                pylint::rules::stop_iteration_return(checker, function_def);
-            }
            if checker.source_type.is_stub() {
                if checker.is_rule_enabled(Rule::StrOrReprDefinedInStub) {
                    flake8_pyi::rules::str_or_repr_defined_in_stub(checker, stmt);
@@ -347,9 +344,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.is_rule_enabled(Rule::InvalidArgumentName) {
                pep8_naming::rules::invalid_argument_name_function(checker, function_def);
            }
-            if checker.is_rule_enabled(Rule::PropertyWithoutReturn) {
-                ruff::rules::property_without_return(checker, function_def);
-            }
        }
        Stmt::Return(_) => {
            if checker.is_rule_enabled(Rule::ReturnInInit) {
@@ -956,6 +950,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.is_rule_enabled(Rule::MisplacedBareRaise) {
                pylint::rules::misplaced_bare_raise(checker, raise);
            }
+            if checker.is_rule_enabled(Rule::StopIterationReturn) {
+                pylint::rules::stop_iteration_return(checker, raise);
+            }
        }
        Stmt::AugAssign(aug_assign @ ast::StmtAugAssign { target, .. }) => {
            if checker.is_rule_enabled(Rule::GlobalStatement) {
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -35,7 +35,6 @@ use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to
 use ruff_python_ast::identifier::Identifier;
 use ruff_python_ast::name::QualifiedName;
 use ruff_python_ast::str::Quote;
-use ruff_python_ast::token::Tokens;
 use ruff_python_ast::visitor::{Visitor, walk_except_handler, walk_pattern};
 use ruff_python_ast::{
    self as ast, AnyParameterRef, ArgOrKeyword, Comprehension, ElifElseClause, ExceptHandler, Expr,
@@ -49,7 +48,7 @@ use ruff_python_parser::semantic_errors::{
    SemanticSyntaxChecker, SemanticSyntaxContext, SemanticSyntaxError, SemanticSyntaxErrorKind,
 };
 use ruff_python_parser::typing::{AnnotationKind, ParsedAnnotation, parse_type_annotation};
-use ruff_python_parser::{ParseError, Parsed};
+use ruff_python_parser::{ParseError, Parsed, Tokens};
 use ruff_python_semantic::all::{DunderAllDefinition, DunderAllFlags};
 use ruff_python_semantic::analyze::{imports, typing};
 use ruff_python_semantic::{
@@ -69,7 +68,6 @@ use crate::noqa::NoqaMapping;
 use crate::package::PackageRoot;
 use crate::preview::is_undefined_export_in_dunder_init_enabled;
 use crate::registry::Rule;
-use crate::rules::flake8_bugbear::rules::ReturnInGenerator;
 use crate::rules::pyflakes::rules::{
    LateFutureImport, MultipleStarredExpressions, ReturnOutsideFunction,
    UndefinedLocalWithNestedImportStarUsage, YieldOutsideFunction,
@@ -730,12 +728,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                    self.report_diagnostic(NonlocalWithoutBinding { name }, error.range);
                }
            }
-            SemanticSyntaxErrorKind::ReturnInGenerator => {
-                // B901
-                if self.is_rule_enabled(Rule::ReturnInGenerator) {
-                    self.report_diagnostic(ReturnInGenerator, error.range);
-                }
-            }
            SemanticSyntaxErrorKind::ReboundComprehensionVariable
            | SemanticSyntaxErrorKind::DuplicateTypeParameter
            | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
@@ -754,7 +746,6 @@ impl SemanticSyntaxContext for Checker<'_> {
            | SemanticSyntaxErrorKind::LoadBeforeNonlocalDeclaration { .. }
            | SemanticSyntaxErrorKind::NonlocalAndGlobal(_)
            | SemanticSyntaxErrorKind::AnnotatedGlobal(_)
-            | SemanticSyntaxErrorKind::TypeParameterDefaultOrder(_)
            | SemanticSyntaxErrorKind::AnnotatedNonlocal(_) => {
                self.semantic_errors.borrow_mut().push(error);
            }
@@ -788,10 +779,6 @@ impl SemanticSyntaxContext for Checker<'_> {
            match scope.kind {
                ScopeKind::Class(_) => return false,
                ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Generator {
-                    kind: GeneratorKind::Generator,
-                    ..
-                } => return true,
                ScopeKind::Generator { .. }
                | ScopeKind::Module
                | ScopeKind::Type
@@ -841,19 +828,14 @@ impl SemanticSyntaxContext for Checker<'_> {
        self.source_type.is_ipynb()
    }

-    fn in_generator_context(&self) -> bool {
-        for scope in self.semantic.current_scopes() {
-            if matches!(
-                scope.kind,
-                ScopeKind::Generator {
-                    kind: GeneratorKind::Generator,
-                    ..
-                }
-            ) {
-                return true;
+    fn in_generator_scope(&self) -> bool {
+        matches!(
+            &self.semantic.current_scope().kind,
+            ScopeKind::Generator {
+                kind: GeneratorKind::Generator,
+                ..
            }
-        }
-        false
+        )
    }

    fn in_loop_context(&self) -> bool {
@@ -878,17 +860,23 @@ impl SemanticSyntaxContext for Checker<'_> {
    }

    fn is_bound_parameter(&self, name: &str) -> bool {
-        match self.semantic.current_scope().kind {
-            ScopeKind::Function(ast::StmtFunctionDef { parameters, .. }) => {
-                parameters.includes(name)
+        for scope in self.semantic.current_scopes() {
+            match scope.kind {
+                ScopeKind::Class(_) => return false,
+                ScopeKind::Function(ast::StmtFunctionDef { parameters, .. })
+                | ScopeKind::Lambda(ast::ExprLambda {
+                    parameters: Some(parameters),
+                    ..
+                }) => return parameters.includes(name),
+                ScopeKind::Lambda(_)
+                | ScopeKind::Generator { .. }
+                | ScopeKind::Module
+                | ScopeKind::Type
+                | ScopeKind::DunderClassCell => {}
            }
-            ScopeKind::Class(_)
-            | ScopeKind::Lambda(_)
-            | ScopeKind::Generator { .. }
-            | ScopeKind::Module
-            | ScopeKind::Type
-            | ScopeKind::DunderClassCell => false,
        }
+
+        false
    }
 }

--- a/crates/ruff_linter/src/checkers/logical_lines.rs
+++ b/crates/ruff_linter/src/checkers/logical_lines.rs
@@ -1,6 +1,6 @@
-use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
+use ruff_python_parser::{TokenKind, Tokens};
 use ruff_source_file::LineRanges;
 use ruff_text_size::{Ranged, TextRange};

--- a/crates/ruff_linter/src/checkers/noqa.rs
+++ b/crates/ruff_linter/src/checkers/noqa.rs
@@ -12,20 +12,17 @@ use crate::fix::edits::delete_comment;
 use crate::noqa::{
    Code, Directive, FileExemption, FileNoqaDirectives, NoqaDirectives, NoqaMapping,
 };
-use crate::preview::is_range_suppressions_enabled;
 use crate::registry::Rule;
 use crate::rule_redirects::get_redirect_target;
 use crate::rules::pygrep_hooks;
 use crate::rules::ruff;
 use crate::rules::ruff::rules::{UnusedCodes, UnusedNOQA};
 use crate::settings::LinterSettings;
-use crate::suppression::Suppressions;
 use crate::{Edit, Fix, Locator};

 use super::ast::LintContext;

 /// RUF100
-#[expect(clippy::too_many_arguments)]
 pub(crate) fn check_noqa(
    context: &mut LintContext,
    path: &Path,
@@ -34,7 +31,6 @@ pub(crate) fn check_noqa(
    noqa_line_for: &NoqaMapping,
    analyze_directives: bool,
    settings: &LinterSettings,
-    suppressions: &Suppressions,
 ) -> Vec<usize> {
    // Identify any codes that are globally exempted (within the current file).
    let file_noqa_directives =
@@ -44,7 +40,7 @@ pub(crate) fn check_noqa(
    let mut noqa_directives =
        NoqaDirectives::from_commented_ranges(comment_ranges, &settings.external, path, locator);

-    if file_noqa_directives.is_empty() && noqa_directives.is_empty() && suppressions.is_empty() {
+    if file_noqa_directives.is_empty() && noqa_directives.is_empty() {
        return Vec::new();
    }

@@ -64,19 +60,11 @@ pub(crate) fn check_noqa(
            continue;
        }

-        // Apply file-level suppressions first
        if exemption.contains_secondary_code(code) {
            ignored_diagnostics.push(index);
            continue;
        }

-        // Apply ranged suppressions next
-        if is_range_suppressions_enabled(settings) && suppressions.check_diagnostic(diagnostic) {
-            ignored_diagnostics.push(index);
-            continue;
-        }
-
-        // Apply end-of-line noqa suppressions last
        let noqa_offsets = diagnostic
            .parent()
            .into_iter()
--- a/crates/ruff_linter/src/checkers/tokens.rs
+++ b/crates/ruff_linter/src/checkers/tokens.rs
@@ -4,9 +4,9 @@ use std::path::Path;

 use ruff_notebook::CellOffsets;
 use ruff_python_ast::PySourceType;
-use ruff_python_ast::token::Tokens;
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
+use ruff_python_parser::Tokens;

 use crate::Locator;
 use crate::directives::TodoComment;
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -1058,7 +1058,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        (Ruff, "063") => rules::ruff::rules::AccessAnnotationsFromClassDict,
        (Ruff, "064") => rules::ruff::rules::NonOctalPermissions,
        (Ruff, "065") => rules::ruff::rules::LoggingEagerConversion,
-        (Ruff, "066") => rules::ruff::rules::PropertyWithoutReturn,

        (Ruff, "100") => rules::ruff::rules::UnusedNOQA,
        (Ruff, "101") => rules::ruff::rules::RedirectedNOQA,
--- a/crates/ruff_linter/src/directives.rs
+++ b/crates/ruff_linter/src/directives.rs
@@ -5,8 +5,8 @@ use std::str::FromStr;

 use bitflags::bitflags;

-use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_index::Indexer;
+use ruff_python_parser::{TokenKind, Tokens};
 use ruff_python_trivia::CommentRanges;
 use ruff_source_file::LineRanges;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
--- a/crates/ruff_linter/src/doc_lines.rs
+++ b/crates/ruff_linter/src/doc_lines.rs
@@ -5,8 +5,8 @@ use std::iter::FusedIterator;
 use std::slice::Iter;

 use ruff_python_ast::statement_visitor::{StatementVisitor, walk_stmt};
-use ruff_python_ast::token::{Token, TokenKind, Tokens};
 use ruff_python_ast::{self as ast, Stmt, Suite};
+use ruff_python_parser::{Token, TokenKind, Tokens};
 use ruff_source_file::UniversalNewlineIterator;
 use ruff_text_size::{Ranged, TextSize};

--- a/crates/ruff_linter/src/importer/mod.rs
+++ b/crates/ruff_linter/src/importer/mod.rs
@@ -9,11 +9,10 @@ use anyhow::Result;
 use libcst_native as cst;

 use ruff_diagnostics::Edit;
-use ruff_python_ast::token::Tokens;
 use ruff_python_ast::{self as ast, Expr, ModModule, Stmt};
 use ruff_python_codegen::Stylist;
 use ruff_python_importer::Insertion;
-use ruff_python_parser::Parsed;
+use ruff_python_parser::{Parsed, Tokens};
 use ruff_python_semantic::{
    ImportedName, MemberNameImport, ModuleNameImport, NameImport, SemanticModel,
 };
@@ -84,7 +83,7 @@ impl<'a> Importer<'a> {
                    .into_edit(&required_import)
            } else {
                // Insert at the start of the file.
-                Insertion::start_of_file(self.python_ast, self.source, self.stylist, None)
+                Insertion::start_of_file(self.python_ast, self.source, self.stylist)
                    .into_edit(&required_import)
            }
        }
@@ -114,7 +113,7 @@ impl<'a> Importer<'a> {
            Insertion::end_of_statement(stmt, self.source, self.stylist)
        } else {
            // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.source, self.stylist, None)
+            Insertion::start_of_file(self.python_ast, self.source, self.stylist)
        };
        let add_import_edit = insertion.into_edit(&content);

@@ -499,7 +498,7 @@ impl<'a> Importer<'a> {
            Insertion::end_of_statement(stmt, self.source, self.stylist)
        } else {
            // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.source, self.stylist, None)
+            Insertion::start_of_file(self.python_ast, self.source, self.stylist)
        };
        if insertion.is_inline() {
            Err(anyhow::anyhow!(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brent Westbrook	fc513684d2	update handle_unary_op_comment docs	2025-11-14 17:42:47 -05:00
Brent Westbrook	ca5f4cc96f	factor out has_parenthesis_between, add some docs	2025-11-14 15:50:33 -05:00
Brent Westbrook	e0b0b54b25	try a different approach	2025-11-13 10:09:37 -05:00
Brent Westbrook	9bee558c3a	add more variations on issue test case	2025-11-13 09:37:15 -05:00
Brent Westbrook	f49fda317e	Revert "try only dangling" This reverts commit 4c8540ede798f544a895225b541f46552649fd7b.	2025-11-12 15:33:48 -05:00
Brent Westbrook	1cf5eff9f4	try only dangling	2025-11-12 15:33:48 -05:00
Brent Westbrook	ecccfd2a56	dangling operator comment fix leading comments	2025-11-12 15:33:48 -05:00
Brent Westbrook	a303d1aa49	leading operand comment	2025-11-12 15:33:48 -05:00
Brent Westbrook	6eebc35eec	add failing test	2025-11-12 15:33:48 -05:00
Brent Westbrook	923b4dd01e	Fix panic when formatting comments in unary expressions Summary -- This is a second attempt at fixing #19226 based on the feedback in https://github.com/astral-sh/ruff/pull/20494#issuecomment-3467920065. We currently mark the comment in an expression like this: ```py if '' and (not # 0): pass ``` as a leading comment on `not`, eventually causing a panic in `Operand::has_unparenthesized_leading_comments` because the end of the comment is greater than the start of the expression. `a1d9cb5830/crates/ruff_python_formatter/src/expression/binary_like.rs (L843)` This PR fixes the issue by instead making such a comment a dangling comment on the unary expression. In the third commit, I instead tried making the comment a leading comment on the operand, which also looks pretty reasonable to me. Making it a dangling comment seems more in line with the docs on `handle_unary_op_comments`, though. I also tried deleting the leading comment logic in favor of the new dangling logic in the fifth commit before reverting in the sixth. This looks okay to me too, but the current state of the PR seems like the least invasive fix. Test Plan -- A new, minimized test case based on the issue. I also checked that the original snippet from the report works now. Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>	2025-11-12 15:31:49 -05:00