Setup renovate for dist-workspace.toml

.github/renovate.json5

@@ -16,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
-    fileMatch: ["^(python|scripts)/.*pyproject\\.toml$"],
+    managerFilePatterns: ["/^(python|scripts)/.*pyproject\\.toml$/"],
   },
   pip_requirements: {
     // The default for this package manager is to run on all requirements.txt files:
@@ -34,12 +34,32 @@
   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
-    fileMatch: ["^playground/.*package\\.json$"],
+    managerFilePatterns: ["/^playground/.*package\\.json$/"],
   },
+  customManagers: [
+    {
+      customType: "regex",
+      managerFilePatterns: ["/^dist-workspace\\.toml$/"],
+      matchStrings: [
+        '"(?<depName>actions/[^"]+)" = "(?<currentDigest>[a-f0-9]{40})"\\s*#\\s*(?<currentValue>v[\\d\\.]+).*'
+      ],
+      datasourceTemplate: "github-tags",
+      autoReplaceStringTemplate: '"{{depName}}" = "{{newDigest}}" # {{newValue}}"',
+      extractVersionTemplate: "^(?<version>v[\\d\\.]+)$",
+      versioningTemplate: "semver"
+    }
+  ],
   "pre-commit": {
     enabled: true,
   },
   packageRules: [
+    // Ignore GitHub Actions in generated release.yml (managed by cargo-dist)
+    {
+      matchManagers: ["github-actions"],
+      matchFileNames: [".github/workflows/release.yml"],
+      enabled: false,
+      description: "Ignore GitHub Actions in release.yml as it's generated by cargo-dist",
+    },
     // Pin GitHub Actions to immutable SHAs.
     {
       matchDepTypes: ["action"],
@@ -106,6 +126,11 @@
       matchManagers: ["cargo"],
       matchPackageNames: ["strum"],
       description: "Weekly update of strum dependencies",
+    },
+    {
+      groupName: "cargo-dist GitHub Actions",
+      matchManagers: ["custom.regex"],
+      description: "Weekly update of GitHub Actions dependencies managed by cargo-dist",
     }
   ],
   vulnerabilityAlerts: {

.github/workflows/build-binaries.yml

@@ -49,7 +49,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build sdist"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           command: sdist
           args: --out dist
@@ -79,7 +79,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: x86_64
           args: --release --locked --out dist
@@ -121,7 +121,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: aarch64
           args: --release --locked --out dist
@@ -177,7 +177,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: ${{ matrix.platform.target }}
           args: --release --locked --out dist
@@ -230,7 +230,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: ${{ matrix.target }}
           manylinux: auto
@@ -304,7 +304,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: ${{ matrix.platform.target }}
           manylinux: auto
@@ -370,7 +370,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
@@ -435,7 +435,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2

.github/workflows/ci.yaml

@@ -321,30 +321,14 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - name: Setup Dev Drive
-        run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1
-
-      # actions/checkout does not let us clone into anywhere outside `github.workspace`, so we have to copy the clone
-      - name: Copy Git Repo to Dev Drive
-        env:
-          RUFF_WORKSPACE: ${{ env.RUFF_WORKSPACE }}
-        run: |
-          Copy-Item -Path "${{ github.workspace }}" -Destination "${env:RUFF_WORKSPACE}" -Recurse
-
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-        with:
-          workspaces: ${{ env.RUFF_WORKSPACE }}
-
       - name: "Install Rust toolchain"
-        working-directory: ${{ env.RUFF_WORKSPACE }}
         run: rustup show
-
       - name: "Install cargo nextest"
         uses: taiki-e/install-action@d12e869b89167df346dd0ff65da342d1fb1202fb # v2.53.2
         with:
           tool: cargo-nextest
       - name: "Run tests"
-        working-directory: ${{ env.RUFF_WORKSPACE }}
         shell: bash
         env:
           NEXTEST_PROFILE: "ci"
@@ -476,7 +460,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         name: Download Ruff binary to test
         id: download-cached-binary
@@ -677,7 +661,7 @@ jobs:
           branch: ${{ github.event.pull_request.base.ref }}
           workflow: "ci.yaml"
           check_artifacts: true
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - name: Fuzz
         env:
           FORCE_COLOR: 1
@@ -728,7 +712,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
+        uses: PyO3/maturin-action@35be3186fc8e037e329f06b68dcd807d83dcc6dc # v1.49.2
         with:
           args: --out dist
       - name: "Test wheel"
@@ -747,7 +731,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
@@ -790,7 +774,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: Install uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         run: uv pip install -r docs/requirements-insiders.txt --system
@@ -922,7 +906,7 @@ jobs:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -955,7 +939,7 @@ jobs:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
 
       - name: "Install Rust toolchain"
         run: rustup show

.github/workflows/daily_fuzz.yaml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+      - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"

.github/workflows/mypy_primer.yaml

@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
 
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:
@@ -48,8 +48,6 @@ jobs:
 
       - name: Run mypy_primer
         shell: bash
-        env:
-          TY_MEMORY_REPORT: mypy_primer
         run: |
           cd ruff
 
@@ -72,7 +70,7 @@ jobs:
           echo "Project selector: $PRIMER_SELECTOR"
           # Allow the exit code to be 0 or 1, only fail for actual mypy_primer crashes/bugs
           uvx \
-            --from="git+https://github.com/hauntsaninja/mypy_primer@e5f55447969d33ae3c7ccdb183e2a37101867270" \
+            --from="git+https://github.com/hauntsaninja/mypy_primer@01a7ca325f674433c58e02416a867178d1571128" \
             mypy_primer \
             --repo ruff \
             --type-checker ty \

.github/workflows/publish-pypi.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: "Install uv"
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           pattern: wheels-*

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           persist-credentials: false
           submodules: recursive
@@ -69,9 +69,9 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.5-prerelease.1/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.5-prerelease.3/cargo-dist-installer.sh | sh"
       - name: Cache dist
-        uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/dist
@@ -87,7 +87,7 @@ jobs:
           cat plan-dist-manifest.json
           echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: artifacts-plan-dist-manifest
           path: plan-dist-manifest.json
@@ -124,7 +124,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           persist-credentials: false
           submodules: recursive
@@ -154,7 +154,7 @@ jobs:
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: artifacts-build-global
           path: |
@@ -175,7 +175,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           persist-credentials: false
           submodules: recursive
@@ -201,7 +201,7 @@ jobs:
           cat dist-manifest.json
           echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           # Overwrite the previous copy
           name: artifacts-dist-manifest
@@ -251,7 +251,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           persist-credentials: false
           submodules: recursive

.github/workflows/setup-dev-drive.ps1

@@ -1,93 +0,0 @@
-# Configures a drive for testing in CI.
-#
-# When using standard GitHub Actions runners, a `D:` drive is present and has
-# similar or better performance characteristics than a ReFS dev drive. Sometimes
-# using a larger runner is still more performant (e.g., when running the test
-# suite) and we need to create a dev drive. This script automatically configures
-# the appropriate drive.
-#
-# When using GitHub Actions' "larger runners", the `D:` drive is not present and
-# we create a DevDrive mount on `C:`. This is purported to be more performant
-# than an ReFS drive, though we did not see a change when we switched over.
-#
-# When using Depot runners, the underling infrastructure is EC2, which does not
-# support Hyper-V. The `New-VHD` commandlet only works with Hyper-V, but we can
-# create a ReFS drive using `diskpart` and `format` directory. We cannot use a
-# DevDrive, as that also requires Hyper-V. The Depot runners use `D:` already,
-# so we must check if it's a Depot runner first, and we use `V:` as the target
-# instead.
-
-
-if ($env:DEPOT_RUNNER -eq "1") {
-    Write-Output "DEPOT_RUNNER detected, setting up custom dev drive..."
-
-    # Create VHD and configure drive using diskpart
-    $vhdPath = "C:\ruff_dev_drive.vhdx"
-    @"
-create vdisk file="$vhdPath" maximum=20480 type=expandable
-attach vdisk
-create partition primary
-active
-assign letter=V
-"@ | diskpart
-
-    # Format the drive as ReFS
-    format V: /fs:ReFS /q /y
-    $Drive = "V:"
-
-    Write-Output "Custom dev drive created at $Drive"
-} elseif (Test-Path "D:\") {
-	# Note `Get-PSDrive` is not sufficient because the drive letter is assigned.
-    Write-Output "Using existing drive at D:"
-    $Drive = "D:"
-} else {
-	# The size (20 GB) is chosen empirically to be large enough for our
-	# workflows; larger drives can take longer to set up.
-	$Volume = New-VHD -Path C:/ruff_dev_drive.vhdx -SizeBytes 20GB |
-						Mount-VHD -Passthru |
-						Initialize-Disk -Passthru |
-						New-Partition -AssignDriveLetter -UseMaximumSize |
-						Format-Volume -DevDrive -Confirm:$false -Force
-
-	$Drive = "$($Volume.DriveLetter):"
-
-	# Set the drive as trusted
-	# See https://learn.microsoft.com/en-us/windows/dev-drive/#how-do-i-designate-a-dev-drive-as-trusted
-	fsutil devdrv trust $Drive
-
-	# Disable antivirus filtering on dev drives
-	# See https://learn.microsoft.com/en-us/windows/dev-drive/#how-do-i-configure-additional-filters-on-dev-drive
-	fsutil devdrv enable /disallowAv
-
-	# Remount so the changes take effect
-	Dismount-VHD -Path C:/ruff_dev_drive.vhdx
-	Mount-VHD -Path C:/ruff_dev_drive.vhdx
-
-	# Show some debug information
-	Write-Output $Volume
-	fsutil devdrv query $Drive
-
-    Write-Output "Using Dev Drive at $Volume"
-}
-
-$Tmp = "$($Drive)\ruff-tmp"
-
-# Create the directory ahead of time in an attempt to avoid race-conditions
-New-Item $Tmp -ItemType Directory
-
-# Move Cargo to the dev drive
-New-Item -Path "$($Drive)/.cargo/bin" -ItemType Directory -Force
-if (Test-Path "C:/Users/runneradmin/.cargo") {
-    Copy-Item -Path "C:/Users/runneradmin/.cargo/*" -Destination "$($Drive)/.cargo/" -Recurse -Force
-}
-
-Write-Output `
-	"DEV_DRIVE=$($Drive)" `
-	"TMP=$($Tmp)" `
-	"TEMP=$($Tmp)" `
-	"UV_INTERNAL__TEST_DIR=$($Tmp)" `
-	"RUSTUP_HOME=$($Drive)/.rustup" `
-	"CARGO_HOME=$($Drive)/.cargo" `
-	"RUFF_WORKSPACE=$($Drive)/ruff" `
-	"PATH=$($Drive)/.cargo/bin;$env:PATH" `
-	>> $env:GITHUB_ENV

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

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0
 
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
         with:

.pre-commit-config.yaml

@@ -81,7 +81,7 @@ repos:
         pass_filenames: false # This makes it a lot faster
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.1
+    rev: v0.11.13
     hooks:
       - id: ruff-format
       - id: ruff
@@ -91,7 +91,7 @@ repos:
 
   # Prettier
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.6.2
+    rev: v3.5.3
     hooks:
       - id: prettier
         types: [yaml]
@@ -99,12 +99,12 @@ repos:
   # zizmor detects security vulnerabilities in GitHub Actions workflows.
   # Additional configuration for the tool is found in `.github/zizmor.yml`
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.10.0
+    rev: v1.9.0
     hooks:
       - id: zizmor
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.1
+    rev: 0.33.0
     hooks:
       - id: check-github-workflows
 

CHANGELOG.md

@@ -1,81 +1,5 @@
 # Changelog
 
-## 0.12.1
-
-### Preview features
-
-- \[`flake8-errmsg`\] Extend `EM101` to support byte strings ([#18867](https://github.com/astral-sh/ruff/pull/18867))
-- \[`flake8-use-pathlib`\] Add autofix for `PTH202` ([#18763](https://github.com/astral-sh/ruff/pull/18763))
-- \[`pygrep-hooks`\] Add `AsyncMock` methods to `invalid-mock-access` (`PGH005`) ([#18547](https://github.com/astral-sh/ruff/pull/18547))
-- \[`pylint`\] Ignore `__init__.py` files in (`PLC0414`) ([#18400](https://github.com/astral-sh/ruff/pull/18400))
-- \[`ruff`\] Trigger `RUF037` for empty string and byte strings ([#18862](https://github.com/astral-sh/ruff/pull/18862))
-- [formatter] Fix missing blank lines before decorated classes in `.pyi` files ([#18888](https://github.com/astral-sh/ruff/pull/18888))
-
-### Bug fixes
-
-- Avoid generating diagnostics with per-file ignores ([#18801](https://github.com/astral-sh/ruff/pull/18801))
-- Handle parenthesized arguments in `remove_argument` ([#18805](https://github.com/astral-sh/ruff/pull/18805))
-- \[`flake8-logging`\] Avoid false positive for `exc_info=True` outside `logger.exception` (`LOG014`) ([#18737](https://github.com/astral-sh/ruff/pull/18737))
-- \[`flake8-pytest-style`\] Enforce `pytest` import for decorators ([#18779](https://github.com/astral-sh/ruff/pull/18779))
-- \[`flake8-pytest-style`\] Mark autofix for `PT001` and `PT023` as unsafe if there's comments in the decorator ([#18792](https://github.com/astral-sh/ruff/pull/18792))
-- \[`flake8-pytest-style`\] `PT001`/`PT023` fix makes syntax error on parenthesized decorator ([#18782](https://github.com/astral-sh/ruff/pull/18782))
-- \[`flake8-raise`\] Make fix unsafe if it deletes comments (`RSE102`) ([#18788](https://github.com/astral-sh/ruff/pull/18788))
-- \[`flake8-simplify`\] Fix `SIM911` autofix creating a syntax error ([#18793](https://github.com/astral-sh/ruff/pull/18793))
-- \[`flake8-simplify`\] Fix false negatives for shadowed bindings (`SIM910`, `SIM911`) ([#18794](https://github.com/astral-sh/ruff/pull/18794))
-- \[`flake8-simplify`\] Preserve original behavior for `except ()` and bare `except` (`SIM105`) ([#18213](https://github.com/astral-sh/ruff/pull/18213))
-- \[`flake8-pyi`\] Fix `PYI041`'s fix causing `TypeError` with `None | None | ...` ([#18637](https://github.com/astral-sh/ruff/pull/18637))
-- \[`perflint`\] Fix `PERF101` autofix creating a syntax error and mark autofix as unsafe if there are comments in the `list` call expr ([#18803](https://github.com/astral-sh/ruff/pull/18803))
-- \[`perflint`\] Fix false negative in `PERF401` ([#18866](https://github.com/astral-sh/ruff/pull/18866))
-- \[`pylint`\] Avoid flattening nested `min`/`max` when outer call has single argument (`PLW3301`) ([#16885](https://github.com/astral-sh/ruff/pull/16885))
-- \[`pylint`\] Fix `PLC2801` autofix creating a syntax error ([#18857](https://github.com/astral-sh/ruff/pull/18857))
-- \[`pylint`\] Mark `PLE0241` autofix as unsafe if there's comments in the base classes ([#18832](https://github.com/astral-sh/ruff/pull/18832))
-- \[`pylint`\] Suppress `PLE2510`/`PLE2512`/`PLE2513`/`PLE2514`/`PLE2515` autofix if the text contains an odd number of backslashes ([#18856](https://github.com/astral-sh/ruff/pull/18856))
-- \[`refurb`\] Detect more exotic float literals in `FURB164` ([#18925](https://github.com/astral-sh/ruff/pull/18925))
-- \[`refurb`\] Fix `FURB163` autofix creating a syntax error for `yield` expressions ([#18756](https://github.com/astral-sh/ruff/pull/18756))
-- \[`refurb`\] Mark `FURB129` autofix as unsafe if there's comments in the `readlines` call ([#18858](https://github.com/astral-sh/ruff/pull/18858))
-- \[`ruff`\] Fix false positives and negatives in `RUF010` ([#18690](https://github.com/astral-sh/ruff/pull/18690))
-- Fix casing of `analyze.direction` variant names ([#18892](https://github.com/astral-sh/ruff/pull/18892))
-
-### Rule changes
-
-- Fix f-string interpolation escaping in generated fixes ([#18882](https://github.com/astral-sh/ruff/pull/18882))
-- \[`flake8-return`\] Mark `RET501` fix unsafe if comments are inside ([#18780](https://github.com/astral-sh/ruff/pull/18780))
-- \[`flake8-async`\] Fix detection for large integer sleep durations in `ASYNC116` rule ([#18767](https://github.com/astral-sh/ruff/pull/18767))
-- \[`flake8-async`\] Mark autofix for `ASYNC115` as unsafe if the call expression contains comments ([#18753](https://github.com/astral-sh/ruff/pull/18753))
-- \[`flake8-bugbear`\] Mark autofix for `B004` as unsafe if the `hasattr` call expr contains comments ([#18755](https://github.com/astral-sh/ruff/pull/18755))
-- \[`flake8-comprehension`\] Mark autofix for `C420` as unsafe if there's comments inside the dict comprehension ([#18768](https://github.com/astral-sh/ruff/pull/18768))
-- \[`flake8-comprehensions`\] Handle template strings for comprehension fixes ([#18710](https://github.com/astral-sh/ruff/pull/18710))
-- \[`flake8-future-annotations`\] Add autofix (`FA100`) ([#18903](https://github.com/astral-sh/ruff/pull/18903))
-- \[`pyflakes`\] Mark `F504`/`F522`/`F523` autofix as unsafe if there's a call with side effect ([#18839](https://github.com/astral-sh/ruff/pull/18839))
-- \[`pylint`\] Allow fix with comments and document performance implications (`PLW3301`) ([#18936](https://github.com/astral-sh/ruff/pull/18936))
-- \[`pylint`\] Detect more exotic `NaN` literals in `PLW0177` ([#18630](https://github.com/astral-sh/ruff/pull/18630))
-- \[`pylint`\] Fix `PLC1802` autofix creating a syntax error and mark autofix as unsafe if there's comments in the `len` call ([#18836](https://github.com/astral-sh/ruff/pull/18836))
-- \[`pyupgrade`\] Extend version detection to include `sys.version_info.major` (`UP036`) ([#18633](https://github.com/astral-sh/ruff/pull/18633))
-- \[`ruff`\] Add lint rule `RUF064` for calling `chmod` with non-octal integers ([#18541](https://github.com/astral-sh/ruff/pull/18541))
-- \[`ruff`\] Added `cls.__dict__.get('__annotations__')` check (`RUF063`) ([#18233](https://github.com/astral-sh/ruff/pull/18233))
-- \[`ruff`\] Frozen `dataclass` default should be valid (`RUF009`) ([#18735](https://github.com/astral-sh/ruff/pull/18735))
-
-### Server
-
-- Consider virtual path for various server actions ([#18910](https://github.com/astral-sh/ruff/pull/18910))
-
-### Documentation
-
-- Add fix safety sections ([#18940](https://github.com/astral-sh/ruff/pull/18940),[#18841](https://github.com/astral-sh/ruff/pull/18841),[#18802](https://github.com/astral-sh/ruff/pull/18802),[#18837](https://github.com/astral-sh/ruff/pull/18837),[#18800](https://github.com/astral-sh/ruff/pull/18800),[#18415](https://github.com/astral-sh/ruff/pull/18415),[#18853](https://github.com/astral-sh/ruff/pull/18853),[#18842](https://github.com/astral-sh/ruff/pull/18842))
-- Use updated pre-commit id ([#18718](https://github.com/astral-sh/ruff/pull/18718))
-- \[`perflint`\] Small docs improvement to `PERF401` ([#18786](https://github.com/astral-sh/ruff/pull/18786))
-- \[`pyupgrade`\]: Use `super()`, not `__super__` in error messages (`UP008`) ([#18743](https://github.com/astral-sh/ruff/pull/18743))
-- \[`flake8-pie`\] Small docs fix to `PIE794` ([#18829](https://github.com/astral-sh/ruff/pull/18829))
-- \[`flake8-pyi`\] Correct `collections-named-tuple` example to use PascalCase assignment ([#16884](https://github.com/astral-sh/ruff/pull/16884))
-- \[`flake8-pie`\] Add note on type checking benefits to `unnecessary-dict-kwargs` (`PIE804`) ([#18666](https://github.com/astral-sh/ruff/pull/18666))
-- \[`pycodestyle`\] Clarify PEP 8 relationship to `whitespace-around-operator` rules ([#18870](https://github.com/astral-sh/ruff/pull/18870))
-
-### Other changes
-
-- Disallow newlines in format specifiers of single quoted f- or t-strings ([#18708](https://github.com/astral-sh/ruff/pull/18708))
-- \[`flake8-logging`\] Add fix safety section to `LOG002` ([#18840](https://github.com/astral-sh/ruff/pull/18840))
-- \[`pyupgrade`\] Add fix safety section to `UP010` ([#18838](https://github.com/astral-sh/ruff/pull/18838))
-
 ## 0.12.0
 
 Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
@@ -92,7 +16,7 @@ guide and overview of the changes!
 
 - **New default Python version handling for syntax errors**
 
-    Ruff will default to the *latest* supported Python version (3.13) when
+    Ruff will default to the _latest_ supported Python version (3.13) when
     checking for the version-related syntax errors mentioned above to prevent
     false positives in projects without a Python version configured. The default
     in all other cases, like applying lint rules, is unchanged and remains at the
@@ -147,7 +71,7 @@ The following rules have been stabilized and are no longer in preview:
 - [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
 - [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
 - [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
-- [`non-pep604-annotation-optional`] (`UP045`)
+- [`non-pep604-annotation-optional`](https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional) (`UP045`)
 - [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
 - [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
 - [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)

Cargo.lock

@@ -132,15 +132,6 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -178,36 +169,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "attribute-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
-dependencies = [
- "attribute-derive-macro",
- "derive-where",
- "manyhow",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "attribute-derive-macro"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
-dependencies = [
- "collection_literals",
- "interpolator",
- "manyhow",
- "proc-macro-utils",
- "proc-macro2",
- "quote",
- "quote-use",
- "syn",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -220,15 +181,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "2.0.1"
@@ -467,9 +419,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "clearscreen"
-version = "4.0.2"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a8ab73a1c02b0c15597b22e09c7dc36e63b2f601f9d1e83ac0c3decd38b1ae"
+checksum = "8c41dc435a7b98e4608224bbf65282309f5403719df9113621b30f8b6f74e2f4"
 dependencies = [
  "nix 0.29.0",
  "terminfo",
@@ -480,27 +432,22 @@ dependencies = [
 
 [[package]]
 name = "codspeed"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922018102595f6668cdd09c03f4bff2d951ce2318c6dca4fe11bdcb24b65b2bf"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
 dependencies = [
- "anyhow",
- "bincode 1.3.3",
  "colored 2.2.0",
- "glob",
  "libc",
- "nix 0.29.0",
  "serde",
  "serde_json",
- "statrs",
  "uuid",
 ]
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d8ad82d2383cb74995f58993cbdd2914aed57b2f91f46580310dd81dc3d05a"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
 dependencies = [
  "codspeed",
  "codspeed-criterion-compat-walltime",
@@ -509,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61badaa6c452d192a29f8387147888f0ab358553597c3fe9bf8a162ef7c2fa64"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
 dependencies = [
  "anes",
  "cast",
@@ -534,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acf1d6fe367c2ff5ff136ca723f678490c3691d59d7f2b83d5e53b7b25ac91e"
+checksum = "8620a09dfaf37b3c45f982c4b65bd8f9b0203944da3ffa705c0fcae6b84655ff"
 dependencies = [
  "codspeed",
  "codspeed-divan-compat-macros",
@@ -545,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcfa2013d7bee54a497d0e1410751d5de690fd67a3e9eb728ca049b6a3d16d0b"
+checksum = "30fe872bc4214626b35d3a1706a905d0243503bb6ba3bb7be2fc59083d5d680c"
 dependencies = [
  "divan-macros",
  "itertools 0.14.0",
@@ -559,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "3.0.2"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e513100fb0e7ba02fb3824546ecd2abfb8f334262f0972225b463aad07f99ff0"
+checksum = "104caa97b36d4092d89e24e4b103b40ede1edab03c0372d19e14a33f9393132b"
 dependencies = [
  "cfg-if",
  "clap",
@@ -572,12 +519,6 @@ dependencies = [
  "regex-lite",
 ]
 
-[[package]]
-name = "collection_literals"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.3"
@@ -867,17 +808,6 @@ dependencies = [
  "parking_lot_core",
 ]
 
-[[package]]
-name = "derive-where"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -1000,12 +930,35 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_home"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
 
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1137,29 +1090,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "get-size-derive2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aac2af9f9a6a50e31b1e541d05b7925add83d3982c2793193fe9d4ee584323c"
-dependencies = [
- "attribute-derive",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "get-size2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a0312efd19e1c45922dfcc2d6806d3ffc4bca261f89f31fcc4f63f438d885"
-dependencies = [
- "compact_str",
- "get-size-derive2",
- "hashbrown 0.15.4",
- "smallvec",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1470,9 +1400,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.4",
@@ -1548,12 +1478,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "interpolator"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8"
-
 [[package]]
 name = "intrusive-collections"
 version = "0.9.7"
@@ -1815,9 +1739,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1854,29 +1778,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "manyhow"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587"
-dependencies = [
- "manyhow-macros",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "manyhow-macros"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495"
-dependencies = [
- "proc-macro-utils",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "markdown"
 version = "1.0.0"
@@ -2103,9 +2004,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordermap"
-version = "0.5.8"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6bff06e4a5dc6416bead102d3e63c480dd852ffbb278bf8cfeb4966b329609"
+checksum = "7d31b8b7a99f71bdff4235faf9ce9eada0ad3562c8fbeb7d607d9f41a6ec569d"
 dependencies = [
  "indexmap",
  "serde",
@@ -2136,16 +2037,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "papaya"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
-dependencies = [
- "equivalent",
- "seize",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -2447,17 +2338,6 @@ dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "proc-macro-utils"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaf08a13de400bc215877b5bdc088f241b12eb42f0a548d3390dc1c56bb7071"
-dependencies = [
- "proc-macro2",
- "quote",
- "smallvec",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -2534,28 +2414,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "quote-use"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9619db1197b497a36178cfc736dc96b271fe918875fbf1344c436a7e93d0321e"
-dependencies = [
- "quote",
- "quote-use-macros",
-]
-
-[[package]]
-name = "quote-use-macros"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35"
-dependencies = [
- "proc-macro-utils",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "r-efi"
 version = "5.2.0"
@@ -2724,19 +2582,18 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.12.1"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "argfile",
  "assert_fs",
- "bincode 2.0.1",
+ "bincode",
  "bitflags 2.9.1",
  "cachedir",
  "clap",
  "clap_complete_command",
  "clearscreen",
  "colored 3.0.0",
- "dunce",
  "filetime",
  "globwalk",
  "ignore",
@@ -2846,7 +2703,6 @@ dependencies = [
  "dunce",
  "etcetera",
  "filetime",
- "get-size2",
  "glob",
  "ignore",
  "insta",
@@ -2962,7 +2818,6 @@ dependencies = [
 name = "ruff_index"
 version = "0.0.0"
 dependencies = [
- "get-size2",
  "ruff_macros",
  "salsa",
  "static_assertions",
@@ -2970,7 +2825,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.12.1"
+version = "0.12.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -2980,7 +2835,6 @@ dependencies = [
  "fern",
  "glob",
  "globset",
- "hashbrown 0.15.4",
  "imperative",
  "insta",
  "is-macro",
@@ -3076,7 +2930,6 @@ dependencies = [
  "aho-corasick",
  "bitflags 2.9.1",
  "compact_str",
- "get-size2",
  "is-macro",
  "itertools 0.14.0",
  "memchr",
@@ -3176,7 +3029,6 @@ dependencies = [
  "bitflags 2.9.1",
  "bstr",
  "compact_str",
- "get-size2",
  "insta",
  "memchr",
  "ruff_annotate_snippets",
@@ -3194,6 +3046,16 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "ruff_python_resolver"
+version = "0.0.0"
+dependencies = [
+ "env_logger",
+ "insta",
+ "log",
+ "tempfile",
+]
+
 [[package]]
 name = "ruff_python_semantic"
 version = "0.0.0"
@@ -3283,7 +3145,6 @@ dependencies = [
 name = "ruff_source_file"
 version = "0.0.0"
 dependencies = [
- "get-size2",
  "memchr",
  "ruff_text_size",
  "serde",
@@ -3293,7 +3154,6 @@ dependencies = [
 name = "ruff_text_size"
 version = "0.0.0"
 dependencies = [
- "get-size2",
  "schemars",
  "serde",
  "serde_test",
@@ -3302,7 +3162,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.12.1"
+version = "0.12.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3421,8 +3281,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3432,7 +3292,6 @@ dependencies = [
  "hashlink",
  "indexmap",
  "intrusive-collections",
- "papaya",
  "parking_lot",
  "portable-atomic",
  "rayon",
@@ -3446,13 +3305,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
 
 [[package]]
 name = "salsa-macros"
-version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=fc00eba89e5dcaa5edba51c41aa5f309b5cb126b#fc00eba89e5dcaa5edba51c41aa5f309b5cb126b"
+version = "0.22.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3505,16 +3364,6 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
-[[package]]
-name = "seize"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -3715,16 +3564,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "statrs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
-dependencies = [
- "approx",
- "num-traits",
-]
-
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.2.1"
@@ -4185,7 +4024,6 @@ dependencies = [
  "camino",
  "colored 3.0.0",
  "crossbeam",
- "get-size2",
  "globset",
  "insta",
  "notify",
@@ -4225,7 +4063,6 @@ dependencies = [
  "countme",
  "dir-test",
  "drop_bomb",
- "get-size2",
  "glob",
  "hashbrown 0.15.4",
  "indexmap",
@@ -4287,7 +4124,6 @@ dependencies = [
  "ty_ide",
  "ty_project",
  "ty_python_semantic",
- "ty_vendored",
 ]
 
 [[package]]
@@ -4327,7 +4163,6 @@ version = "0.0.0"
 dependencies = [
  "path-slash",
  "ruff_db",
- "static_assertions",
  "walkdir",
  "zip",
 ]
@@ -4762,10 +4597,11 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "8.0.0"
+version = "7.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d"
+checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762"
 dependencies = [
+ "either",
  "env_home",
  "rustix",
  "winsafe",

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.86"
+rust-version = "1.85"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -62,8 +62,8 @@ camino = { version = "1.1.7" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
-divan = { package = "codspeed-divan-compat", version = "3.0.2" }
-codspeed-criterion-compat = { version = "3.0.2", default-features = false }
+divan = { package = "codspeed-divan-compat", version = "2.10.1" }
+codspeed-criterion-compat = { version = "2.6.0", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
@@ -75,16 +75,11 @@ dashmap = { version = "6.0.1" }
 dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
+env_logger = { version = "0.11.0" }
 etcetera = { version = "0.10.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
 getrandom = { version = "0.3.1" }
-get-size2 = { version = "0.5.0", features = [
-    "derive",
-    "smallvec",
-    "hashbrown",
-    "compact-str"
-] }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
@@ -137,7 +132,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", rev = "fc00eba89e5dcaa5edba51c41aa5f309b5cb126b" }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "09627e450566f894956710a3fd923dc80462ae6d" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
@@ -227,7 +222,6 @@ unnecessary_debug_formatting = "allow"  # too many instances, the display also d
 # Without the hashes we run into a `rustfmt` bug in some snapshot tests, see #13250
 needless_raw_string_hashes = "allow"
 # Disallowed restriction lints
-ignore_without_reason = "allow" # Too many exsisting instances, and there's no auto fix.
 print_stdout = "warn"
 print_stderr = "warn"
 dbg_macro = "warn"

README.md

@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.1/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.1/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.0/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.0/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.1
+  rev: v0.12.0
   hooks:
     # Run the linter.
     - id: ruff-check
@@ -423,7 +423,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 
 - [Albumentations](https://github.com/albumentations-team/albumentations)
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
-- [Anki](https://apps.ankiweb.net/)
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
 - AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.1"
+version = "0.12.0"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -68,7 +68,6 @@ ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
 assert_fs = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"] }
-dunce = { workspace = true }
 indoc = { workspace = true }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }

crates/ruff/src/cache.rs

@@ -442,7 +442,7 @@ impl LintCacheData {
             // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
             // this also serves to filter them out, but we shouldn't be caching files with syntax
             // errors anyway.
-            .filter_map(|msg| Some((msg.name().parse().ok()?, msg)))
+            .filter_map(|msg| Some((msg.noqa_code().and_then(|code| code.rule())?, msg)))
             .map(|(rule, msg)| {
                 // Make sure that all message use the same source file.
                 assert_eq!(

crates/ruff/src/printer.rs

@@ -6,6 +6,7 @@ use anyhow::Result;
 use bitflags::bitflags;
 use colored::Colorize;
 use itertools::{Itertools, iterate};
+use ruff_linter::codes::NoqaCode;
 use ruff_linter::linter::FixTable;
 use serde::Serialize;
 
@@ -14,7 +15,7 @@ use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
     AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
     JsonEmitter, JsonLinesEmitter, JunitEmitter, OldDiagnostic, PylintEmitter, RdjsonEmitter,
-    SarifEmitter, SecondaryCode, TextEmitter,
+    SarifEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -35,8 +36,8 @@ bitflags! {
 }
 
 #[derive(Serialize)]
-struct ExpandedStatistics<'a> {
-    code: Option<&'a SecondaryCode>,
+struct ExpandedStatistics {
+    code: Option<NoqaCode>,
     name: &'static str,
     count: usize,
     fixable: bool,
@@ -302,12 +303,11 @@ impl Printer {
         let statistics: Vec<ExpandedStatistics> = diagnostics
             .inner
             .iter()
-            .map(|message| (message.secondary_code(), message))
+            .map(|message| (message.noqa_code(), message))
             .sorted_by_key(|(code, message)| (*code, message.fixable()))
             .fold(
                 vec![],
-                |mut acc: Vec<((Option<&SecondaryCode>, &OldDiagnostic), usize)>,
-                 (code, message)| {
+                |mut acc: Vec<((Option<NoqaCode>, &OldDiagnostic), usize)>, (code, message)| {
                     if let Some(((prev_code, _prev_message), count)) = acc.last_mut() {
                         if *prev_code == code {
                             *count += 1;
@@ -349,7 +349,12 @@ impl Printer {
                 );
                 let code_width = statistics
                     .iter()
-                    .map(|statistic| statistic.code.map_or(0, |s| s.len()))
+                    .map(|statistic| {
+                        statistic
+                            .code
+                            .map_or_else(String::new, |rule| rule.to_string())
+                            .len()
+                    })
                     .max()
                     .unwrap();
                 let any_fixable = statistics.iter().any(|statistic| statistic.fixable);
@@ -365,8 +370,7 @@ impl Printer {
                         statistic.count.to_string().bold(),
                         statistic
                             .code
-                            .map(SecondaryCode::as_str)
-                            .unwrap_or_default()
+                            .map_or_else(String::new, |rule| rule.to_string())
                             .red()
                             .bold(),
                         if any_fixable {

crates/ruff/tests/analyze_graph.rs

@@ -17,7 +17,6 @@ fn command() -> Command {
     command.arg("analyze");
     command.arg("graph");
     command.arg("--preview");
-    command.env_clear();
     command
 }
 
@@ -566,8 +565,8 @@ fn venv() -> Result<()> {
 
         ----- stderr -----
         ruff failed
-          Cause: Invalid `--python` argument `none`: does not point to a Python executable or a directory on disk
-          Cause: No such file or directory (os error 2)
+          Cause: Invalid search path settings
+          Cause: Failed to discover the site-packages directory: Invalid `--python` argument `none`: does not point to a Python executable or a directory on disk
         ");
     });
 

crates/ruff/tests/lint.rs

@@ -612,7 +612,7 @@ fn extend_passed_via_config_argument() {
 #[test]
 fn nonexistent_extend_file() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     fs::write(
         project_dir.join("ruff.toml"),
         r#"
@@ -653,7 +653,7 @@ extend = "ruff3.toml"
 #[test]
 fn circular_extend() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
+    let project_path = tempdir.path().canonicalize()?;
 
     fs::write(
         project_path.join("ruff.toml"),
@@ -698,7 +698,7 @@ extend = "ruff.toml"
 #[test]
 fn parse_error_extends() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_path = dunce::canonicalize(tempdir.path())?;
+    let project_path = tempdir.path().canonicalize()?;
 
     fs::write(
         project_path.join("ruff.toml"),
@@ -2130,7 +2130,7 @@ select = ["UP006"]
 #[test]
 fn requires_python_no_tool() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2441,7 +2441,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_target_version_override() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2752,7 +2752,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_no_tool_with_check() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("pyproject.toml");
     fs::write(
         &ruff_toml,
@@ -2797,7 +2797,7 @@ requires-python = ">= 3.11"
 #[test]
 fn requires_python_ruff_toml_no_target_fallback() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3118,7 +3118,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_no_target_fallback_check() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3173,7 +3173,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let outer_pyproject = tempdir.path().join("pyproject.toml");
     fs::write(
         &outer_pyproject,
@@ -3200,7 +3200,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"(?m)^foo\\test","foo/test")]
@@ -3499,7 +3499,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_pyproject_toml_above_with_tool() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let outer_pyproject = tempdir.path().join("pyproject.toml");
     fs::write(
         &outer_pyproject,
@@ -3528,7 +3528,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/"),(r"foo\\","foo/")]
@@ -3827,7 +3827,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_ruff_toml_above() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -3856,7 +3856,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/foo/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
@@ -4441,7 +4441,7 @@ from typing import Union;foo: Union[int, str] = 1
 #[test]
 fn requires_python_extend_from_shared_config() -> Result<()> {
     let tempdir = TempDir::new()?;
-    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let project_dir = tempdir.path().canonicalize()?;
     let ruff_toml = tempdir.path().join("ruff.toml");
     fs::write(
         &ruff_toml,
@@ -4479,7 +4479,7 @@ from typing import Union;foo: Union[int, str] = 1
 "#,
     )?;
 
-    let testpy_canon = dunce::canonicalize(testpy)?;
+    let testpy_canon = testpy.canonicalize()?;
 
     insta::with_settings!({
         filters => vec![(tempdir_filter(&testpy_canon).as_str(), "[TMP]/test.py"),(tempdir_filter(&project_dir).as_str(), "[TMP]/")]

crates/ruff/tests/show_settings.rs

@@ -12,8 +12,10 @@ fn display_default_settings() -> anyhow::Result<()> {
 
     // Tempdir path's on macos are symlinks, which doesn't play nicely with
     // our snapshot filtering.
-    let project_dir =
-        dunce::canonicalize(tempdir.path()).context("Failed to canonical tempdir path.")?;
+    let project_dir = tempdir
+        .path()
+        .canonicalize()
+        .context("Failed to canonical tempdir path.")?;
 
     std::fs::write(
         project_dir.join("pyproject.toml"),

crates/ruff_annotate_snippets/src/renderer/display_list.rs

@@ -352,7 +352,7 @@ impl DisplaySet<'_> {
                         // FIXME: `unicode_width` sometimes disagrees with terminals on how wide a `char`
                         // is. For now, just accept that sometimes the code line will be longer than
                         // desired.
-                        let next = char_width(ch).unwrap_or(1);
+                        let next = unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1);
                         if taken + next > right - left {
                             was_cut_right = true;
                             break;
@@ -377,7 +377,7 @@ impl DisplaySet<'_> {
                     let left: usize = text
                         .chars()
                         .take(left)
-                        .map(|ch| char_width(ch).unwrap_or(1))
+                        .map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
                         .sum();
 
                     let mut annotations = annotations.clone();
@@ -821,7 +821,11 @@ impl DisplaySourceAnnotation<'_> {
     // Length of this annotation as displayed in the stderr output
     fn len(&self) -> usize {
         // Account for usize underflows
-        self.range.1.abs_diff(self.range.0)
+        if self.range.1 > self.range.0 {
+            self.range.1 - self.range.0
+        } else {
+            self.range.0 - self.range.1
+        }
     }
 
     fn takes_space(&self) -> bool {
@@ -1389,7 +1393,6 @@ fn format_body<'m>(
         let line_length: usize = line.len();
         let line_range = (current_index, current_index + line_length);
         let end_line_size = end_line.len();
-
         body.push(DisplayLine::Source {
             lineno: Some(current_line),
             inline_marks: vec![],
@@ -1449,12 +1452,12 @@ fn format_body<'m>(
                         let annotation_start_col = line
                             [0..(start - line_start_index).min(line_length)]
                             .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                             .sum::<usize>();
                         let mut annotation_end_col = line
                             [0..(end - line_start_index).min(line_length)]
                             .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                             .sum::<usize>();
                         if annotation_start_col == annotation_end_col {
                             // At least highlight something
@@ -1496,7 +1499,7 @@ fn format_body<'m>(
                         let annotation_start_col = line
                             [0..(start - line_start_index).min(line_length)]
                             .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                             .sum::<usize>();
                         let annotation_end_col = annotation_start_col + 1;
 
@@ -1555,7 +1558,7 @@ fn format_body<'m>(
                     {
                         let end_mark = line[0..(end - line_start_index).min(line_length)]
                             .chars()
-                            .map(|c| char_width(c).unwrap_or(0))
+                            .map(|c| unicode_width::UnicodeWidthChar::width(c).unwrap_or(0))
                             .sum::<usize>()
                             .saturating_sub(1);
                         // If the annotation ends on a line-end character, we
@@ -1751,11 +1754,3 @@ fn format_inline_marks(
     }
     Ok(())
 }
-
-fn char_width(c: char) -> Option<usize> {
-    if c == '\t' {
-        Some(4)
-    } else {
-        unicode_width::UnicodeWidthChar::width(c)
-    }
-}

crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.svg

@@ -1,38 +0,0 @@
-<svg width="740px" height="146px" xmlns="http://www.w3.org/2000/svg">
-  <style>
-    .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
-    .fg-bright-blue { fill: #5555FF }
-    .fg-bright-red { fill: #FF5555 }
-    .container {
-      padding: 0 10px;
-      line-height: 18px;
-    }
-    .bold { font-weight: bold; }
-    tspan {
-      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
-      white-space: pre;
-      line-height: 18px;
-    }
-  </style>
-
-  <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
-
-  <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">call-non-callable</tspan>
-</tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/main.py:5:9</tspan>
-</tspan>
-    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">4 |</tspan><tspan> def f():</tspan>
-</tspan>
-    <tspan x="10px" y="100px"><tspan class="fg-bright-blue bold">5 |</tspan><tspan>     return (1 == '2')()  # Tab indented</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>            </tspan><tspan class="fg-bright-red bold">^^^^^^^^^^^^</tspan>
-</tspan>
-    <tspan x="10px" y="136px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-  </text>
-
-</svg>

crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_label_alignment.toml

@@ -1,45 +0,0 @@
-
-# [crates/ruff_db/src/diagnostic/render.rs:123:47] diag.to_annotate() = Message {
-    # level: Error,
-    # id: Some(
-        # "call-non-callable",
-    # ),
-    # title: "Object of type `bool` is not callable",
-    # snippets: [
-        # Snippet {
-            # origin: Some(
-                # "main.py",
-            # ),
-            # line_start: 1,
-            # source: "def f():\n\treturn (1 == '2')()  # Tab indented\n",
-            # annotations: [
-                # Annotation {
-                    # range: 17..29,
-                    # label: None,
-                    # level: Error,
-                # },
-            # ],
-            # fold: false,
-        # },
-    # ],
-    # footer: [],
-# }
-
-[message]
-level = "Error"
-id = "E0308"
-title = "call-non-callable"
-
-[[message.snippets]]
-source = "def f():\n\treturn (1 == '2')()  # Tab indented\n"
-line_start = 4
-origin = "$DIR/main.py"
-
-[[message.snippets.annotations]]
-label = ""
-level = "Error"
-range = [17, 29]
-
-[renderer]
-# anonymized_line_numbers = true
-color = true

crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.svg

@@ -1,36 +0,0 @@
-<svg width="1196px" height="128px" xmlns="http://www.w3.org/2000/svg">
-  <style>
-    .fg { fill: #AAAAAA }
-    .bg { background: #000000 }
-    .fg-bright-blue { fill: #5555FF }
-    .fg-bright-red { fill: #FF5555 }
-    .container {
-      padding: 0 10px;
-      line-height: 18px;
-    }
-    .bold { font-weight: bold; }
-    tspan {
-      font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
-      white-space: pre;
-      line-height: 18px;
-    }
-  </style>
-
-  <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
-
-  <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">mismatched types</tspan>
-</tspan>
-    <tspan x="10px" y="46px"><tspan> </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:6</tspan>
-</tspan>
-    <tspan x="10px" y="64px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-    <tspan x="10px" y="82px"><tspan class="fg-bright-blue bold">4 |</tspan><tspan> </tspan><tspan class="fg-bright-blue bold">...</tspan><tspan>   s_data['d_dails'] = bb['contacted'][hostip]['ansible_facts']['ansible_devices']['vda']['vendor'] + " " + bb['contacted'][hostip</tspan><tspan class="fg-bright-blue bold">...</tspan>
-</tspan>
-    <tspan x="10px" y="100px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan><tspan>       </tspan><tspan class="fg-bright-red bold">^^^^^^</tspan>
-</tspan>
-    <tspan x="10px" y="118px"><tspan>  </tspan><tspan class="fg-bright-blue bold">|</tspan>
-</tspan>
-  </text>
-
-</svg>

crates/ruff_annotate_snippets/tests/fixtures/color/regression_leading_tab_long_line.toml

@@ -1,20 +0,0 @@
-[message]
-level = "Error"
-id = "E0308"
-title = "mismatched types"
-
-[[message.snippets]]
-source = """
-					s_data['d_dails'] = bb['contacted'][hostip]['ansible_facts']['ansible_devices']['vda']['vendor'] + " " + bb['contacted'][hostip]['an
-"""
-line_start = 4
-origin = "$DIR/non-whitespace-trimming.rs"
-
-[[message.snippets.annotations]]
-label = ""
-level = "Error"
-range = [5, 11]
-
-[renderer]
-# anonymized_line_numbers = true
-color = true

crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.svg

@@ -21,7 +21,7 @@
   <text xml:space="preserve" class="container fg">
     <tspan x="10px" y="28px"><tspan class="fg-bright-red bold">error[E0308]</tspan><tspan>: </tspan><tspan class="bold">mismatched types</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan>  </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:238</tspan>
+    <tspan x="10px" y="46px"><tspan>  </tspan><tspan class="fg-bright-blue bold">--&gt;</tspan><tspan> $DIR/non-whitespace-trimming.rs:4:242</tspan>
 </tspan>
     <tspan x="10px" y="64px"><tspan>   </tspan><tspan class="fg-bright-blue bold">|</tspan>
 </tspan>

crates/ruff_annotate_snippets/tests/fixtures/color/strip_line_non_ws.toml

@@ -13,12 +13,12 @@ origin = "$DIR/non-whitespace-trimming.rs"
 [[message.snippets.annotations]]
 label = "expected `()`, found integer"
 level = "Error"
-range = [237, 239]
+range = [241, 243]
 
 [[message.snippets.annotations]]
 label = "expected due to this"
 level = "Error"
-range = [232, 234]
+range = [236, 238]
 
 
 [renderer]

crates/ruff_benchmark/benches/ty.rs

@@ -348,99 +348,6 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
     });
 }
 
-fn benchmark_complex_constrained_attributes_1(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_1]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression benchmark for https://github.com/astral-sh/ty/issues/627.
-                // Before this was fixed, the following sample would take >1s to type check.
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert!(!result.is_empty());
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is is similar to the case above, but now the attributes are actually defined.
-                // https://github.com/astral-sh/ty/issues/711
-                setup_micro_case(
-                    r#"
-                    class C:
-                        def f(self: "C"):
-                            self.a = ""
-                            self.b = ""
-
-                            if isinstance(self.a, str):
-                                return
-
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
 struct ProjectBenchmark<'a> {
     project: InstalledProject<'a>,
     fs: MemoryFileSystem,
@@ -470,7 +377,8 @@ impl<'a> ProjectBenchmark<'a> {
         metadata.apply_options(Options {
             environment: Some(EnvironmentOptions {
                 python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                 ..EnvironmentOptions::default()
             }),
             ..Options::default()
@@ -575,8 +483,6 @@ criterion_group!(
     micro,
     benchmark_many_string_assignments,
     benchmark_many_tuple_assignments,
-    benchmark_complex_constrained_attributes_1,
-    benchmark_complex_constrained_attributes_2,
 );
 criterion_group!(project, anyio, attrs, hydra);
 criterion_main!(check_file, micro, project);

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -36,7 +36,8 @@ impl<'a> Benchmark<'a> {
         metadata.apply_options(Options {
             environment: Some(EnvironmentOptions {
                 python_version: Some(RangedValue::cli(self.project.config.python_version)),
-                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
+                python: (!self.project.config().dependencies.is_empty())
+                    .then_some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                 ..EnvironmentOptions::default()
             }),
             ..Options::default()

crates/ruff_benchmark/src/real_world_projects.rs

@@ -74,17 +74,19 @@ impl<'a> RealWorldProject<'a> {
         };
 
         // Install dependencies if specified
-        tracing::debug!(
-            "Installing {} dependencies for project '{}'...",
-            checkout.project().dependencies.len(),
-            checkout.project().name
-        );
-        let start_install = std::time::Instant::now();
-        install_dependencies(&checkout)?;
-        tracing::debug!(
-            "Dependency installation completed in {:.2}s",
-            start_install.elapsed().as_secs_f64()
-        );
+        if !checkout.project().dependencies.is_empty() {
+            tracing::debug!(
+                "Installing {} dependencies for project '{}'...",
+                checkout.project().dependencies.len(),
+                checkout.project().name
+            );
+            let start = std::time::Instant::now();
+            install_dependencies(&checkout)?;
+            tracing::debug!(
+                "Dependency installation completed in {:.2}s",
+                start.elapsed().as_secs_f64()
+            );
+        }
 
         tracing::debug!("Project setup took: {:.2}s", start.elapsed().as_secs_f64());
 
@@ -279,14 +281,6 @@ fn install_dependencies(checkout: &Checkout) -> Result<()> {
         String::from_utf8_lossy(&output.stderr)
     );
 
-    if checkout.project().dependencies.is_empty() {
-        tracing::debug!(
-            "No dependencies to install for project '{}'",
-            checkout.project().name
-        );
-        return Ok(());
-    }
-
     // Install dependencies with date constraint in the isolated environment
     let mut cmd = Command::new("uv");
     cmd.args([

crates/ruff_db/Cargo.toml

@@ -14,10 +14,10 @@ license = { workspace = true }
 ruff_annotate_snippets = { workspace = true }
 ruff_cache = { workspace = true, optional = true }
 ruff_notebook = { workspace = true }
-ruff_python_ast = { workspace = true, features = ["get-size"] }
+ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_trivia = { workspace = true }
-ruff_source_file = { workspace = true, features = ["get-size"] }
+ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
 
 anstyle = { workspace = true }
@@ -27,18 +27,17 @@ countme = { workspace = true }
 dashmap = { workspace = true }
 dunce = { workspace = true }
 filetime = { workspace = true }
-get-size2 = { workspace = true }
 glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
-path-slash = { workspace = true }
-rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+path-slash = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
+rustc-hash = { workspace = true }
 zip = { workspace = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]

crates/ruff_db/src/diagnostic/mod.rs

@@ -19,7 +19,7 @@ mod stylesheet;
 /// characteristics in the inputs given to the tool. Typically, but not always,
 /// a characteristic is a deficiency. An example of a characteristic that is
 /// _not_ a deficiency is the `reveal_type` diagnostic for our type checker.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Diagnostic {
     /// The actual diagnostic.
     ///
@@ -270,7 +270,7 @@ impl Diagnostic {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct DiagnosticInner {
     id: DiagnosticId,
     severity: Severity,
@@ -342,7 +342,7 @@ impl Eq for RenderingSortKey<'_> {}
 /// Currently, the order in which sub-diagnostics are rendered relative to one
 /// another (for a single parent diagnostic) is the order in which they were
 /// attached to the diagnostic.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct SubDiagnostic {
     /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
     /// pointer-sized.
@@ -443,7 +443,7 @@ impl SubDiagnostic {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 struct SubDiagnosticInner {
     severity: Severity,
     message: DiagnosticMessage,
@@ -471,7 +471,7 @@ struct SubDiagnosticInner {
 ///
 /// Messages attached to annotations should also be as brief and specific as
 /// possible. Long messages could negative impact the quality of rendering.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct Annotation {
     /// The span of this annotation, corresponding to some subsequence of the
     /// user's input that we want to highlight.
@@ -591,7 +591,7 @@ impl Annotation {
 ///
 /// These tags are used to provide additional information about the annotation.
 /// and are passed through to the language server protocol.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum DiagnosticTag {
     /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
     Unnecessary,
@@ -605,7 +605,7 @@ pub enum DiagnosticTag {
 /// be in kebab case, e.g. `no-foo` (all lower case).
 ///
 /// Rules use kebab case, e.g. `no-foo`.
-#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub struct LintName(&'static str);
 
 impl LintName {
@@ -645,7 +645,7 @@ impl PartialEq<&str> for LintName {
 }
 
 /// Uniquely identifies the kind of a diagnostic.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, get_size2::GetSize)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
 pub enum DiagnosticId {
     Panic,
 
@@ -735,9 +735,6 @@ pub enum DiagnosticId {
     /// # no `[overrides.rules]`
     /// ```
     UselessOverridesSection,
-
-    /// Use of a deprecated setting.
-    DeprecatedSetting,
 }
 
 impl DiagnosticId {
@@ -776,7 +773,6 @@ impl DiagnosticId {
             DiagnosticId::EmptyInclude => "empty-include",
             DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
             DiagnosticId::UselessOverridesSection => "useless-overrides-section",
-            DiagnosticId::DeprecatedSetting => "deprecated-setting",
         }
     }
 
@@ -800,7 +796,7 @@ impl std::fmt::Display for DiagnosticId {
 ///
 /// This enum presents a unified interface to these two types for the sake of creating [`Span`]s and
 /// emitting diagnostics from both ty and ruff.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum UnifiedFile {
     Ty(File),
     Ruff(SourceFile),
@@ -852,7 +848,7 @@ impl DiagnosticSource {
 /// It consists of a `File` and an optional range into that file. When the
 /// range isn't present, it semantically implies that the diagnostic refers to
 /// the entire file. For example, when the file should be executable but isn't.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Span {
     file: UnifiedFile,
     range: Option<TextRange>,
@@ -924,7 +920,7 @@ impl From<crate::files::FileRange> for Span {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd)]
 pub enum Severity {
     Info,
     Warning,
@@ -1087,7 +1083,7 @@ impl std::fmt::Display for ConciseMessage<'_> {
 /// In most cases, callers shouldn't need to use this. Instead, there is
 /// a blanket trait implementation for `IntoDiagnosticMessage` for
 /// anything that implements `std::fmt::Display`.
-#[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DiagnosticMessage(Box<str>);
 
 impl DiagnosticMessage {

crates/ruff_db/src/diagnostic/render.rs

@@ -637,22 +637,6 @@ pub trait FileResolver {
     fn input(&self, file: File) -> Input;
 }
 
-impl<T> FileResolver for T
-where
-    T: Db,
-{
-    fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(self).as_str())
-    }
-
-    fn input(&self, file: File) -> Input {
-        Input {
-            text: source_text(self, file),
-            line_index: line_index(self, file),
-        }
-    }
-}
-
 impl FileResolver for &dyn Db {
     fn path(&self, file: File) -> &str {
         relativize_path(self.system().current_directory(), file.path(*self).as_str())
@@ -724,6 +708,7 @@ fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
 #[cfg(test)]
 mod tests {
 
+    use crate::Upcast;
     use crate::diagnostic::{Annotation, DiagnosticId, Severity, Span};
     use crate::files::system_path_to_file;
     use crate::system::{DbWithWritableSystem, SystemPath};
@@ -2236,7 +2221,7 @@ watermelon
         ///
         /// (This will set the "printed" flag on `Diagnostic`.)
         fn render(&self, diag: &Diagnostic) -> String {
-            diag.display(&self.db, &self.config).to_string()
+            diag.display(&self.db.upcast(), &self.config).to_string()
         }
     }
 

crates/ruff_db/src/files.rs

@@ -263,23 +263,12 @@ impl Files {
 
 impl fmt::Debug for Files {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if f.alternate() {
-            let mut map = f.debug_map();
+        let mut map = f.debug_map();
 
-            for entry in self.inner.system_by_path.iter() {
-                map.entry(entry.key(), entry.value());
-            }
-            map.finish()
-        } else {
-            f.debug_struct("Files")
-                .field("system_by_path", &self.inner.system_by_path.len())
-                .field(
-                    "system_virtual_by_path",
-                    &self.inner.system_virtual_by_path.len(),
-                )
-                .field("vendored_by_path", &self.inner.vendored_by_path.len())
-                .finish()
+        for entry in self.inner.system_by_path.iter() {
+            map.entry(entry.key(), entry.value());
         }
+        map.finish()
     }
 }
 
@@ -319,9 +308,6 @@ pub struct File {
     count: Count<File>,
 }
 
-// The Salsa heap is tracked separately.
-impl get_size2::GetSize for File {}
-
 impl File {
     /// Reads the content of the file into a [`String`].
     ///

crates/ruff_db/src/lib.rs

@@ -36,6 +36,12 @@ pub trait Db: salsa::Database {
     fn python_version(&self) -> PythonVersion;
 }
 
+/// Trait for upcasting a reference to a base trait object.
+pub trait Upcast<T: ?Sized> {
+    fn upcast(&self) -> &T;
+    fn upcast_mut(&mut self) -> &mut T;
+}
+
 /// Returns the maximum number of tasks that ty is allowed
 /// to process in parallel.
 ///
@@ -70,11 +76,11 @@ pub trait RustDoc {
 mod tests {
     use std::sync::{Arc, Mutex};
 
-    use crate::Db;
     use crate::files::Files;
     use crate::system::TestSystem;
     use crate::system::{DbWithTestSystem, System};
     use crate::vendored::VendoredFileSystem;
+    use crate::{Db, Upcast};
 
     type Events = Arc<Mutex<Vec<salsa::Event>>>;
 
@@ -147,6 +153,15 @@ mod tests {
         }
     }
 
+    impl Upcast<dyn Db> for TestDb {
+        fn upcast(&self) -> &(dyn Db + 'static) {
+            self
+        }
+        fn upcast_mut(&mut self) -> &mut (dyn Db + 'static) {
+            self
+        }
+    }
+
     impl DbWithTestSystem for TestDb {
         fn test_system(&self) -> &TestSystem {
             &self.system

crates/ruff_db/src/parsed.rs

@@ -2,7 +2,6 @@ use std::fmt::Formatter;
 use std::sync::Arc;
 
 use arc_swap::ArcSwapOption;
-use get_size2::GetSize;
 use ruff_python_ast::{AnyRootNodeRef, ModModule, NodeIndex};
 use ruff_python_parser::{ParseOptions, Parsed, parse_unchecked};
 
@@ -21,7 +20,7 @@ use crate::source::source_text;
 /// reflected in the changed AST offsets.
 /// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
 /// for determining if a query result is unchanged.
-#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(returns(ref), no_eq)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
     let _span = tracing::trace_span!("parsed_module", ?file).entered();
 
@@ -45,10 +44,9 @@ pub fn parsed_module_impl(db: &dyn Db, file: File) -> Parsed<ModModule> {
 ///
 /// This type manages instances of the module AST. A particular instance of the AST
 /// is represented with the [`ParsedModuleRef`] type.
-#[derive(Clone, get_size2::GetSize)]
+#[derive(Clone)]
 pub struct ParsedModule {
     file: File,
-    #[get_size(size_fn = arc_swap_size)]
     inner: Arc<ArcSwapOption<indexed::IndexedModule>>,
 }
 
@@ -144,18 +142,6 @@ impl std::ops::Deref for ParsedModuleRef {
     }
 }
 
-/// Returns the heap-size of the currently stored `T` in the `ArcSwap`.
-fn arc_swap_size<T>(arc_swap: &Arc<ArcSwapOption<T>>) -> usize
-where
-    T: GetSize,
-{
-    if let Some(value) = &*arc_swap.load() {
-        T::get_heap_size(value)
-    } else {
-        0
-    }
-}
-
 mod indexed {
     use std::sync::Arc;
 
@@ -164,7 +150,7 @@ mod indexed {
     use ruff_python_parser::Parsed;
 
     /// A wrapper around the AST that allows access to AST nodes by index.
-    #[derive(Debug, get_size2::GetSize)]
+    #[derive(Debug)]
     pub struct IndexedModule {
         index: Box<[AnyRootNodeRef<'static>]>,
         pub parsed: Parsed<ModModule>,

crates/ruff_db/src/source.rs

@@ -11,7 +11,7 @@ use crate::Db;
 use crate::files::{File, FilePath};
 
 /// Reads the source text of a python text file (must be valid UTF8) or notebook.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked]
 pub fn source_text(db: &dyn Db, file: File) -> SourceText {
     let path = file.path(db);
     let _span = tracing::trace_span!("source_text", file = %path).entered();
@@ -65,7 +65,7 @@ fn is_notebook(path: &FilePath) -> bool {
 /// The file containing the source text can either be a text file or a notebook.
 ///
 /// Cheap cloneable in `O(1)`.
-#[derive(Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Clone, Eq, PartialEq)]
 pub struct SourceText {
     inner: Arc<SourceTextInner>,
 }
@@ -123,9 +123,8 @@ impl std::fmt::Debug for SourceText {
     }
 }
 
-#[derive(Eq, PartialEq, get_size2::GetSize)]
+#[derive(Eq, PartialEq)]
 struct SourceTextInner {
-    #[get_size(ignore)]
     count: Count<SourceText>,
     kind: SourceTextKind,
     read_error: Option<SourceTextError>,
@@ -137,19 +136,6 @@ enum SourceTextKind {
     Notebook(Box<Notebook>),
 }
 
-impl get_size2::GetSize for SourceTextKind {
-    fn get_heap_size(&self) -> usize {
-        match self {
-            SourceTextKind::Text(text) => text.get_heap_size(),
-            // TODO: The `get-size` derive does not support ignoring enum variants.
-            //
-            // Jupyter notebooks are not very relevant for memory profiling, and contain
-            // arbitrary JSON values that do not implement the `GetSize` trait.
-            SourceTextKind::Notebook(_) => 0,
-        }
-    }
-}
-
 impl From<String> for SourceTextKind {
     fn from(value: String) -> Self {
         SourceTextKind::Text(value)
@@ -162,7 +148,7 @@ impl From<Notebook> for SourceTextKind {
     }
 }
 
-#[derive(Debug, thiserror::Error, PartialEq, Eq, Clone, get_size2::GetSize)]
+#[derive(Debug, thiserror::Error, PartialEq, Eq, Clone)]
 pub enum SourceTextError {
     #[error("Failed to read notebook: {0}`")]
     FailedToReadNotebook(String),
@@ -171,7 +157,7 @@ pub enum SourceTextError {
 }
 
 /// Computes the [`LineIndex`] for `file`.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked]
 pub fn line_index(db: &dyn Db, file: File) -> LineIndex {
     let _span = tracing::trace_span!("line_index", ?file).entered();
 

crates/ruff_db/src/system.rs

@@ -124,11 +124,6 @@ pub trait System: Debug {
     /// Returns `None` if no such convention exists for the system.
     fn user_config_directory(&self) -> Option<SystemPathBuf>;
 
-    /// Returns the directory path where cached files are stored.
-    ///
-    /// Returns `None` if no such convention exists for the system.
-    fn cache_dir(&self) -> Option<SystemPathBuf>;
-
     /// Iterate over the contents of the directory at `path`.
     ///
     /// The returned iterator must have the following properties:
@@ -191,9 +186,6 @@ pub trait System: Debug {
         Err(std::env::VarError::NotPresent)
     }
 
-    /// Returns a handle to a [`WritableSystem`] if this system is writeable.
-    fn as_writable(&self) -> Option<&dyn WritableSystem>;
-
     fn as_any(&self) -> &dyn std::any::Any;
 
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
@@ -234,52 +226,11 @@ impl fmt::Display for CaseSensitivity {
 
 /// System trait for non-readonly systems.
 pub trait WritableSystem: System {
-    /// Creates a file at the given path.
-    ///
-    /// Returns an error if the file already exists.
-    fn create_new_file(&self, path: &SystemPath) -> Result<()>;
-
     /// Writes the given content to the file at the given path.
     fn write_file(&self, path: &SystemPath, content: &str) -> Result<()>;
 
     /// Creates a directory at `path` as well as any intermediate directories.
     fn create_directory_all(&self, path: &SystemPath) -> Result<()>;
-
-    /// Reads the provided file from the system cache, or creates the file if necessary.
-    ///
-    /// Returns `Ok(None)` if the system does not expose a suitable cache directory.
-    fn get_or_cache(
-        &self,
-        path: &SystemPath,
-        read_contents: &dyn Fn() -> Result<String>,
-    ) -> Result<Option<SystemPathBuf>> {
-        let Some(cache_dir) = self.cache_dir() else {
-            return Ok(None);
-        };
-
-        let cache_path = cache_dir.join(path);
-
-        // The file has already been cached.
-        if self.is_file(&cache_path) {
-            return Ok(Some(cache_path));
-        }
-
-        // Read the file contents.
-        let contents = read_contents()?;
-
-        // Create the parent directory.
-        self.create_directory_all(cache_path.parent().unwrap())?;
-
-        // Create and write to the file on the system.
-        //
-        // Note that `create_new_file` will fail if the file has already been created. This
-        // ensures that only one thread/process ever attempts to write to it to avoid corrupting
-        // the cache.
-        self.create_new_file(&cache_path)?;
-        self.write_file(&cache_path, &contents)?;
-
-        Ok(Some(cache_path))
-    }
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]

crates/ruff_db/src/system/memory_fs.rs

@@ -1,5 +1,4 @@
-use std::collections::{BTreeMap, btree_map};
-use std::io;
+use std::collections::BTreeMap;
 use std::iter::FusedIterator;
 use std::sync::{Arc, RwLock, RwLockWriteGuard};
 
@@ -154,26 +153,6 @@ impl MemoryFileSystem {
         virtual_files.contains_key(&path.to_path_buf())
     }
 
-    pub(crate) fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        let normalized = self.normalize_path(path);
-
-        let mut by_path = self.inner.by_path.write().unwrap();
-        match by_path.entry(normalized) {
-            btree_map::Entry::Vacant(entry) => {
-                entry.insert(Entry::File(File {
-                    content: String::new(),
-                    last_modified: file_time_now(),
-                }));
-
-                Ok(())
-            }
-            btree_map::Entry::Occupied(_) => Err(io::Error::new(
-                io::ErrorKind::AlreadyExists,
-                "File already exists",
-            )),
-        }
-    }
-
     /// Stores a new file in the file system.
     ///
     /// The operation overrides the content for an existing file with the same normalized `path`.
@@ -299,14 +278,14 @@ impl MemoryFileSystem {
             let normalized = fs.normalize_path(path);
 
             match by_path.entry(normalized) {
-                btree_map::Entry::Occupied(entry) => match entry.get() {
+                std::collections::btree_map::Entry::Occupied(entry) => match entry.get() {
                     Entry::File(_) => {
                         entry.remove();
                         Ok(())
                     }
                     Entry::Directory(_) => Err(is_a_directory()),
                 },
-                btree_map::Entry::Vacant(_) => Err(not_found()),
+                std::collections::btree_map::Entry::Vacant(_) => Err(not_found()),
             }
         }
 
@@ -366,14 +345,14 @@ impl MemoryFileSystem {
             }
 
             match by_path.entry(normalized.clone()) {
-                btree_map::Entry::Occupied(entry) => match entry.get() {
+                std::collections::btree_map::Entry::Occupied(entry) => match entry.get() {
                     Entry::Directory(_) => {
                         entry.remove();
                         Ok(())
                     }
                     Entry::File(_) => Err(not_a_directory()),
                 },
-                btree_map::Entry::Vacant(_) => Err(not_found()),
+                std::collections::btree_map::Entry::Vacant(_) => Err(not_found()),
             }
         }
 

crates/ruff_db/src/system/os.rs

@@ -160,39 +160,6 @@ impl System for OsSystem {
         None
     }
 
-    /// Returns an absolute cache directory on the system.
-    ///
-    /// On Linux and macOS, uses `$XDG_CACHE_HOME/ty` or `.cache/ty`.
-    /// On Windows, uses `C:\Users\User\AppData\Local\ty\cache`.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        use etcetera::BaseStrategy as _;
-
-        let cache_dir = etcetera::base_strategy::choose_base_strategy()
-            .ok()
-            .map(|dirs| dirs.cache_dir().join("ty"))
-            .map(|cache_dir| {
-                if cfg!(windows) {
-                    // On Windows, we append `cache` to the LocalAppData directory, i.e., prefer
-                    // `C:\Users\User\AppData\Local\ty\cache` over `C:\Users\User\AppData\Local\ty`.
-                    cache_dir.join("cache")
-                } else {
-                    cache_dir
-                }
-            })
-            .and_then(|path| SystemPathBuf::from_path_buf(path).ok())
-            .unwrap_or_else(|| SystemPathBuf::from(".ty_cache"));
-
-        Some(cache_dir)
-    }
-
-    // TODO: Remove this feature gating once `ruff_wasm` no longer indirectly depends on `ruff_db` with the
-    //   `os` feature enabled (via `ruff_workspace` -> `ruff_graph` -> `ruff_db`).
-    #[cfg(target_arch = "wasm32")]
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        None
-    }
-
     /// Creates a builder to recursively walk `path`.
     ///
     /// The walker ignores files according to [`ignore::WalkBuilder::standard_filters`]
@@ -225,10 +192,6 @@ impl System for OsSystem {
         })
     }
 
-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
     fn as_any(&self) -> &dyn Any {
         self
     }
@@ -347,10 +310,6 @@ impl OsSystem {
 }
 
 impl WritableSystem for OsSystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        std::fs::File::create_new(path).map(drop)
-    }
-
     fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
         std::fs::write(path.as_std_path(), content)
     }

crates/ruff_db/src/system/path.rs

@@ -503,12 +503,6 @@ impl ToOwned for SystemPath {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct SystemPathBuf(#[cfg_attr(feature = "schemars", schemars(with = "String"))] Utf8PathBuf);
 
-impl get_size2::GetSize for SystemPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
-    }
-}
-
 impl SystemPathBuf {
     pub fn new() -> Self {
         Self(Utf8PathBuf::new())

crates/ruff_db/src/system/test.rs

@@ -102,10 +102,6 @@ impl System for TestSystem {
         self.system().user_config_directory()
     }
 
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        self.system().cache_dir()
-    }
-
     fn read_directory<'a>(
         &'a self,
         path: &SystemPath,
@@ -127,10 +123,6 @@ impl System for TestSystem {
         self.system().glob(pattern)
     }
 
-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }
@@ -157,10 +149,6 @@ impl Default for TestSystem {
 }
 
 impl WritableSystem for TestSystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        self.system().create_new_file(path)
-    }
-
     fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
         self.system().write_file(path, content)
     }
@@ -347,10 +335,6 @@ impl System for InMemorySystem {
         self.user_config_directory.lock().unwrap().clone()
     }
 
-    fn cache_dir(&self) -> Option<SystemPathBuf> {
-        None
-    }
-
     fn read_directory<'a>(
         &'a self,
         path: &SystemPath,
@@ -373,10 +357,6 @@ impl System for InMemorySystem {
         Ok(Box::new(iterator))
     }
 
-    fn as_writable(&self) -> Option<&dyn WritableSystem> {
-        Some(self)
-    }
-
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }
@@ -397,10 +377,6 @@ impl System for InMemorySystem {
 }
 
 impl WritableSystem for InMemorySystem {
-    fn create_new_file(&self, path: &SystemPath) -> Result<()> {
-        self.memory_fs.create_new_file(path)
-    }
-
     fn write_file(&self, path: &SystemPath, content: &str) -> Result<()> {
         self.memory_fs.write_file(path, content)
     }

crates/ruff_db/src/system/walk_directory.rs

@@ -212,7 +212,7 @@ impl Display for Error {
                 path: Some(path),
                 err,
             } => {
-                write!(f, "IO error for operation on {path}: {err}")
+                write!(f, "IO error for operation on {}: {}", path, err)
             }
             ErrorKind::Io { path: None, err } => err.fmt(f),
             ErrorKind::NonUtf8Path { path } => {

crates/ruff_db/src/vendored.rs

@@ -4,12 +4,12 @@ use std::fmt::{self, Debug};
 use std::io::{self, Read, Write};
 use std::sync::{Arc, Mutex, MutexGuard};
 
+use crate::file_revision::FileRevision;
 use zip::result::ZipResult;
 use zip::write::FileOptions;
 use zip::{CompressionMethod, ZipArchive, ZipWriter, read::ZipFile};
 
 pub use self::path::{VendoredPath, VendoredPathBuf};
-use crate::file_revision::FileRevision;
 
 mod path;
 

crates/ruff_db/src/vendored/path.rs

@@ -87,12 +87,6 @@ impl ToOwned for VendoredPath {
 #[derive(Debug, Eq, PartialEq, Clone, Hash)]
 pub struct VendoredPathBuf(Utf8PathBuf);
 
-impl get_size2::GetSize for VendoredPathBuf {
-    fn get_heap_size(&self) -> usize {
-        self.0.capacity()
-    }
-}
-
 impl Default for VendoredPathBuf {
     fn default() -> Self {
         Self::new()

crates/ruff_dev/src/generate_ty_options.rs

@@ -114,7 +114,6 @@ fn generate_set(output: &mut String, set: Set, parents: &mut Vec<Set>) {
     parents.pop();
 }
 
-#[derive(Debug)]
 enum Set {
     Toplevel(OptionSet),
     Named { name: String, set: OptionSet },
@@ -137,7 +136,7 @@ impl Set {
 }
 
 fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[Set]) {
-    let header_level = "#".repeat(parents.len() + 1);
+    let header_level = if parents.is_empty() { "###" } else { "####" };
 
     let _ = writeln!(output, "{header_level} `{name}`");
 

crates/ruff_dev/src/generate_ty_rules.rs

@@ -73,20 +73,12 @@ fn generate_markdown() -> String {
     for lint in lints {
         let _ = writeln!(&mut output, "## `{rule_name}`\n", rule_name = lint.name());
 
-        // Reformat headers as bold text
-        let mut in_code_fence = false;
+        // Increase the header-level by one
         let documentation = lint
             .documentation_lines()
             .map(|line| {
-                // Toggle the code fence state if we encounter a boundary
-                if line.starts_with("```") {
-                    in_code_fence = !in_code_fence;
-                }
-                if !in_code_fence && line.starts_with('#') {
-                    Cow::Owned(format!(
-                        "**{line}**\n",
-                        line = line.trim_start_matches('#').trim_start()
-                    ))
+                if line.starts_with('#') {
+                    Cow::Owned(format!("#{line}"))
                 } else {
                     Cow::Borrowed(line)
                 }
@@ -95,15 +87,21 @@ fn generate_markdown() -> String {
 
         let _ = writeln!(
             &mut output,
-            r#"<small>
-Default level: [`{level}`](../rules.md#rule-levels "This lint has a default level of '{level}'.") ·
-[Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}) ·
-[View source](https://github.com/astral-sh/ruff/blob/main/{file}#L{line})
-</small>
+            r#"**Default level**: {level}
+
+<details>
+<summary>{summary}</summary>
 
 {documentation}
+
+### Links
+* [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name})
+* [View source](https://github.com/astral-sh/ruff/blob/main/{file}#L{line})
+</details>
 "#,
             level = lint.default_level(),
+            // GitHub doesn't support markdown in `summary` headers
+            summary = replace_inline_code(lint.summary()),
             encoded_name = url::form_urlencoded::byte_serialize(lint.name().as_str().as_bytes())
                 .collect::<String>(),
             file = url::form_urlencoded::byte_serialize(lint.file().replace('\\', "/").as_bytes())
@@ -115,6 +113,25 @@ Default level: [`{level}`](../rules.md#rule-levels "This lint has a default leve
     output
 }
 
+/// Replaces inline code blocks (`code`) with `<code>code</code>`
+fn replace_inline_code(input: &str) -> String {
+    let mut output = String::new();
+    let mut parts = input.split('`');
+
+    while let Some(before) = parts.next() {
+        if let Some(between) = parts.next() {
+            output.push_str(before);
+            output.push_str("<code>");
+            output.push_str(between);
+            output.push_str("</code>");
+        } else {
+            output.push_str(before);
+        }
+    }
+
+    output
+}
+
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

crates/ruff_graph/src/db.rs

@@ -1,15 +1,15 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use std::sync::Arc;
 use zip::CompressionMethod;
 
-use ruff_db::Db as SourceDb;
 use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
+use ruff_db::{Db as SourceDb, Upcast};
 use ruff_python_ast::PythonVersion;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    Db, Program, ProgramSettings, PythonPath, PythonPlatform, PythonVersionSource,
     PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };
 
@@ -35,37 +35,38 @@ impl ModuleDb {
         python_version: PythonVersion,
         venv_path: Option<SystemPathBuf>,
     ) -> Result<Self> {
-        let db = Self::default();
         let mut search_paths = SearchPathSettings::new(src_roots);
-        // TODO: Consider calling `PythonEnvironment::discover` if the `venv_path` is not provided.
         if let Some(venv_path) = venv_path {
-            let environment =
-                PythonEnvironment::new(venv_path, SysPrefixPathOrigin::PythonCliFlag, db.system())?;
-            search_paths.site_packages_paths = environment
-                .site_packages_paths(db.system())
-                .context("Failed to discover the site-packages directory")?
-                .into_vec();
+            search_paths.python_path =
+                PythonPath::sys_prefix(venv_path, SysPrefixPathOrigin::PythonCliFlag);
         }
-        let search_paths = search_paths
-            .to_search_paths(db.system(), db.vendored())
-            .context("Invalid search path settings")?;
 
+        let db = Self::default();
         Program::from_settings(
             &db,
             ProgramSettings {
-                python_version: PythonVersionWithSource {
+                python_version: Some(PythonVersionWithSource {
                     version: python_version,
                     source: PythonVersionSource::default(),
-                },
+                }),
                 python_platform: PythonPlatform::default(),
                 search_paths,
             },
-        );
+        )?;
 
         Ok(db)
     }
 }
 
+impl Upcast<dyn SourceDb> for ModuleDb {
+    fn upcast(&self) -> &(dyn SourceDb + 'static) {
+        self
+    }
+    fn upcast_mut(&mut self) -> &mut (dyn SourceDb + 'static) {
+        self
+    }
+}
+
 #[salsa::db]
 impl SourceDb for ModuleDb {
     fn vendored(&self) -> &VendoredFileSystem {

crates/ruff_graph/src/settings.rs

@@ -36,20 +36,14 @@ impl fmt::Display for AnalyzeSettings {
 }
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, CacheKey)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize),
-    serde(rename_all = "kebab-case")
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 pub enum Direction {
     /// Construct a map from module to its dependencies (i.e., the modules that it imports).
     #[default]
-    #[cfg_attr(feature = "serde", serde(alias = "Dependencies"))]
     Dependencies,
     /// Construct a map from module to its dependents (i.e., the modules that import it).
-    #[cfg_attr(feature = "serde", serde(alias = "Dependents"))]
     Dependents,
 }
 

crates/ruff_index/Cargo.toml

@@ -14,7 +14,6 @@ license = { workspace = true }
 doctest = false
 
 [dependencies]
-get-size2 = { workspace = true }
 ruff_macros = { workspace = true }
 salsa = { workspace = true, optional = true }
 

crates/ruff_index/src/vec.rs

@@ -6,7 +6,7 @@ use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut, RangeBounds};
 
 /// An owned sequence of `T` indexed by `I`
-#[derive(Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 #[repr(transparent)]
 pub struct IndexVec<I, T> {
     pub raw: Vec<T>,
@@ -191,6 +191,6 @@ where
     #[expect(unsafe_code)]
     unsafe fn maybe_update(old_pointer: *mut Self, new_value: Self) -> bool {
         let old_vec: &mut IndexVec<I, T> = unsafe { &mut *old_pointer };
-        unsafe { salsa::Update::maybe_update(&raw mut old_vec.raw, new_value.raw) }
+        unsafe { salsa::Update::maybe_update(&mut old_vec.raw, new_value.raw) }
     }
 }

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.1"
+version = "0.12.0"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -38,7 +38,6 @@ colored = { workspace = true }
 fern = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
-hashbrown = { workspace = true }
 imperative = { workspace = true }
 is-macro = { workspace = true }
 is-wsl = { workspace = true }

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C420_2.py

@@ -1,5 +0,0 @@
-foo or{x: None for x in bar}
-
-
-# C420 fix must make sure to insert a leading space if needed,
-# See https://github.com/astral-sh/ruff/issues/18599

crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM101_byte_string.py

@@ -1,6 +0,0 @@
-def f_byte():
-    raise RuntimeError(b"This is an example exception")
-
-
-def f_byte_empty():
-    raise RuntimeError(b"")

crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uv_tool.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env -S uv tool run ruff check --isolated --select EXE003
-print("hello world")

crates/ruff_linter/resources/test/fixtures/flake8_executable/EXE003_uvx.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env -S uvx ruff check --isolated --select EXE003
-print("hello world")

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.py

@@ -119,26 +119,4 @@ field35: "int | str | int"  # Error
 # Technically, this falls into the domain of the rule but it is an unlikely edge case,
 # only works if you have from `__future__ import annotations` at the top of the file,
 # and stringified annotations are discouraged in stub files.
-field36: "int | str" | int  # Ok
-
-# https://github.com/astral-sh/ruff/issues/18546
-# Expand Optional[T] to Union[T, None]
-# OK
-field37: typing.Optional[int]
-field38: typing.Union[int, None]
-# equivalent to None
-field39: typing.Optional[None]
-# equivalent to int | None
-field40: typing.Union[typing.Optional[int], None]
-field41: typing.Optional[typing.Union[int, None]]
-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-field43: typing.Optional[int] | None
-field44: typing.Optional[int | None]
-field45: typing.Optional[int] | typing.Optional[int]
-# equivalent to int | dict | None
-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-field47: typing.Optional[int] | typing.Optional[dict]
-
-# avoid reporting twice
-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-field49: typing.Optional[complex | complex] | complex
+field36: "int | str" | int  # Ok

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI016.pyi

@@ -111,25 +111,3 @@ field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error
 
 # Test case for mixed union type
 field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]]  # Error
-
-# https://github.com/astral-sh/ruff/issues/18546
-# Expand Optional[T] to Union[T, None]
-# OK
-field37: typing.Optional[int]
-field38: typing.Union[int, None]
-# equivalent to None
-field39: typing.Optional[None]
-# equivalent to int | None
-field40: typing.Union[typing.Optional[int], None]
-field41: typing.Optional[typing.Union[int, None]]
-field42: typing.Union[typing.Optional[int], typing.Optional[int]]
-field43: typing.Optional[int] | None
-field44: typing.Optional[int | None]
-field45: typing.Optional[int] | typing.Optional[int]
-# equivalent to int | dict | None
-field46: typing.Union[typing.Optional[int], typing.Optional[dict]]
-field47: typing.Optional[int] | typing.Optional[dict]
-
-# avoid reporting twice
-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex]
-field49: typing.Optional[complex | complex] | complex

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT001.py

@@ -83,13 +83,3 @@ def aliased_parentheses_no_params_multiline():
     # scope="module"
 )
 def my_fixture(): ...
-
-
-@(pytest.fixture())
-def outer_paren_fixture_no_params():
-    return 42
-
-
-@(fixture())
-def outer_paren_imported_fixture_no_params():
-    return 42

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT023.py

@@ -88,14 +88,3 @@ class TestClass:
     # ),
 )
 def test_bar(param1, param2): ...
-
-
-@(pytest.mark.foo())
-def test_outer_paren_mark_function():
-    pass
-
-
-class TestClass:
-    @(pytest.mark.foo())
-    def test_method_outer_paren():
-        pass

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM105_0.py

@@ -128,16 +128,3 @@ def write_models(directory, Models):
         pass; \
             \
             #
-
-# Regression tests for: https://github.com/astral-sh/ruff/issues/18209
-try:
-    1 / 0
-except ():
-    pass
-
-
-BaseException = ValueError
-try:
-    int("a")
-except BaseException:
-    pass

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM911.py

@@ -29,8 +29,3 @@ def foo():
     dict = {}
     for country, stars in zip(dict.keys(), dict.values()):
         ...
-
-
-# https://github.com/astral-sh/ruff/issues/18776
-flag_stars = {}
-for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):...

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202.py

@@ -2,81 +2,13 @@ import os.path
 from pathlib import Path
 from os.path import getsize
 
-filename = "filename"
-filename1 = __file__
-filename2 = Path("filename")
-
 
 os.path.getsize("filename")
 os.path.getsize(b"filename")
 os.path.getsize(Path("filename"))
 os.path.getsize(__file__)
 
-os.path.getsize(filename)
-os.path.getsize(filename1)
-os.path.getsize(filename2)
-
-os.path.getsize(filename="filename")
-os.path.getsize(filename=b"filename")
-os.path.getsize(filename=Path("filename"))
-os.path.getsize(filename=__file__)
-
 getsize("filename")
 getsize(b"filename")
 getsize(Path("filename"))
 getsize(__file__)
-
-getsize(filename="filename")
-getsize(filename=b"filename")
-getsize(filename=Path("filename"))
-getsize(filename=__file__)
-
-getsize(filename)
-getsize(filename1)
-getsize(filename2)
-
-
-os.path.getsize(
-    "filename", # comment
-)
-
-os.path.getsize(
-    # comment
-    "filename"
-    ,
-    # comment
-)
-
-os.path.getsize(
-    # comment
-    b"filename"
-    # comment
-)
-
-os.path.getsize( # comment
-    Path(__file__)
-    # comment
-) # comment
-
-getsize( # comment
-    "filename")
-
-getsize( # comment
-    b"filename",
-    #comment
-)
-
-os.path.getsize("file" + "name")
-
-getsize \
-\
-\
-        ( # comment
-    "filename",
-    )
-
-getsize(Path("filename").resolve())
-
-import pathlib
-
-os.path.getsize(pathlib.Path("filename"))

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH202_2.py

@@ -1,5 +0,0 @@
-import os
-
-os.path.getsize(filename="filename")
-os.path.getsize(filename=b"filename")
-os.path.getsize(filename=__file__)

crates/ruff_linter/resources/test/fixtures/perflint/PERF101.py

@@ -85,19 +85,3 @@ import builtins
 
 for i in builtins.list(nested_tuple):  # PERF101
     pass
-
-# https://github.com/astral-sh/ruff/issues/18783
-items = (1, 2, 3)
-for i in(list)(items):
-    print(i)
-
-# https://github.com/astral-sh/ruff/issues/18784
-items = (1, 2, 3)
-for i in (  # 1
-    list  # 2
-    # 3
-)(  # 4
-    items  # 5
-    # 6
-):
-    print(i)

crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py

@@ -163,32 +163,4 @@ def foo():
 
     for k, v in src:
         if lambda: 0:
-            dst[k] = v
-
-# https://github.com/astral-sh/ruff/issues/18859
-def foo():
-    v = {}
-    for o,(x,)in():
-        v[x,]=o
-
-
-# https://github.com/astral-sh/ruff/issues/19005
-def issue_19005_1():
-    c = {}
-    a = object()
-    for a.b in ():
-        c[a.b] = a.b
-
-
-def issue_19005_2():
-    a = object()
-    c = {}
-    for a.k, a.v in ():
-        c[a.k] = a.v
-
-
-def issue_19005_3():
-    a = [None, None]
-    c = {}
-    for a[0], a[1] in ():
-        c[a[0]] = a[1]
+            dst[k] = v

crates/ruff_linter/resources/test/fixtures/pydocstyle/D413.py

@@ -69,11 +69,3 @@ def func():
     Returns:
         the value
         """
-
-
-def func():
-    ("""Docstring.
-
-    Raises:
-        ValueError: An error.
-    """)

crates/ruff_linter/resources/test/fixtures/pyflakes/F504.py

@@ -14,6 +14,3 @@ hidden = {"a": "!"}
 "" % {
   'test1': '',
   'test2': '',
-}
-
-# https://github.com/astral-sh/ruff/issues/18806

crates/ruff_linter/resources/test/fixtures/pyflakes/F522.py

@@ -4,11 +4,3 @@
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
 (''
  .format(x=2))  # F522
-
-# https://github.com/astral-sh/ruff/issues/18806
-# The fix here is unsafe because the unused argument has side effect
-"Hello, {name}".format(greeting=print(1), name="World")
-
-# The fix here is safe because the unused argument has no side effect,
-# even though the used argument has a side effect
-"Hello, {name}".format(greeting="Pikachu", name=print(1))

crates/ruff_linter/resources/test/fixtures/pyflakes/F523.py

@@ -35,11 +35,3 @@
 # Removing the final argument.
 "Hello".format("world")
 "Hello".format("world", key="value")
-
-# https://github.com/astral-sh/ruff/issues/18806
-# The fix here is unsafe because the unused argument has side effect
-"Hello, {0}".format("world", print(1))
-
-# The fix here is safe because the unused argument has no side effect,
-# even though the used argument has a side effect
-"Hello, {0}".format(print(1), "Pikachu")

crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH005_0.py

@@ -1,5 +1,3 @@
-# Mock objects
-# ============
 # Errors
 assert my_mock.not_called()
 assert my_mock.called_once_with()
@@ -19,25 +17,3 @@ my_mock.assert_called()
 my_mock.assert_called_once_with()
 """like :meth:`Mock.assert_called_once_with`"""
 """like :meth:`MagicMock.assert_called_once_with`"""
-
-# AsyncMock objects
-# =================
-# Errors
-assert my_mock.not_awaited()
-assert my_mock.awaited_once_with()
-assert my_mock.not_awaited
-assert my_mock.awaited_once_with
-my_mock.assert_not_awaited
-my_mock.assert_awaited
-my_mock.assert_awaited_once_with
-my_mock.assert_awaited_once_with
-MyMock.assert_awaited_once_with
-assert my_mock.awaited
-
-# OK
-assert my_mock.await_count == 1
-my_mock.assert_not_awaited()
-my_mock.assert_awaited()
-my_mock.assert_awaited_once_with()
-"""like :meth:`Mock.assert_awaited_once_with`"""
-"""like :meth:`MagicMock.assert_awaited_once_with`"""

crates/ruff_linter/resources/test/fixtures/pylint/nested_min_max.py

@@ -14,7 +14,7 @@ min(1, min(2, 3, key=test))
 # This will still trigger, to merge the calls without keyword args.
 min(1, min(2, 3, key=test), min(4, 5))
 
-# The fix is already unsafe, so deleting comments is okay.
+# Don't provide a fix if there are comments within the call.
 min(
     1,  # This is a comment.
     min(2, 3),

crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_dunder_call.py

@@ -129,6 +129,3 @@ blah = dict[{"a": 1}.__delitem__("a")]  # OK
 
 # https://github.com/astral-sh/ruff/issues/14597
 assert "abc".__str__() == "abc"
-
-# https://github.com/astral-sh/ruff/issues/18813
-three = 1 if 1 else(3.0).__str__()

crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_lambda.py

@@ -57,7 +57,3 @@ _ = lambda x: z(lambda y: x + y)(x)
 # lambda uses an additional keyword
 _ = lambda *args: f(*args, y=1)
 _ = lambda *args: f(*args, y=x)
-
-# https://github.com/astral-sh/ruff/issues/18675
-_ = lambda x: (string := str)(x)
-_ = lambda x: ((x := 1) and str)(x)

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP007.py

@@ -90,52 +90,3 @@ class AClass:
 
 def myfunc(param: "tuple[Union[int, 'AClass', None], str]"):
     print(param)
-
-
-from typing import NamedTuple, Union
-
-import typing_extensions
-from typing_extensions import (
-    NamedTuple as NamedTupleTE,
-    Union as UnionTE,
-)
-
-# Regression test for https://github.com/astral-sh/ruff/issues/18619
-# Don't emit lint for `NamedTuple`
-a_plain_1: Union[NamedTuple, int] = None
-a_plain_2: Union[int, NamedTuple] = None
-a_plain_3: Union[NamedTuple, None] = None
-a_plain_4: Union[None, NamedTuple] = None
-a_plain_te_1: UnionTE[NamedTupleTE, int] = None
-a_plain_te_2: UnionTE[int, NamedTupleTE] = None
-a_plain_te_3: UnionTE[NamedTupleTE, None] = None
-a_plain_te_4: UnionTE[None, NamedTupleTE] = None
-a_plain_typing_1: UnionTE[typing.NamedTuple, int] = None
-a_plain_typing_2: UnionTE[int, typing.NamedTuple] = None
-a_plain_typing_3: UnionTE[typing.NamedTuple, None] = None
-a_plain_typing_4: UnionTE[None, typing.NamedTuple] = None
-a_string_1: "Union[NamedTuple, int]" = None
-a_string_2: "Union[int, NamedTuple]" = None
-a_string_3: "Union[NamedTuple, None]" = None
-a_string_4: "Union[None, NamedTuple]" = None
-a_string_te_1: "UnionTE[NamedTupleTE, int]" = None
-a_string_te_2: "UnionTE[int, NamedTupleTE]" = None
-a_string_te_3: "UnionTE[NamedTupleTE, None]" = None
-a_string_te_4: "UnionTE[None, NamedTupleTE]" = None
-a_string_typing_1: "typing.Union[typing.NamedTuple, int]" = None
-a_string_typing_2: "typing.Union[int, typing.NamedTuple]" = None
-a_string_typing_3: "typing.Union[typing.NamedTuple, None]" = None
-a_string_typing_4: "typing.Union[None, typing.NamedTuple]" = None
-
-b_plain_1: Union[NamedTuple] = None
-b_plain_2: Union[NamedTuple, None] = None
-b_plain_te_1: UnionTE[NamedTupleTE] = None
-b_plain_te_2: UnionTE[NamedTupleTE, None] = None
-b_plain_typing_1: UnionTE[typing.NamedTuple] = None
-b_plain_typing_2: UnionTE[typing.NamedTuple, None] = None
-b_string_1: "Union[NamedTuple]" = None
-b_string_2: "Union[NamedTuple, None]" = None
-b_string_te_1: "UnionTE[NamedTupleTE]" = None
-b_string_te_2: "UnionTE[NamedTupleTE, None]" = None
-b_string_typing_1: "typing.Union[typing.NamedTuple]" = None
-b_string_typing_2: "typing.Union[typing.NamedTuple, None]" = None

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py

@@ -105,23 +105,3 @@ import builtins
 class C:
     def f(self):
         builtins.super(C, self)
-
-
-# see: https://github.com/astral-sh/ruff/issues/18533
-class ClassForCommentEnthusiasts(BaseClass):
-    def with_comments(self):
-        super(
-            # super helpful comment
-            ClassForCommentEnthusiasts,
-            self
-        ).f()
-        super(
-            ClassForCommentEnthusiasts,
-            # even more helpful comment
-            self
-        ).f()
-        super(
-            ClassForCommentEnthusiasts,
-            self
-            # also a comment
-        ).f()

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py

@@ -26,9 +26,3 @@ def hello():
 
 f"foo"u"bar"  # OK
 f"foo" u"bar"  # OK
-
-# https://github.com/astral-sh/ruff/issues/18895
-""u""
-""u"hi"
-""""""""""""""""""""u"hi"
-""U"helloooo"

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP036_5.py

@@ -71,47 +71,3 @@ if sys.version_info <= (3, 14, 0):
 
 if sys.version_info <= (3, 14, 15):
     print()
-
-# https://github.com/astral-sh/ruff/issues/18165
-
-if sys.version_info.major >= 3:
-    print("3")
-else:
-    print("2")
-
-if sys.version_info.major > 3:
-    print("3")
-else:
-    print("2")
-
-if sys.version_info.major <= 3:
-    print("3")
-else:
-    print("2")
-
-if sys.version_info.major < 3:
-    print("3")
-else:
-    print("2")
-
-if sys.version_info.major == 3:
-    print("3")
-else:
-    print("2")
-
-# Semantically incorrect, skip fixing
-
-if sys.version_info.major[1] > 3:
-    print(3)
-else:
-    print(2)
-
-if sys.version_info.major > (3, 13):
-    print(3)
-else:
-    print(2)
-
-if sys.version_info.major[:2] > (3, 13):
-    print(3)
-else:
-    print(2)

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py

@@ -47,25 +47,3 @@ class ServiceRefOrValue:
 # Test for: https://github.com/astral-sh/ruff/issues/18508
 # Optional[None] should not be offered a fix
 foo: Optional[None] = None
-
-
-from typing import NamedTuple, Optional
-
-import typing_extensions
-from typing_extensions import (
-    NamedTuple as NamedTupleTE,
-    Optional as OptionalTE,
-)
-
-# Regression test for https://github.com/astral-sh/ruff/issues/18619
-# Don't emit lint for `NamedTuple`
-a1: Optional[NamedTuple] = None
-a2: typing.Optional[NamedTuple] = None
-a3: OptionalTE[NamedTuple] = None
-a4: typing_extensions.Optional[NamedTuple] = None
-a5: Optional[typing.NamedTuple] = None
-a6: typing.Optional[typing.NamedTuple] = None
-a7: OptionalTE[typing.NamedTuple] = None
-a8: typing_extensions.Optional[typing.NamedTuple] = None
-a9: "Optional[NamedTuple]" = None
-a10: Optional[NamedTupleTE] = None

crates/ruff_linter/resources/test/fixtures/refurb/FURB163.py

@@ -44,13 +44,6 @@ log(1, math.e)
 math.log(1, 2.0001)
 math.log(1, 10.0001)
 
-# https://github.com/astral-sh/ruff/issues/18747
-def log():
-    yield math.log((yield), math.e)
-
-
-def log():
-    yield math.log((yield from x), math.e)
 
 # see: https://github.com/astral-sh/ruff/issues/18639
 math.log(1, 10 # comment

crates/ruff_linter/resources/test/fixtures/refurb/FURB164.py

@@ -20,12 +20,6 @@ _ = Decimal.from_float(float("-inf"))
 _ = Decimal.from_float(float("Infinity"))
 _ = Decimal.from_float(float("-Infinity"))
 _ = Decimal.from_float(float("nan"))
-_ = Decimal.from_float(float("-NaN "))
-_ = Decimal.from_float(float(" \n+nan   \t"))
-_ = Decimal.from_float(float("  iNf \n\t "))
-_ = Decimal.from_float(float("   -inF\n \t"))
-_ = Decimal.from_float(float("  InfinIty \n\t "))
-_ = Decimal.from_float(float("   -InfinIty\n \t"))
 
 # OK
 _ = Fraction(0.1)

crates/ruff_linter/resources/test/fixtures/refurb/FURB168.py

@@ -85,10 +85,3 @@ def _():
 
     if isinstance(foo, type(None)):
         ...
-
-# https://github.com/astral-sh/ruff/issues/19047
-if isinstance(foo, ()):
-    pass
-
-if isinstance(foo, Union[()]):
-    pass

crates/ruff_linter/resources/test/fixtures/ruff/RUF009.py

@@ -110,19 +110,3 @@ class ShouldMatchB008RuleOfImmutableTypeAnnotationIgnored:
     # ignored
     this_is_fine: int = f()
 
-
-# Test for:
-# https://github.com/astral-sh/ruff/issues/17424
-@dataclass(frozen=True)
-class C:
-    foo: int = 1
-
-
-@dataclass
-class D:
-    c: C = C()
-
-
-@dataclass
-class E:
-    c: C = C()

crates/ruff_linter/resources/test/fixtures/ruff/RUF009_attrs.py

@@ -73,55 +73,3 @@ class IntConversionDescriptor:
 @frozen
 class InventoryItem:
     quantity_on_hand: IntConversionDescriptor = IntConversionDescriptor(default=100)
-
-
-# Test for:
-# https://github.com/astral-sh/ruff/issues/17424
-@frozen
-class C:
-    foo: int = 1
-
-
-@attr.frozen
-class D:
-    foo: int = 1
-
-
-@define
-class E:
-    c: C = C()
-    d: D = D()
-
-
-@attr.s
-class F:
-    foo: int = 1
-
-
-@attr.mutable
-class G:
-    foo: int = 1
-
-
-@attr.attrs
-class H:
-    f: F = F()
-    g: G = G()
-
-
-@attr.define
-class I:
-    f: F = F()
-    g: G = G()
-
-
-@attr.frozen
-class J:
-    f: F = F()
-    g: G = G()
-
-
-@attr.mutable
-class K:
-    f: F = F()
-    g: G = G()

crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py

@@ -36,19 +36,5 @@ f"{ascii(bla)}"  # OK
 )
 
 
-# https://github.com/astral-sh/ruff/issues/16325
+# OK
 f"{str({})}"
-
-f"{str({} | {})}"
-
-import builtins
-
-f"{builtins.repr(1)}"
-
-f"{repr(1)=}"
-
-f"{repr(lambda: 1)}"
-
-f"{repr(x := 2)}"
-
-f"{str(object=3)}"

crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py

@@ -1,5 +1,5 @@
-import collections
 from collections import deque
+import collections
 
 
 def f():
@@ -91,14 +91,3 @@ def f():
 
 def f():
     deque([], iterable=[])
-
-# https://github.com/astral-sh/ruff/issues/18854
-deque("")
-deque(b"")
-deque(f"")
-deque(f"" "")
-deque(f"" f"")
-deque("abc") # OK
-deque(b"abc") # OK
-deque(f"" "a")  # OK
-deque(f"{x}" "")  # OK

crates/ruff_linter/src/checkers/ast/analyze/bindings.rs

@@ -34,7 +34,7 @@ pub(crate) fn bindings(checker: &Checker) {
             if binding.kind.is_bound_exception()
                 && binding.is_unused()
                 && !checker
-                    .settings()
+                    .settings
                     .dummy_variable_rgx
                     .is_match(binding.name(checker.source()))
             {
@@ -67,7 +67,7 @@ pub(crate) fn bindings(checker: &Checker) {
             flake8_import_conventions::rules::unconventional_import_alias(
                 checker,
                 binding,
-                &checker.settings().flake8_import_conventions.aliases,
+                &checker.settings.flake8_import_conventions.aliases,
             );
         }
         if checker.is_rule_enabled(Rule::UnaliasedCollectionsAbcSetImport) {

crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs

@@ -1,7 +1,12 @@
-use ruff_python_semantic::{Binding, ScopeKind};
+use ruff_python_semantic::analyze::visibility;
+use ruff_python_semantic::{Binding, BindingKind, Imported, ResolvedReference, ScopeKind};
+use ruff_text_size::Ranged;
+use rustc_hash::FxHashMap;
 
+use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
+use crate::fix;
 use crate::rules::{
     flake8_builtins, flake8_pyi, flake8_type_checking, flake8_unused_arguments, pep8_naming,
     pyflakes, pylint, ruff,
@@ -71,7 +76,7 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                         flake8_type_checking::helpers::is_valid_runtime_import(
                             binding,
                             &checker.semantic,
-                            &checker.settings().flake8_type_checking,
+                            &checker.settings.flake8_type_checking,
                         )
                     })
                     .collect()
@@ -89,19 +94,260 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
         }
 
         if checker.is_rule_enabled(Rule::GlobalVariableNotAssigned) {
-            pylint::rules::global_variable_not_assigned(checker, scope);
+            for (name, binding_id) in scope.bindings() {
+                let binding = checker.semantic.binding(binding_id);
+                // If the binding is a `global`, then it's a top-level `global` that was never
+                // assigned in the current scope. If it were assigned, the `global` would be
+                // shadowed by the assignment.
+                if binding.kind.is_global() {
+                    // If the binding was conditionally deleted, it will include a reference within
+                    // a `Del` context, but won't be shadowed by a `BindingKind::Deletion`, as in:
+                    // ```python
+                    // if condition:
+                    //     del var
+                    // ```
+                    if binding
+                        .references
+                        .iter()
+                        .map(|id| checker.semantic.reference(*id))
+                        .all(ResolvedReference::is_load)
+                    {
+                        checker.report_diagnostic(
+                            pylint::rules::GlobalVariableNotAssigned {
+                                name: (*name).to_string(),
+                            },
+                            binding.range(),
+                        );
+                    }
+                }
+            }
         }
 
         if checker.is_rule_enabled(Rule::RedefinedArgumentFromLocal) {
-            pylint::rules::redefined_argument_from_local(checker, scope_id, scope);
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if !matches!(
+                        binding.kind,
+                        BindingKind::LoopVar
+                            | BindingKind::BoundException
+                            | BindingKind::WithItemVar
+                    ) {
+                        continue;
+                    }
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if !shadowed.kind.is_argument() {
+                        continue;
+                    }
+                    if checker.settings.dummy_variable_rgx.is_match(name) {
+                        continue;
+                    }
+                    let scope = &checker.semantic.scopes[binding.scope];
+                    if scope.kind.is_generator() {
+                        continue;
+                    }
+                    checker.report_diagnostic(
+                        pylint::rules::RedefinedArgumentFromLocal {
+                            name: name.to_string(),
+                        },
+                        binding.range(),
+                    );
+                }
+            }
         }
 
         if checker.is_rule_enabled(Rule::ImportShadowedByLoopVar) {
-            pyflakes::rules::import_shadowed_by_loop_var(checker, scope_id, scope);
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding isn't a loop variable, abort.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if !binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding isn't an import, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if !matches!(
+                        shadowed.kind,
+                        BindingKind::Import(..)
+                            | BindingKind::FromImport(..)
+                            | BindingKind::SubmoduleImport(..)
+                            | BindingKind::FutureImport
+                    ) {
+                        continue;
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.is_none_or(|left| {
+                        binding
+                            .source
+                            .is_none_or(|right| !checker.semantic.same_branch(left, right))
+                    }) {
+                        continue;
+                    }
+
+                    checker.report_diagnostic(
+                        pyflakes::rules::ImportShadowedByLoopVar {
+                            name: name.to_string(),
+                            row: checker.compute_source_row(shadowed.start()),
+                        },
+                        binding.range(),
+                    );
+                }
+            }
         }
 
         if checker.is_rule_enabled(Rule::RedefinedWhileUnused) {
-            pyflakes::rules::redefined_while_unused(checker, scope_id, scope);
+            // Index the redefined bindings by statement.
+            let mut redefinitions = FxHashMap::default();
+
+            for (name, binding_id) in scope.bindings() {
+                for shadow in checker.semantic.shadowed_bindings(scope_id, binding_id) {
+                    // If the shadowing binding is a loop variable, abort, to avoid overlap
+                    // with F402.
+                    let binding = &checker.semantic.bindings[shadow.binding_id()];
+                    if binding.kind.is_loop_var() {
+                        continue;
+                    }
+
+                    // If the shadowed binding is used, abort.
+                    let shadowed = &checker.semantic.bindings[shadow.shadowed_id()];
+                    if shadowed.is_used() {
+                        continue;
+                    }
+
+                    // If the shadowing binding isn't considered a "redefinition" of the
+                    // shadowed binding, abort.
+                    if !binding.redefines(shadowed) {
+                        continue;
+                    }
+
+                    if shadow.same_scope() {
+                        // If the symbol is a dummy variable, abort, unless the shadowed
+                        // binding is an import.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) && checker.settings.dummy_variable_rgx.is_match(name)
+                        {
+                            continue;
+                        }
+
+                        let Some(node_id) = shadowed.source else {
+                            continue;
+                        };
+
+                        // If this is an overloaded function, abort.
+                        if shadowed.kind.is_function_definition() {
+                            if checker
+                                .semantic
+                                .statement(node_id)
+                                .as_function_def_stmt()
+                                .is_some_and(|function| {
+                                    visibility::is_overload(
+                                        &function.decorator_list,
+                                        &checker.semantic,
+                                    )
+                                })
+                            {
+                                continue;
+                            }
+                        }
+                    } else {
+                        // Only enforce cross-scope shadowing for imports.
+                        if !matches!(
+                            shadowed.kind,
+                            BindingKind::Import(..)
+                                | BindingKind::FromImport(..)
+                                | BindingKind::SubmoduleImport(..)
+                                | BindingKind::FutureImport
+                        ) {
+                            continue;
+                        }
+                    }
+
+                    // If the bindings are in different forks, abort.
+                    if shadowed.source.is_none_or(|left| {
+                        binding
+                            .source
+                            .is_none_or(|right| !checker.semantic.same_branch(left, right))
+                    }) {
+                        continue;
+                    }
+
+                    redefinitions
+                        .entry(binding.source)
+                        .or_insert_with(Vec::new)
+                        .push((shadowed, binding));
+                }
+            }
+
+            // Create a fix for each source statement.
+            let mut fixes = FxHashMap::default();
+            for (source, entries) in &redefinitions {
+                let Some(source) = source else {
+                    continue;
+                };
+
+                let member_names = entries
+                    .iter()
+                    .filter_map(|(shadowed, binding)| {
+                        if let Some(shadowed_import) = shadowed.as_any_import() {
+                            if let Some(import) = binding.as_any_import() {
+                                if shadowed_import.qualified_name() == import.qualified_name() {
+                                    return Some(import.member_name());
+                                }
+                            }
+                        }
+                        None
+                    })
+                    .collect::<Vec<_>>();
+
+                if !member_names.is_empty() {
+                    let statement = checker.semantic.statement(*source);
+                    let parent = checker.semantic.parent_statement(*source);
+                    let Ok(edit) = fix::edits::remove_unused_imports(
+                        member_names.iter().map(std::convert::AsRef::as_ref),
+                        statement,
+                        parent,
+                        checker.locator(),
+                        checker.stylist(),
+                        checker.indexer(),
+                    ) else {
+                        continue;
+                    };
+                    fixes.insert(
+                        *source,
+                        Fix::safe_edit(edit).isolate(Checker::isolation(
+                            checker.semantic().parent_statement_id(*source),
+                        )),
+                    );
+                }
+            }
+
+            // Create diagnostics for each statement.
+            for (source, entries) in &redefinitions {
+                for (shadowed, binding) in entries {
+                    let mut diagnostic = checker.report_diagnostic(
+                        pyflakes::rules::RedefinedWhileUnused {
+                            name: binding.name(checker.source()).to_string(),
+                            row: checker.compute_source_row(shadowed.start()),
+                        },
+                        binding.range(),
+                    );
+
+                    if let Some(range) = binding.parent_range(&checker.semantic) {
+                        diagnostic.set_parent(range.start());
+                    }
+
+                    if let Some(fix) = source.as_ref().and_then(|source| fixes.get(source)) {
+                        diagnostic.set_fix(fix.clone());
+                    }
+                }
+            }
         }
 
         if checker.source_type.is_stub()
@@ -156,7 +402,7 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                             && binding.is_unused()
                             && !binding.is_nonlocal()
                             && !binding.is_global()
-                            && !checker.settings().dummy_variable_rgx.is_match(name)
+                            && !checker.settings.dummy_variable_rgx.is_match(name)
                             && !matches!(
                                 name,
                                 "__tracebackhide__"

crates/ruff_linter/src/checkers/ast/analyze/definitions.rs

@@ -167,7 +167,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
         if enforce_docstrings || enforce_pydoclint {
             if pydocstyle::helpers::should_ignore_definition(
                 definition,
-                &checker.settings().pydocstyle,
+                &checker.settings.pydocstyle,
                 &checker.semantic,
             ) {
                 continue;
@@ -253,7 +253,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
                 pydocstyle::rules::non_imperative_mood(
                     checker,
                     &docstring,
-                    &checker.settings().pydocstyle,
+                    &checker.settings.pydocstyle,
                 );
             }
             if checker.is_rule_enabled(Rule::SignatureInDocstring) {
@@ -292,7 +292,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
             if enforce_sections || enforce_pydoclint {
                 let section_contexts = pydocstyle::helpers::get_section_contexts(
                     &docstring,
-                    checker.settings().pydocstyle.convention(),
+                    checker.settings.pydocstyle.convention(),
                 );
 
                 if enforce_sections {
@@ -300,7 +300,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
                         checker,
                         &docstring,
                         &section_contexts,
-                        checker.settings().pydocstyle.convention(),
+                        checker.settings.pydocstyle.convention(),
                     );
                 }
 
@@ -310,7 +310,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
                         definition,
                         &docstring,
                         &section_contexts,
-                        checker.settings().pydocstyle.convention(),
+                        checker.settings.pydocstyle.convention(),
                     );
                 }
             }

crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs

@@ -41,7 +41,7 @@ pub(crate) fn except_handler(except_handler: &ExceptHandler, checker: &Checker)
                     except_handler,
                     type_.as_deref(),
                     body,
-                    checker.settings().flake8_bandit.check_typed_exception,
+                    checker.settings.flake8_bandit.check_typed_exception,
                 );
             }
             if checker.is_rule_enabled(Rule::TryExceptContinue) {
@@ -50,7 +50,7 @@ pub(crate) fn except_handler(except_handler: &ExceptHandler, checker: &Checker)
                     except_handler,
                     type_.as_deref(),
                     body,
-                    checker.settings().flake8_bandit.check_typed_exception,
+                    checker.settings.flake8_bandit.check_typed_exception,
                 );
             }
             if checker.is_rule_enabled(Rule::ExceptWithEmptyTuple) {

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -7,7 +7,6 @@ use ruff_python_semantic::analyze::typing;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
-use crate::preview::is_optional_as_none_in_union_enabled;
 use crate::registry::Rule;
 use crate::rules::{
     airflow, flake8_2020, flake8_async, flake8_bandit, flake8_boolean_trap, flake8_bugbear,
@@ -36,7 +35,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             && checker.target_version() < PythonVersion::PY310
                             && checker.target_version() >= PythonVersion::PY37
                             && checker.semantic.in_annotation()
-                            && !checker.settings().pyupgrade.keep_runtime_typing
+                            && !checker.settings.pyupgrade.keep_runtime_typing
                         {
                             flake8_future_annotations::rules::future_rewritable_type_annotation(
                                 checker, value,
@@ -52,7 +51,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             || (checker.target_version() >= PythonVersion::PY37
                                 && checker.semantic.future_annotations_or_stub()
                                 && checker.semantic.in_annotation()
-                                && !checker.settings().pyupgrade.keep_runtime_typing)
+                                && !checker.settings.pyupgrade.keep_runtime_typing)
                         {
                             pyupgrade::rules::non_pep604_annotation(checker, expr, slice, operator);
                         }
@@ -91,13 +90,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                     if checker.is_rule_enabled(Rule::UnnecessaryLiteralUnion) {
                         flake8_pyi::rules::unnecessary_literal_union(checker, expr);
                     }
-                    if checker.is_rule_enabled(Rule::DuplicateUnionMember)
-                        // Avoid duplicate checks inside `Optional`
-                        && !(
-                            is_optional_as_none_in_union_enabled(checker.settings())
-                            && checker.semantic.inside_optional()
-                        )
-                    {
+                    if checker.is_rule_enabled(Rule::DuplicateUnionMember) {
                         flake8_pyi::rules::duplicate_union_member(checker, expr);
                     }
                     if checker.is_rule_enabled(Rule::RedundantLiteralUnion) {
@@ -295,7 +288,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                                     && checker.target_version() < PythonVersion::PY39
                                     && checker.target_version() >= PythonVersion::PY37
                                     && checker.semantic.in_annotation()
-                                    && !checker.settings().pyupgrade.keep_runtime_typing
+                                    && !checker.settings.pyupgrade.keep_runtime_typing
                                 {
                                     flake8_future_annotations::rules::future_rewritable_type_annotation(checker, expr);
                                 }
@@ -306,7 +299,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                                     || (checker.target_version() >= PythonVersion::PY37
                                         && checker.semantic.future_annotations_or_stub()
                                         && checker.semantic.in_annotation()
-                                        && !checker.settings().pyupgrade.keep_runtime_typing)
+                                        && !checker.settings.pyupgrade.keep_runtime_typing)
                                 {
                                     pyupgrade::rules::use_pep585_annotation(
                                         checker,
@@ -402,7 +395,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             && checker.target_version() < PythonVersion::PY39
                             && checker.target_version() >= PythonVersion::PY37
                             && checker.semantic.in_annotation()
-                            && !checker.settings().pyupgrade.keep_runtime_typing
+                            && !checker.settings.pyupgrade.keep_runtime_typing
                         {
                             flake8_future_annotations::rules::future_rewritable_type_annotation(
                                 checker, expr,
@@ -415,7 +408,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             || (checker.target_version() >= PythonVersion::PY37
                                 && checker.semantic.future_annotations_or_stub()
                                 && checker.semantic.in_annotation()
-                                && !checker.settings().pyupgrade.keep_runtime_typing)
+                                && !checker.settings.pyupgrade.keep_runtime_typing)
                         {
                             pyupgrade::rules::use_pep585_annotation(checker, expr, &replacement);
                         }
@@ -546,13 +539,14 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             let location = expr.range();
                             match pyflakes::format::FormatSummary::try_from(string_value.to_str()) {
                                 Err(e) => {
-                                    // F521
-                                    checker.report_diagnostic_if_enabled(
-                                        pyflakes::rules::StringDotFormatInvalidFormat {
-                                            message: pyflakes::format::error_to_string(&e),
-                                        },
-                                        location,
-                                    );
+                                    if checker.is_rule_enabled(Rule::StringDotFormatInvalidFormat) {
+                                        checker.report_diagnostic(
+                                            pyflakes::rules::StringDotFormatInvalidFormat {
+                                                message: pyflakes::format::error_to_string(&e),
+                                            },
+                                            location,
+                                        );
+                                    }
                                 }
                                 Ok(summary) => {
                                     if checker
@@ -847,7 +841,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 flake8_comprehensions::rules::unnecessary_collection_call(
                     checker,
                     call,
-                    &checker.settings().flake8_comprehensions,
+                    &checker.settings.flake8_comprehensions,
                 );
             }
             if checker.is_rule_enabled(Rule::UnnecessaryLiteralWithinTupleCall) {
@@ -1012,7 +1006,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::PrintfInGetTextFuncCall,
             ]) && flake8_gettext::is_gettext_func_call(
                 func,
-                &checker.settings().flake8_gettext.functions_names,
+                &checker.settings.flake8_gettext.functions_names,
             ) {
                 if checker.is_rule_enabled(Rule::FStringInGetTextFuncCall) {
                     flake8_gettext::rules::f_string_in_gettext_func_call(checker, args);
@@ -1062,6 +1056,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::OsPathSplitext,
                 Rule::BuiltinOpen,
                 Rule::PyPath,
+                Rule::OsPathGetsize,
                 Rule::OsPathGetatime,
                 Rule::OsPathGetmtime,
                 Rule::OsPathGetctime,
@@ -1071,9 +1066,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
             }
-            if checker.is_rule_enabled(Rule::OsPathGetsize) {
-                flake8_use_pathlib::rules::os_path_getsize(checker, call);
-            }
             if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
                 flake8_use_pathlib::rules::path_constructor_current_directory(checker, call);
             }
@@ -1321,22 +1313,26 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             typ: CFormatErrorType::UnsupportedFormatChar(c),
                             ..
                         }) => {
-                            // F509
-                            checker.report_diagnostic_if_enabled(
-                                pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
-                                    char: c,
-                                },
-                                location,
-                            );
+                            if checker
+                                .is_rule_enabled(Rule::PercentFormatUnsupportedFormatCharacter)
+                            {
+                                checker.report_diagnostic(
+                                    pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
+                                        char: c,
+                                    },
+                                    location,
+                                );
+                            }
                         }
                         Err(e) => {
-                            // F501
-                            checker.report_diagnostic_if_enabled(
-                                pyflakes::rules::PercentFormatInvalidFormat {
-                                    message: e.to_string(),
-                                },
-                                location,
-                            );
+                            if checker.is_rule_enabled(Rule::PercentFormatInvalidFormat) {
+                                checker.report_diagnostic(
+                                    pyflakes::rules::PercentFormatInvalidFormat {
+                                        message: e.to_string(),
+                                    },
+                                    location,
+                                );
+                            }
                         }
                         Ok(summary) => {
                             if checker.is_rule_enabled(Rule::PercentFormatExpectedMapping) {
@@ -1437,11 +1433,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if !checker.semantic.in_nested_union() {
                 if checker.is_rule_enabled(Rule::DuplicateUnionMember)
                     && checker.semantic.in_type_definition()
-                    // Avoid duplicate checks inside `Optional`
-                    && !(
-                        is_optional_as_none_in_union_enabled(checker.settings())
-                        && checker.semantic.inside_optional()
-                    )
                 {
                     flake8_pyi::rules::duplicate_union_member(checker, expr);
                 }

crates/ruff_linter/src/checkers/ast/analyze/statement.rs

@@ -45,7 +45,18 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.is_rule_enabled(Rule::NonlocalWithoutBinding) {
-                pylint::rules::nonlocal_without_binding(checker, nonlocal);
+                if !checker.semantic.scope_id.is_global() {
+                    for name in names {
+                        if checker.semantic.nonlocal(name).is_none() {
+                            checker.report_diagnostic(
+                                pylint::rules::NonlocalWithoutBinding {
+                                    name: name.to_string(),
+                                },
+                                name.range(),
+                            );
+                        }
+                    }
+                }
             }
             if checker.is_rule_enabled(Rule::NonlocalAndGlobal) {
                 pylint::rules::nonlocal_and_global(checker, nonlocal);
@@ -121,7 +132,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     stmt,
                     name,
                     decorator_list,
-                    &checker.settings().pep8_naming.ignore_names,
+                    &checker.settings.pep8_naming.ignore_names,
                     &checker.semantic,
                 );
             }
@@ -178,7 +189,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker.semantic.current_scope(),
                     stmt,
                     name,
-                    &checker.settings().pep8_naming.ignore_names,
+                    &checker.settings.pep8_naming.ignore_names,
                 );
             }
             if checker.is_rule_enabled(Rule::GlobalStatement) {
@@ -229,7 +240,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     stmt,
                     name,
                     body,
-                    checker.settings().mccabe.max_complexity,
+                    checker.settings.mccabe.max_complexity,
                 );
             }
             if checker.is_rule_enabled(Rule::HardcodedPasswordDefault) {
@@ -254,7 +265,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     stmt,
                     body,
-                    checker.settings().pylint.max_returns,
+                    checker.settings.pylint.max_returns,
                 );
             }
             if checker.is_rule_enabled(Rule::TooManyBranches) {
@@ -262,7 +273,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     stmt,
                     body,
-                    checker.settings().pylint.max_branches,
+                    checker.settings.pylint.max_branches,
                 );
             }
             if checker.is_rule_enabled(Rule::TooManyStatements) {
@@ -270,7 +281,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     stmt,
                     body,
-                    checker.settings().pylint.max_statements,
+                    checker.settings.pylint.max_statements,
                 );
             }
             if checker.any_rule_enabled(&[
@@ -420,7 +431,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::too_many_public_methods(
                     checker,
                     class_def,
-                    checker.settings().pylint.max_public_methods,
+                    checker.settings.pylint.max_public_methods,
                 );
             }
             if checker.is_rule_enabled(Rule::GlobalStatement) {
@@ -448,7 +459,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     stmt,
                     name,
-                    &checker.settings().pep8_naming.ignore_names,
+                    &checker.settings.pep8_naming.ignore_names,
                 );
             }
             if checker.is_rule_enabled(Rule::ErrorSuffixOnExceptionName) {
@@ -457,7 +468,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     stmt,
                     arguments.as_deref(),
                     name,
-                    &checker.settings().pep8_naming.ignore_names,
+                    &checker.settings.pep8_naming.ignore_names,
                 );
             }
             if !checker.source_type.is_stub() {
@@ -635,7 +646,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::LowercaseImportedAsNonLowercase) {
@@ -645,7 +656,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsLowercase) {
@@ -655,7 +666,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsConstant) {
@@ -665,7 +676,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsAcronym) {
@@ -681,7 +692,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             stmt,
                             &alias.name,
                             asname,
-                            &checker.settings().flake8_import_conventions.banned_aliases,
+                            &checker.settings.flake8_import_conventions.banned_aliases,
                         );
                     }
                 }
@@ -817,7 +828,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                         pyflakes::rules::future_feature_not_defined(checker, alias);
                     }
                 } else if &alias.name == "*" {
-                    // F406
                     if checker.is_rule_enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
                         if !matches!(checker.semantic.current_scope().kind, ScopeKind::Module) {
                             checker.report_diagnostic(
@@ -828,13 +838,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             );
                         }
                     }
-                    // F403
-                    checker.report_diagnostic_if_enabled(
-                        pyflakes::rules::UndefinedLocalWithImportStar {
-                            name: helpers::format_import_from(level, module).to_string(),
-                        },
-                        stmt.range(),
-                    );
+                    if checker.is_rule_enabled(Rule::UndefinedLocalWithImportStar) {
+                        checker.report_diagnostic(
+                            pyflakes::rules::UndefinedLocalWithImportStar {
+                                name: helpers::format_import_from(level, module).to_string(),
+                            },
+                            stmt.range(),
+                        );
+                    }
                 }
                 if checker.is_rule_enabled(Rule::RelativeImports) {
                     flake8_tidy_imports::rules::banned_relative_import(
@@ -843,7 +854,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                         level,
                         module,
                         checker.module.qualified_name(),
-                        checker.settings().flake8_tidy_imports.ban_relative_imports,
+                        checker.settings.flake8_tidy_imports.ban_relative_imports,
                     );
                 }
                 if checker.is_rule_enabled(Rule::Debugger) {
@@ -858,7 +869,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             stmt,
                             &qualified_name,
                             asname,
-                            &checker.settings().flake8_import_conventions.banned_aliases,
+                            &checker.settings.flake8_import_conventions.banned_aliases,
                         );
                     }
                 }
@@ -870,7 +881,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::LowercaseImportedAsNonLowercase) {
@@ -880,7 +891,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsLowercase) {
@@ -890,7 +901,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsConstant) {
@@ -900,7 +911,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                             asname,
                             alias,
                             stmt,
-                            &checker.settings().pep8_naming.ignore_names,
+                            &checker.settings.pep8_naming.ignore_names,
                         );
                     }
                     if checker.is_rule_enabled(Rule::CamelcaseImportedAsAcronym) {
@@ -936,7 +947,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker,
                     stmt,
                     &helpers::format_import_from(level, module),
-                    &checker.settings().flake8_import_conventions.banned_from,
+                    &checker.settings.flake8_import_conventions.banned_from,
                 );
             }
             if checker.is_rule_enabled(Rule::ByteStringUsage) {

crates/ruff_linter/src/checkers/ast/analyze/string_like.rs

@@ -34,7 +34,7 @@ pub(crate) fn string_like(string_like: StringLike, checker: &Checker) {
         flake8_quotes::rules::unnecessary_escaped_quote(checker, string_like);
     }
     if checker.is_rule_enabled(Rule::AvoidableEscapedQuote)
-        && checker.settings().flake8_quotes.avoid_escape
+        && checker.settings.flake8_quotes.avoid_escape
     {
         flake8_quotes::rules::avoidable_escaped_quote(checker, string_like);
     }

crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs

@@ -13,15 +13,15 @@ pub(crate) fn unresolved_references(checker: &Checker) {
 
     for reference in checker.semantic.unresolved_references() {
         if reference.is_wildcard_import() {
-            // F406
-            checker.report_diagnostic_if_enabled(
-                pyflakes::rules::UndefinedLocalWithImportStarUsage {
-                    name: reference.name(checker.source()).to_string(),
-                },
-                reference.range(),
-            );
+            if checker.is_rule_enabled(Rule::UndefinedLocalWithImportStarUsage) {
+                checker.report_diagnostic(
+                    pyflakes::rules::UndefinedLocalWithImportStarUsage {
+                        name: reference.name(checker.source()).to_string(),
+                    },
+                    reference.range(),
+                );
+            }
         } else {
-            // F821
             if checker.is_rule_enabled(Rule::UndefinedName) {
                 if checker.semantic.in_no_type_check() {
                     continue;

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -28,7 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
+use ruff_diagnostics::IsolationLevel;
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
 use ruff_python_ast::identifier::Identifier;
@@ -207,6 +207,8 @@ pub(crate) struct Checker<'a> {
     /// The [`NoqaMapping`] for the current analysis (i.e., the mapping from line number to
     /// suppression commented line number).
     noqa_line_for: &'a NoqaMapping,
+    /// The [`LinterSettings`] for the current analysis, including the enabled rules.
+    pub(crate) settings: &'a LinterSettings,
     /// The [`Locator`] for the current file, which enables extraction of source code from byte
     /// offsets.
     locator: &'a Locator<'a>,
@@ -258,12 +260,13 @@ impl<'a> Checker<'a> {
         notebook_index: Option<&'a NotebookIndex>,
         target_version: TargetVersion,
         context: &'a LintContext<'a>,
-    ) -> Self {
+    ) -> Checker<'a> {
         let semantic = SemanticModel::new(&settings.typing_modules, path, module);
         Self {
             parsed,
             parsed_type_annotation: None,
             parsed_annotations_cache: ParsedAnnotationsCache::new(parsed_annotations_arena),
+            settings,
             noqa_line_for,
             noqa,
             path,
@@ -388,7 +391,7 @@ impl<'a> Checker<'a> {
 
     /// Return a [`DiagnosticGuard`] for reporting a diagnostic.
     ///
-    /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
+    /// The guard derefs to a [`Diagnostic`], so it can be used to further modify the diagnostic
     /// before it is added to the collection in the checker on `Drop`.
     pub(crate) fn report_diagnostic<'chk, T: Violation>(
         &'chk self,
@@ -401,8 +404,8 @@ impl<'a> Checker<'a> {
     /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
     /// enabled.
     ///
-    /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the checker on `Drop`.
+    /// Prefer [`Checker::report_diagnostic`] in general because the conversion from a `Diagnostic`
+    /// to a `Rule` is somewhat expensive.
     pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
         &'chk self,
         kind: T,
@@ -461,11 +464,6 @@ impl<'a> Checker<'a> {
         &self.semantic
     }
 
-    /// The [`LinterSettings`] for the current analysis, including the enabled rules.
-    pub(crate) const fn settings(&self) -> &'a LinterSettings {
-        self.context.settings
-    }
-
     /// The [`Path`] to the file under analysis.
     pub(crate) const fn path(&self) -> &'a Path {
         self.path
@@ -578,7 +576,7 @@ impl<'a> Checker<'a> {
     ) -> Option<TypingImporter<'b, 'a>> {
         let source_module = if self.target_version() >= version_added_to_typing {
             "typing"
-        } else if !self.settings().typing_extensions {
+        } else if !self.settings.typing_extensions {
             return None;
         } else {
             "typing_extensions"
@@ -625,7 +623,6 @@ impl SemanticSyntaxContext for Checker<'_> {
     fn report_semantic_error(&self, error: SemanticSyntaxError) {
         match error.kind {
             SemanticSyntaxErrorKind::LateFutureImport => {
-                // F404
                 if self.is_rule_enabled(Rule::LateFutureImport) {
                     self.report_diagnostic(LateFutureImport, error.range);
                 }
@@ -647,7 +644,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                 }
             }
             SemanticSyntaxErrorKind::ReturnOutsideFunction => {
-                // F706
                 if self.is_rule_enabled(Rule::ReturnOutsideFunction) {
                     self.report_diagnostic(ReturnOutsideFunction, error.range);
                 }
@@ -1058,7 +1054,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 let annotation = AnnotationContext::from_function(
                     function_def,
                     &self.semantic,
-                    self.settings(),
+                    self.settings,
                     self.target_version(),
                 );
 
@@ -1260,7 +1256,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
             }) => {
                 match AnnotationContext::from_model(
                     &self.semantic,
-                    self.settings(),
+                    self.settings,
                     self.target_version(),
                 ) {
                     AnnotationContext::RuntimeRequired => {
@@ -1872,8 +1868,8 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     match typing::match_annotated_subscript(
                         value,
                         &self.semantic,
-                        self.settings().typing_modules.iter().map(String::as_str),
-                        &self.settings().pyflakes.extend_generics,
+                        self.settings.typing_modules.iter().map(String::as_str),
+                        &self.settings.pyflakes.extend_generics,
                     ) {
                         // Ex) Literal["Class"]
                         Some(typing::SubscriptKind::Literal) => {
@@ -2480,7 +2476,6 @@ impl<'a> Checker<'a> {
 
     fn bind_builtins(&mut self) {
         let target_version = self.target_version();
-        let settings = self.settings();
         let mut bind_builtin = |builtin| {
             // Add the builtin to the scope.
             let binding_id = self.semantic.push_builtin();
@@ -2494,7 +2489,7 @@ impl<'a> Checker<'a> {
         for builtin in MAGIC_GLOBALS {
             bind_builtin(builtin);
         }
-        for builtin in &settings.builtins {
+        for builtin in &self.settings.builtins {
             bind_builtin(builtin);
         }
     }
@@ -2765,7 +2760,9 @@ impl<'a> Checker<'a> {
 
                         self.semantic.restore(snapshot);
 
-                        if self.semantic.in_typing_only_annotation() {
+                        if self.semantic.in_annotation()
+                            && self.semantic.in_typing_only_annotation()
+                        {
                             if self.is_rule_enabled(Rule::QuotedAnnotation) {
                                 pyupgrade::rules::quoted_annotation(self, annotation, range);
                             }
@@ -2808,7 +2805,6 @@ impl<'a> Checker<'a> {
                     Err(parse_error) => {
                         self.semantic.restore(snapshot);
 
-                        // F722
                         if self.is_rule_enabled(Rule::ForwardAnnotationSyntaxError) {
                             self.report_type_diagnostic(
                                 pyflakes::rules::ForwardAnnotationSyntaxError {
@@ -2956,7 +2952,6 @@ impl<'a> Checker<'a> {
                     self.semantic.flags -= SemanticModelFlags::DUNDER_ALL_DEFINITION;
                 } else {
                     if self.semantic.global_scope().uses_star_imports() {
-                        // F405
                         if self.is_rule_enabled(Rule::UndefinedLocalWithImportStarUsage) {
                             self.report_diagnostic(
                                 pyflakes::rules::UndefinedLocalWithImportStarUsage {
@@ -2967,9 +2962,8 @@ impl<'a> Checker<'a> {
                             .set_parent(definition.start());
                         }
                     } else {
-                        // F822
                         if self.is_rule_enabled(Rule::UndefinedExport) {
-                            if is_undefined_export_in_dunder_init_enabled(self.settings())
+                            if is_undefined_export_in_dunder_init_enabled(self.settings)
                                 || !self.path.ends_with("__init__.py")
                             {
                                 self.report_diagnostic(
@@ -3121,6 +3115,7 @@ pub(crate) struct LintContext<'a> {
     diagnostics: RefCell<Vec<OldDiagnostic>>,
     source_file: SourceFile,
     rules: RuleTable,
+    #[expect(unused, reason = "TODO(brent) use this instead of Checker::settings")]
     settings: &'a LinterSettings,
 }
 
@@ -3148,7 +3143,7 @@ impl<'a> LintContext<'a> {
     /// Return a [`DiagnosticGuard`] for reporting a diagnostic.
     ///
     /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the context on `Drop`.
+    /// before it is added to the collection in the collector on `Drop`.
     pub(crate) fn report_diagnostic<'chk, T: Violation>(
         &'chk self,
         kind: T,
@@ -3157,26 +3152,23 @@ impl<'a> LintContext<'a> {
         DiagnosticGuard {
             context: self,
             diagnostic: Some(OldDiagnostic::new(kind, range, &self.source_file)),
-            rule: T::rule(),
         }
     }
 
     /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
     /// enabled.
     ///
-    /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the context on `Drop`.
+    /// Prefer [`DiagnosticsCollector::report_diagnostic`] in general because the conversion from an
+    /// `OldDiagnostic` to a `Rule` is somewhat expensive.
     pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
         &'chk self,
         kind: T,
         range: TextRange,
     ) -> Option<DiagnosticGuard<'chk, 'a>> {
-        let rule = T::rule();
-        if self.is_rule_enabled(rule) {
+        if self.is_rule_enabled(T::rule()) {
             Some(DiagnosticGuard {
                 context: self,
                 diagnostic: Some(OldDiagnostic::new(kind, range, &self.source_file)),
-                rule,
             })
         } else {
             None
@@ -3228,7 +3220,6 @@ pub(crate) struct DiagnosticGuard<'a, 'b> {
     ///
     /// This is always `Some` until the `Drop` (or `defuse`) call.
     diagnostic: Option<OldDiagnostic>,
-    rule: Rule,
 }
 
 impl DiagnosticGuard<'_, '_> {
@@ -3241,50 +3232,6 @@ impl DiagnosticGuard<'_, '_> {
     }
 }
 
-impl DiagnosticGuard<'_, '_> {
-    fn resolve_applicability(&self, fix: &Fix) -> Applicability {
-        self.context
-            .settings
-            .fix_safety
-            .resolve_applicability(self.rule, fix.applicability())
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic.
-    #[inline]
-    pub(crate) fn set_fix(&mut self, fix: Fix) {
-        if !self.context.rules.should_fix(self.rule) {
-            self.fix = None;
-            return;
-        }
-        let applicability = self.resolve_applicability(&fix);
-        self.fix = Some(fix.with_applicability(applicability));
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic, if the provided function returns `Ok`.
-    /// Otherwise, log the error.
-    #[inline]
-    pub(crate) fn try_set_fix(&mut self, func: impl FnOnce() -> anyhow::Result<Fix>) {
-        match func() {
-            Ok(fix) => self.set_fix(fix),
-            Err(err) => log::debug!("Failed to create fix for {}: {}", self.name(), err),
-        }
-    }
-
-    /// Set the [`Fix`] used to fix the diagnostic, if the provided function returns `Ok`.
-    /// Otherwise, log the error.
-    #[inline]
-    pub(crate) fn try_set_optional_fix(
-        &mut self,
-        func: impl FnOnce() -> anyhow::Result<Option<Fix>>,
-    ) {
-        match func() {
-            Ok(None) => {}
-            Ok(Some(fix)) => self.set_fix(fix),
-            Err(err) => log::debug!("Failed to create fix for {}: {}", self.name(), err),
-        }
-    }
-}
-
 impl std::ops::Deref for DiagnosticGuard<'_, '_> {
     type Target = OldDiagnostic;
 

crates/ruff_linter/src/checkers/noqa.rs

@@ -22,7 +22,6 @@ use crate::{Edit, Fix, Locator};
 
 use super::ast::LintContext;
 
-/// RUF100
 pub(crate) fn check_noqa(
     context: &mut LintContext,
     path: &Path,
@@ -35,34 +34,39 @@ pub(crate) fn check_noqa(
     // Identify any codes that are globally exempted (within the current file).
     let file_noqa_directives =
         FileNoqaDirectives::extract(locator, comment_ranges, &settings.external, path);
+    let exemption = FileExemption::from(&file_noqa_directives);
 
     // Extract all `noqa` directives.
     let mut noqa_directives =
         NoqaDirectives::from_commented_ranges(comment_ranges, &settings.external, path, locator);
 
-    if file_noqa_directives.is_empty() && noqa_directives.is_empty() {
-        return Vec::new();
-    }
-
-    let exemption = FileExemption::from(&file_noqa_directives);
-
     // Indices of diagnostics that were ignored by a `noqa` directive.
     let mut ignored_diagnostics = vec![];
 
     // Remove any ignored diagnostics.
     'outer: for (index, diagnostic) in context.iter().enumerate() {
         // Can't ignore syntax errors.
-        let Some(code) = diagnostic.secondary_code() else {
+        let Some(code) = diagnostic.noqa_code() else {
             continue;
         };
 
-        if *code == Rule::BlanketNOQA.noqa_code() {
+        if code == Rule::BlanketNOQA.noqa_code() {
             continue;
         }
 
-        if exemption.contains_secondary_code(code) {
-            ignored_diagnostics.push(index);
-            continue;
+        match &exemption {
+            FileExemption::All(_) => {
+                // If the file is exempted, ignore all diagnostics.
+                ignored_diagnostics.push(index);
+                continue;
+            }
+            FileExemption::Codes(codes) => {
+                // If the diagnostic is ignored by a global exemption, ignore it.
+                if codes.contains(&&code) {
+                    ignored_diagnostics.push(index);
+                    continue;
+                }
+            }
         }
 
         let noqa_offsets = diagnostic
@@ -77,21 +81,13 @@ pub(crate) fn check_noqa(
             {
                 let suppressed = match &directive_line.directive {
                     Directive::All(_) => {
-                        let Ok(rule) = Rule::from_code(code) else {
-                            debug_assert!(false, "Invalid secondary code `{code}`");
-                            continue;
-                        };
-                        directive_line.matches.push(rule);
+                        directive_line.matches.push(code);
                         ignored_diagnostics.push(index);
                         true
                     }
                     Directive::Codes(directive) => {
                         if directive.includes(code) {
-                            let Ok(rule) = Rule::from_code(code) else {
-                                debug_assert!(false, "Invalid secondary code `{code}`");
-                                continue;
-                            };
-                            directive_line.matches.push(rule);
+                            directive_line.matches.push(code);
                             ignored_diagnostics.push(index);
                             true
                         } else {
@@ -150,11 +146,11 @@ pub(crate) fn check_noqa(
 
                         if seen_codes.insert(original_code) {
                             let is_code_used = if is_file_level {
-                                context.iter().any(|diag| {
-                                    diag.secondary_code().is_some_and(|noqa| *noqa == code)
-                                })
+                                context
+                                    .iter()
+                                    .any(|diag| diag.noqa_code().is_some_and(|noqa| noqa == code))
                             } else {
-                                matches.iter().any(|match_| match_.noqa_code() == code)
+                                matches.iter().any(|match_| *match_ == code)
                             } || settings
                                 .external
                                 .iter()

crates/ruff_linter/src/codes.rs

@@ -46,12 +46,6 @@ impl PartialEq<&str> for NoqaCode {
     }
 }
 
-impl PartialEq<NoqaCode> for &str {
-    fn eq(&self, other: &NoqaCode) -> bool {
-        other.eq(self)
-    }
-}
-
 impl serde::Serialize for NoqaCode {
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
     where

crates/ruff_linter/src/cst/matchers.rs

@@ -3,8 +3,8 @@ use anyhow::{Result, bail};
 use libcst_native::{
     Arg, Attribute, Call, Comparison, CompoundStatement, Dict, Expression, FormattedString,
     FormattedStringContent, FormattedStringExpression, FunctionDef, GeneratorExp, If, Import,
-    ImportAlias, ImportFrom, ImportNames, IndentedBlock, Lambda, ListComp, Module, SmallStatement,
-    Statement, Suite, Tuple, With,
+    ImportAlias, ImportFrom, ImportNames, IndentedBlock, Lambda, ListComp, Module, Name,
+    SmallStatement, Statement, Suite, Tuple, With,
 };
 use ruff_python_codegen::Stylist;
 
@@ -104,6 +104,14 @@ pub(crate) fn match_attribute<'a, 'b>(
     }
 }
 
+pub(crate) fn match_name<'a, 'b>(expression: &'a Expression<'b>) -> Result<&'a Name<'b>> {
+    if let Expression::Name(name) = expression {
+        Ok(name)
+    } else {
+        bail!("Expected Expression::Name")
+    }
+}
+
 pub(crate) fn match_arg<'a, 'b>(call: &'a Call<'b>) -> Result<&'a Arg<'b>> {
     if let Some(arg) = call.args.first() {
         Ok(arg)

crates/ruff_linter/src/fix/edits.rs

@@ -749,16 +749,15 @@ x = 1 \
         let diag = {
             use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
             let mut iter = edits.into_iter();
-            let mut diagnostic = OldDiagnostic::new(
+            OldDiagnostic::new(
                 MissingNewlineAtEndOfFile, // The choice of rule here is arbitrary.
                 TextRange::default(),
                 &SourceFileBuilder::new("<filename>", "<code>").finish(),
-            );
-            diagnostic.fix = Some(Fix::safe_edits(
+            )
+            .with_fix(Fix::safe_edits(
                 iter.next().ok_or(anyhow!("expected edits nonempty"))?,
                 iter,
-            ));
-            diagnostic
+            ))
         };
         assert_eq!(apply_fixes([diag].iter(), &locator).code, expect);
         Ok(())