clean up some claude-isms

When hovering on an attribute name like 'value' in 'instance.value',
the minimal covering node is the Identifier, but we need the Attribute
expression to get the type. Update find_covering_node to track both
the minimal node and minimal expression, preferring the expression.

This fixes hover on attribute accesses. All hover tests now pass.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

.cargo/config.toml

@@ -8,3 +8,7 @@ benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"
 # See: https://github.com/astral-sh/ruff/issues/11503
 [target.'cfg(all(target_env="msvc", target_os = "windows"))']
 rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.'wasm32-unknown-unknown']
+# See https://docs.rs/getrandom/latest/getrandom/#webassembly-support
+rustflags = ["--cfg", 'getrandom_backend="wasm_js"']

.config/nextest.toml

@@ -1,12 +1,3 @@
-# Define serial test group for running tests sequentially.
-[test-groups]
-serial = { max-threads = 1 }
-
-# Run ty file watching tests sequentially to avoid race conditions.
-[[profile.default.overrides]]
-filter = 'binary(file_watching)'
-test-group = 'serial'
-
 [profile.ci]
 # Print out output for failing tests as soon as they fail, and also at the end
 # of the run (for easy scrollability).

.editorconfig

@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi,toml}]
+[*.{rs,py,pyi}]
 indent_size = 4
 
 [*.snap]
@@ -18,3 +18,6 @@ trim_trailing_whitespace = false
 
 [*.md]
 max_line_length = 100
+
+[*.toml]
+indent_size = 4

.github/workflows/ci.yaml

@@ -12,18 +12,13 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
-defaults:
-  run:
-    shell: bash
-
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.14"
-  NEXTEST_PROFILE: ci
+  PYTHON_VERSION: "3.13"
 
 jobs:
   determine_changes:
@@ -147,7 +142,7 @@ jobs:
         env:
           MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
         run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py-fuzzer/**' \
+          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py_fuzzer/**' \
           ; then
               echo "changed=false" >> "$GITHUB_OUTPUT"
           else
@@ -242,7 +237,7 @@ jobs:
 
   cargo-test-linux:
     name: "cargo test (linux)"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-16
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
@@ -276,9 +271,11 @@ jobs:
         # This step is just to get nice GitHub annotations on the PR diff in the files-changed tab.
         run: cargo test -p ty_python_semantic --test mdtest || true
       - name: "Run tests"
+        shell: bash
+        env:
+          NEXTEST_PROFILE: "ci"
         run: cargo insta test --all-features --unreferenced reject --test-runner nextest
-      # Dogfood ty on py-fuzzer
-      - run: uv run --project=./python/py-fuzzer cargo run -p ty check --project=./python/py-fuzzer
+
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:
@@ -302,13 +299,9 @@ jobs:
 
   cargo-test-linux-release:
     name: "cargo test (linux, release)"
-    # release builds timeout on GitHub runners, so this job is just skipped on forks in the `if` check
     runs-on: depot-ubuntu-22.04-16
     needs: determine_changes
-    if: |
-      github.repository == 'astral-sh/ruff' &&
-      !contains(github.event.pull_request.labels.*.name, 'no-test') &&
-      (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main')
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -332,16 +325,14 @@ jobs:
         with:
           enable-cache: "true"
       - name: "Run tests"
+        shell: bash
+        env:
+          NEXTEST_PROFILE: "ci"
         run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest
 
-  cargo-test-other:
-    strategy:
-      matrix:
-        platform:
-          - ${{ github.repository == 'astral-sh/ruff' && 'depot-windows-2022-16' || 'windows-latest' }}
-          - macos-latest
-    name: "cargo test (${{ matrix.platform }})"
-    runs-on: ${{ matrix.platform }}
+  cargo-test-windows:
+    name: "cargo test (windows)"
+    runs-on: depot-windows-2022-16
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
@@ -361,6 +352,11 @@ jobs:
         with:
           enable-cache: "true"
       - name: "Run tests"
+        shell: bash
+        env:
+          NEXTEST_PROFILE: "ci"
+          # Workaround for <https://github.com/nextest-rs/nextest/issues/1493>.
+          RUSTUP_WINDOWS_PATH_ADD_BIN: 1
         run: |
           cargo nextest run --all-features --profile ci
           cargo test --all-features --doc
@@ -395,9 +391,26 @@ jobs:
           cd crates/ty_wasm
           wasm-pack test --node
 
+  cargo-build-release:
+    name: "cargo build (release)"
+    runs-on: macos-latest
+    if: ${{ github.ref == 'refs/heads/main' }}
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Install mold"
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Build"
+        run: cargo build --release --locked
+
   cargo-build-msrv:
     name: "cargo build (msrv)"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-8
     needs: determine_changes
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
@@ -418,6 +431,7 @@ jobs:
       - name: "Install mold"
         uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
       - name: "Build tests"
+        shell: bash
         env:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: cargo "+${MSRV}" test --no-run --all-features
@@ -438,7 +452,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
+        uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
       - name: "Install cargo-fuzz"
         # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
         run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -473,10 +487,9 @@ jobs:
           chmod +x "${DOWNLOAD_PATH}/ruff"
 
           (
-            uv run \
+            uvx \
             --python="${PYTHON_VERSION}" \
-            --project=./python/py-fuzzer \
-            --locked \
+            --from=./python/py-fuzzer \
             fuzz \
             --test-executable="${DOWNLOAD_PATH}/ruff" \
             --bin=ruff \
@@ -494,7 +507,6 @@ jobs:
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       # Run all code generation scripts, and verify that the current output is
@@ -509,15 +521,10 @@ jobs:
           ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
           ./scripts/add_rule.py --name FirstRule --prefix TST --code 001 --linter test
       - run: cargo check
-      # Lint/format/type-check py-fuzzer
-      # (dogfooding with ty is done in a separate job)
-      - run: uv run --directory=./python/py-fuzzer mypy
-      - run: uv run --directory=./python/py-fuzzer ruff format --check
-      - run: uv run --directory=./python/py-fuzzer ruff check
 
   ecosystem:
     name: "ecosystem"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-latest-8' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-latest-8
     needs:
       - cargo-test-linux
       - determine_changes
@@ -529,11 +536,9 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
-          # TODO: figure out why `ruff-ecosystem` crashes on Python 3.14
-          python-version: "3.13"
-          activate-environment: true
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         name: Download comparison Ruff binary
@@ -552,7 +557,7 @@ jobs:
 
       - name: Install ruff-ecosystem
         run: |
-          uv pip install ./python/ruff-ecosystem
+          pip install ./python/ruff-ecosystem
 
       - name: Run `ruff check` stable ecosystem check
         if: ${{ needs.determine_changes.outputs.linter == 'true' }}
@@ -644,13 +649,13 @@ jobs:
 
   fuzz-ty:
     name: "Fuzz for new ty panics"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-16
     needs:
       - cargo-test-linux
       - determine_changes
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
-    timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 5 || 20 }}
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -678,16 +683,15 @@ jobs:
           chmod +x "${PWD}/ty" "${NEW_TY}/ty"
 
           (
-            uv run \
+            uvx \
             --python="${PYTHON_VERSION}" \
-            --project=./python/py-fuzzer \
-            --locked \
+            --from=./python/py-fuzzer \
             fuzz \
             --test-executable="${NEW_TY}/ty" \
             --baseline-executable="${PWD}/ty" \
             --only-new-bugs \
             --bin=ty \
-            0-1000
+            0-500
           )
 
   cargo-shear:
@@ -699,13 +703,13 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
+      - uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 
   ty-completion-evaluation:
     name: "ty completion evaluation"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-16
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main' }}
     steps:
@@ -717,7 +721,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Run ty completion evaluation"
-        run: cargo run --release --package ty_completion_eval -- all --threshold 0.4 --tasks /tmp/completion-evaluation-tasks.csv
+        run: cargo run --release --package ty_completion_eval -- all --threshold 0.1 --tasks /tmp/completion-evaluation-tasks.csv
       - name: "Ensure there are no changes"
         run: diff ./crates/ty_completion_eval/completion-evaluation-tasks.csv /tmp/completion-evaluation-tasks.csv
 
@@ -751,7 +755,7 @@ jobs:
 
   pre-commit:
     name: "pre-commit"
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-16
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -788,6 +792,9 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: "3.13"
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -798,15 +805,12 @@ jobs:
         run: rustup show
       - name: Install uv
         uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-        with:
-          python-version: 3.13
-          activate-environment: true
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: uv pip install -r docs/requirements-insiders.txt
+        run: uv pip install -r docs/requirements-insiders.txt --system
       - name: "Install dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: uv pip install -r docs/requirements.txt
+        run: uv pip install -r docs/requirements.txt --system
       - name: "Update README File"
         run: python scripts/transform_readme.py --target mkdocs
       - name: "Generate docs"
@@ -925,12 +929,8 @@ jobs:
     runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
-      github.repository == 'astral-sh/ruff' &&
-      (
-        github.ref == 'refs/heads/main' ||
-        needs.determine_changes.outputs.formatter == 'true' ||
-        needs.determine_changes.outputs.linter == 'true'
-      )
+      github.ref == 'refs/heads/main' ||
+      (needs.determine_changes.outputs.formatter == 'true' || needs.determine_changes.outputs.linter == 'true')
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
@@ -953,7 +953,7 @@ jobs:
         run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
         with:
           mode: instrumentation
           run: cargo codspeed run
@@ -964,11 +964,8 @@ jobs:
     runs-on: ubuntu-24.04
     needs: determine_changes
     if: |
-      github.repository == 'astral-sh/ruff' &&
-      (
-        github.ref == 'refs/heads/main' ||
-        needs.determine_changes.outputs.ty == 'true'
-      )
+      github.ref == 'refs/heads/main' ||
+      needs.determine_changes.outputs.ty == 'true'
     timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
@@ -991,23 +988,19 @@ jobs:
         run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench ty
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
         with:
           mode: instrumentation
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}
 
   benchmarks-walltime:
-    name: "benchmarks walltime (${{ matrix.benchmarks }})"
     runs-on: codspeed-macro
     needs: determine_changes
     if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
     timeout-minutes: 20
-    strategy:
-      matrix:
-        benchmarks:
-          - "medium|multithreaded"
-          - "small|large"
+    env:
+      TY_LOG: ruff_benchmark=debug
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -1029,7 +1022,7 @@ jobs:
         run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
         env:
           # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
           # appear to provide much useful insight for our walltime benchmarks right now
@@ -1037,5 +1030,5 @@ jobs:
           CODSPEED_PERF_ENABLED: false
         with:
           mode: walltime
-          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
+          run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/daily_fuzz.yaml

@@ -48,10 +48,9 @@ jobs:
         run: |
           # shellcheck disable=SC2046
           (
-            uv run \
-            --python=3.14 \
-            --project=./python/py-fuzzer \
-            --locked \
+            uvx \
+            --python=3.12 \
+            --from=./python/py-fuzzer \
             fuzz \
             --test-executable=target/debug/ruff \
             --bin=ruff \

.github/workflows/mypy_primer.yaml

@@ -19,10 +19,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
-defaults:
-  run:
-    shell: bash
-
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
@@ -33,7 +29,7 @@ env:
 jobs:
   mypy_primer:
     name: Run mypy_primer
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -53,6 +49,7 @@ jobs:
         run: rustup show
 
       - name: Run mypy_primer
+        shell: bash
         env:
           PRIMER_SELECTOR: crates/ty_python_semantic/resources/primer/good.txt
           DIFF_FILE: mypy_primer.diff
@@ -75,7 +72,7 @@ jobs:
 
   memory_usage:
     name: Run memory statistics
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -95,6 +92,7 @@ jobs:
         run: rustup show
 
       - name: Run mypy_primer
+        shell: bash
         env:
           TY_MAX_PARALLELISM: 1 # for deterministic memory numbers
           TY_MEMORY_REPORT: mypy_primer

.github/workflows/sync_typeshed.yaml

@@ -16,10 +16,8 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Attempts to update any snapshots that might have changed
-#       (this sub-step is allowed to fail)
-#    d. Commits the changes and pushes them to the same upstream branch
-#    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
+#    c. Commits the changes and pushes them to the same upstream branch
+#    d. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
 
 on:
@@ -28,18 +26,8 @@ on:
     # Run on the 1st and the 15th of every month:
     - cron: "0 0 1,15 * *"
 
-defaults:
-  run:
-    shell: bash
-
 env:
-  # Don't set this flag globally for the workflow: it does strange things
-  # to the snapshots in the `cargo insta test --accept` step in the MacOS job.
-  #
-  # FORCE_COLOR: 1
-
-  CARGO_TERM_COLOR: always
-  NEXTEST_PROFILE: "ci"
+  FORCE_COLOR: 1
   GH_TOKEN: ${{ github.token }}
 
   # The name of the upstream branch that the first worker creates,
@@ -98,8 +86,6 @@ jobs:
           git commit -m "Sync typeshed. Source commit: https://github.com/python/typeshed/commit/$(git -C ../typeshed rev-parse HEAD)" --allow-empty
       - name: Sync Linux docstrings
         if: ${{ success() }}
-        env:
-          FORCE_COLOR: 1
         run: |
           cd ruff
           ./scripts/codemod_docstrings.sh
@@ -138,8 +124,7 @@ jobs:
           git config --global user.email '<>'
       - name: Sync Windows docstrings
         id: docstrings
-        env:
-          FORCE_COLOR: 1
+        shell: bash
         run: ./scripts/codemod_docstrings.sh
       - name: Commit the changes
         if: ${{ steps.docstrings.outcome == 'success' }}
@@ -176,63 +161,26 @@ jobs:
           git config --global user.name typeshedbot
           git config --global user.email '<>'
       - name: Sync macOS docstrings
+        run: ./scripts/codemod_docstrings.sh
+      - name: Commit and push the changes
         if: ${{ success() }}
-        env:
-          FORCE_COLOR: 1
         run: |
-          ./scripts/codemod_docstrings.sh
           git commit -am "Sync macOS docstrings" --allow-empty
-      - name: Format the changes
-        if: ${{ success() }}
-        env:
-          FORCE_COLOR: 1
-        run: |
+
           # Here we just reformat the codemodded stubs so that they are
           # consistent with the other typeshed stubs around them.
           # Typeshed formats code using black in their CI, so we just invoke
           # black on the stubs the same way that typeshed does.
           uvx black "${VENDORED_TYPESHED}/stdlib" --config "${VENDORED_TYPESHED}/pyproject.toml" || true
           git commit -am "Format codemodded docstrings" --allow-empty
-      - name: Remove typeshed pyproject.toml file
-        if: ${{ success() }}
-        run: |
+
           rm "${VENDORED_TYPESHED}/pyproject.toml"
           git commit -am "Remove pyproject.toml file"
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - name: "Install Rust toolchain"
-        if: ${{ success() }}
-        run: rustup show
-      - name: "Install mold"
-        if: ${{ success() }}
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - name: "Install cargo nextest"
-        if: ${{ success() }}
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
-        with:
-          tool: cargo-nextest
-      - name: "Install cargo insta"
-        if: ${{ success() }}
-        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
-        with:
-          tool: cargo-insta
-      - name: Update snapshots
-        if: ${{ success() }}
-        run: |
-          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
-          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
-          #
-          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
-          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
-          # We don't care about other tests failing here, we just want snapshots updated where possible,
-          # so we use `|| true` here to ignore the exit code.
-          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
-      - name: Commit snapshot changes
-        if: ${{ success() }}
-        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
-      - name: Push changes upstream and create a PR
-        if: ${{ success() }}
-        run: |
+
           git push
+      - name: Create a PR
+        if: ${{ success() }}
+        run: |
           gh pr list --repo "${GITHUB_REPOSITORY}" --head "${UPSTREAM_BRANCH}" --json id --jq length | grep 1 && exit 0 # exit if there is existing pr
           gh pr create --title "[ty] Sync vendored typeshed stubs" --body "Close and reopen this PR to trigger CI" --label "ty"
 

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

@@ -22,7 +22,7 @@ env:
 jobs:
   ty-ecosystem-analyzer:
     name: Compute diagnostic diff
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     if: contains(github.event.label.name, 'ecosystem-analyzer')
     steps:
@@ -64,12 +64,12 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"
 
           ecosystem-analyzer \
             --repository ruff \
             diff \
-            --profile=profiling \
+            --profile=release \
             --projects-old ruff/projects_old.txt \
             --projects-new ruff/projects_new.txt \
             --old old_commit \

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

@@ -19,7 +19,7 @@ env:
 jobs:
   ty-ecosystem-report:
     name: Create ecosystem report
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -49,13 +49,13 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"
 
           ecosystem-analyzer \
             --verbose \
             --repository ruff \
             analyze \
-            --profile=profiling \
+            --profile=release \
             --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
             --output ecosystem-diagnostics.json
 

.github/workflows/typing_conformance.yaml

@@ -29,7 +29,7 @@ env:
 jobs:
   typing_conformance:
     name: Compute diagnostic diff
-    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
+    runs-on: depot-ubuntu-22.04-32
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

.pre-commit-config.yaml

@@ -35,7 +35,6 @@ repos:
     rev: 0.7.22
     hooks:
       - id: mdformat
-        language: python # means renovate will also update `additional_dependencies`
         additional_dependencies:
           - mdformat-mkdocs==4.0.0
           - mdformat-footnote==0.1.1
@@ -59,7 +58,6 @@ repos:
     rev: 1.19.1
     hooks:
       - id: blacken-docs
-        language: python # means renovate will also update `additional_dependencies`
         args: ["--pyi", "--line-length", "130"]
         files: '^crates/.*/resources/mdtest/.*\.md'
         exclude: |

CHANGELOG.md

@@ -1,63 +1,5 @@
 # Changelog
 
-## 0.14.1
-
-Released on 2025-10-16.
-
-### Preview features
-
-- [formatter] Remove parentheses around multiple exception types on Python 3.14+ ([#20768](https://github.com/astral-sh/ruff/pull/20768))
-- \[`flake8-bugbear`\] Omit annotation in preview fix for `B006` ([#20877](https://github.com/astral-sh/ruff/pull/20877))
-- \[`flake8-logging-format`\] Avoid dropping implicitly concatenated pieces in the `G004` fix ([#20793](https://github.com/astral-sh/ruff/pull/20793))
-- \[`pydoclint`\] Implement `docstring-extraneous-parameter` (`DOC102`) ([#20376](https://github.com/astral-sh/ruff/pull/20376))
-- \[`pyupgrade`\] Extend `UP019` to detect `typing_extensions.Text` (`UP019`) ([#20825](https://github.com/astral-sh/ruff/pull/20825))
-- \[`pyupgrade`\] Fix false negative for `TypeVar` with default argument in `non-pep695-generic-class` (`UP046`) ([#20660](https://github.com/astral-sh/ruff/pull/20660))
-
-### Bug fixes
-
-- Fix false negatives in `Truthiness::from_expr` for lambdas, generators, and f-strings ([#20704](https://github.com/astral-sh/ruff/pull/20704))
-- Fix syntax error false positives for escapes and quotes in f-strings ([#20867](https://github.com/astral-sh/ruff/pull/20867))
-- Fix syntax error false positives on parenthesized context managers ([#20846](https://github.com/astral-sh/ruff/pull/20846))
-- \[`fastapi`\] Fix false positives for path parameters that FastAPI doesn't recognize (`FAST003`) ([#20687](https://github.com/astral-sh/ruff/pull/20687))
-- \[`flake8-pyi`\] Fix operator precedence by adding parentheses when needed (`PYI061`) ([#20508](https://github.com/astral-sh/ruff/pull/20508))
-- \[`ruff`\] Suppress diagnostic for f-string interpolations with debug text (`RUF010`) ([#20525](https://github.com/astral-sh/ruff/pull/20525))
-
-### Rule changes
-
-- \[`airflow`\] Add warning to `airflow.datasets.DatasetEvent` usage (`AIR301`) ([#20551](https://github.com/astral-sh/ruff/pull/20551))
-- \[`flake8-bugbear`\] Mark `B905` and `B912` fixes as unsafe ([#20695](https://github.com/astral-sh/ruff/pull/20695))
-- Use `DiagnosticTag` for more rules - changes display in editors ([#20758](https://github.com/astral-sh/ruff/pull/20758),[#20734](https://github.com/astral-sh/ruff/pull/20734))
-
-### Documentation
-
-- Update Python compatibility from 3.13 to 3.14 in README.md ([#20852](https://github.com/astral-sh/ruff/pull/20852))
-- Update `lint.flake8-type-checking.quoted-annotations` docs ([#20765](https://github.com/astral-sh/ruff/pull/20765))
-- Update setup instructions for Zed 0.208.0+ ([#20902](https://github.com/astral-sh/ruff/pull/20902))
-- \[`flake8-datetimez`\] Clarify docs for several rules ([#20778](https://github.com/astral-sh/ruff/pull/20778))
-- Fix typo in `RUF015` description ([#20873](https://github.com/astral-sh/ruff/pull/20873))
-
-### Other changes
-
-- Reduce binary size ([#20863](https://github.com/astral-sh/ruff/pull/20863))
-- Improved error recovery for unclosed strings (including f- and t-strings) ([#20848](https://github.com/astral-sh/ruff/pull/20848))
-
-### Contributors
-
-- [@ntBre](https://github.com/ntBre)
-- [@Paillat-dev](https://github.com/Paillat-dev)
-- [@terror](https://github.com/terror)
-- [@pieterh-oai](https://github.com/pieterh-oai)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@TaKO8Ki](https://github.com/TaKO8Ki)
-- [@ageorgou](https://github.com/ageorgou)
-- [@danparizher](https://github.com/danparizher)
-- [@mgaitan](https://github.com/mgaitan)
-- [@augustelalande](https://github.com/augustelalande)
-- [@dylwil3](https://github.com/dylwil3)
-- [@Lee-W](https://github.com/Lee-W)
-- [@injust](https://github.com/injust)
-- [@CarrotManMatt](https://github.com/CarrotManMatt)
-
 ## 0.14.0
 
 Released on 2025-10-07.

Cargo.lock

@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -65,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-lossy"
@@ -214,6 +214,15 @@ 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"
@@ -234,26 +243,6 @@ dependencies = [
  "virtue",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.9.4",
- "cexpr",
- "clang-sys",
- "itertools 0.10.5",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -327,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+checksum = "e1de8bc0aa9e9385ceb3bf0c152e3a9b9544f6c4a912c8ae504e80c1f0368603"
 dependencies = [
  "serde_core",
 ]
@@ -361,15 +350,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.3"
@@ -420,22 +400,11 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "clap"
-version = "4.5.49"
+version = "4.5.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -443,9 +412,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.49"
+version = "4.5.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -486,9 +455,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.49"
+version = "4.5.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -517,17 +486,16 @@ dependencies = [
 
 [[package]]
 name = "codspeed"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f62ea8934802f8b374bf691eea524c3aa444d7014f604dd4182a3667b69510"
+checksum = "35584c5fcba8059780748866387fb97c5a203bcfc563fc3d0790af406727a117"
 dependencies = [
  "anyhow",
- "bindgen",
- "cc",
+ "bincode 1.3.3",
  "colored 2.2.0",
  "glob",
  "libc",
- "nix 0.30.1",
+ "nix 0.29.0",
  "serde",
  "serde_json",
  "statrs",
@@ -536,22 +504,20 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87efbc015fc0ff1b2001cd87df01c442824de677e01a77230bf091534687abb"
+checksum = "78f6c1c6bed5fd84d319e8b0889da051daa361c79b7709c9394dfe1a882bba67"
 dependencies = [
- "clap",
  "codspeed",
  "codspeed-criterion-compat-walltime",
  "colored 2.2.0",
- "regex",
 ]
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae5713ace440123bb4f1f78dd068d46872cb8548bfe61f752e7b2ad2c06d7f00"
+checksum = "c989289ce6b1cbde72ed560496cb8fbf5aa14d5ef5666f168e7f87751038352e"
 dependencies = [
  "anes",
  "cast",
@@ -574,22 +540,20 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b4214b974f8f5206497153e89db90274e623f06b00bf4b9143eeb7735d975d"
+checksum = "adf64eda57508448d59efd940bad62ede7c50b0d451a150b8d6a0eca642792a6"
 dependencies = [
- "clap",
  "codspeed",
  "codspeed-divan-compat-macros",
  "codspeed-divan-compat-walltime",
- "regex",
 ]
 
 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53f34a16cb70ce4fd9ad57e1db016f0718e434f34179ca652006443b9a39967"
+checksum = "058167258e819b16a4ba601fdfe270349ef191154758dbce122c62a698f70ba8"
 dependencies = [
  "divan-macros",
  "itertools 0.14.0",
@@ -601,9 +565,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a5099050c8948dce488b8eaa2e68dc5cf571cb8f9fce99aaaecbdddb940bcd"
+checksum = "48f9866ee3a4ef9d2868823ea5811886763af244f2df584ca247f49281c43f1f"
 dependencies = [
  "cfg-if",
  "clap",
@@ -633,7 +597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -642,7 +606,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1007,7 +971,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1093,7 +1057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -1262,20 +1226,20 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.4"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasip2",
+ "wasi 0.14.7+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
@@ -1287,9 +1251,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "globset"
-version = "0.4.17"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab69130804d941f8075cfd713bf8848a2c3b3f201a9457a11e6f87e1ab62305"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1563,7 +1527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "serde",
  "serde_core",
 ]
@@ -1690,7 +1654,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1754,7 +1718,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1789,7 +1753,7 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "libc",
 ]
 
@@ -1837,15 +1801,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
 [[package]]
 name = "libcst"
-version = "1.8.5"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d56bcd52d9b5e5f43e7fba20eb1f423ccb18c84cdf1cb506b8c1b95776b0b49"
+checksum = "052ef5d9fc958a51aeebdf3713573b36c6fd6eed0bf0e60e204d2c0f8cf19b9f"
 dependencies = [
  "annotate-snippets",
  "libcst_derive",
@@ -1858,24 +1822,14 @@ dependencies = [
 
 [[package]]
 name = "libcst_derive"
-version = "1.8.5"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcf5a725c4db703660124fe0edb98285f1605d0b87b7ee8684b699764a4f01a"
+checksum = "a91a751afee92cbdd59d4bc6754c7672712eec2d30a308f23de4e3287b2929cb"
 dependencies = [
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link 0.2.0",
-]
-
 [[package]]
 name = "libmimalloc-sys"
 version = "0.1.44"
@@ -2017,9 +1971,9 @@ checksum = "2f926ade0c4e170215ae43342bf13b9310a437609c81f29f86c5df6657582ef9"
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memoffset"
@@ -2072,7 +2026,7 @@ checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "windows-sys 0.59.0",
 ]
 
@@ -2528,16 +2482,6 @@ dependencies = [
  "yansi",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.4.0"
@@ -2569,9 +2513,9 @@ dependencies = [
 
 [[package]]
 name = "pyproject-toml"
-version = "0.13.7"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d755483ad14b49e76713b52285235461a5b4f73f17612353e11a5de36a5fd2"
+checksum = "ec768e063102b426e8962989758115e8659485124de9207bc365fab524125d65"
 dependencies = [
  "indexmap",
  "pep440_rs",
@@ -2627,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
@@ -2724,7 +2668,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -2767,31 +2711,11 @@ dependencies = [
  "thiserror 2.0.16",
 ]
 
-[[package]]
-name = "ref-cast"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "regex"
-version = "1.11.3"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2801,9 +2725,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2835,12 +2759,12 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.1"
+version = "0.14.0"
 dependencies = [
  "anyhow",
  "argfile",
  "assert_fs",
- "bincode",
+ "bincode 2.0.1",
  "bitflags 2.9.4",
  "cachedir",
  "clap",
@@ -3092,7 +3016,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.1"
+version = "0.14.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3217,7 +3141,6 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "serde_json",
  "thiserror 2.0.16",
 ]
 
@@ -3447,11 +3370,11 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.1"
+version = "0.14.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "js-sys",
  "log",
  "ruff_formatter",
@@ -3505,7 +3428,6 @@ dependencies = [
  "rustc-hash",
  "schemars",
  "serde",
- "serde_json",
  "shellexpand",
  "strum",
  "tempfile",
@@ -3545,7 +3467,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -3562,8 +3484,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ef9f9329be6923acd050c8dddd172e3bc93e8051#ef9f9329be6923acd050c8dddd172e3bc93e8051"
+version = "0.23.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3586,13 +3508,13 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ef9f9329be6923acd050c8dddd172e3bc93e8051#ef9f9329be6923acd050c8dddd172e3bc93e8051"
+version = "0.23.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
 
 [[package]]
 name = "salsa-macros"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ef9f9329be6923acd050c8dddd172e3bc93e8051#ef9f9329be6923acd050c8dddd172e3bc93e8051"
+version = "0.23.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3611,12 +3533,11 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
  "dyn-clone",
- "ref-cast",
  "schemars_derive",
  "serde",
  "serde_json",
@@ -3624,9 +3545,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "1.0.4"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3648,9 +3569,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -3669,18 +3590,18 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.228"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3818,9 +3739,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "snapbox"
-version = "0.6.22"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805d09a74586d9b17061e5be6ee5f8cc37e5982c349948114ffc5f68093fe5ec"
+checksum = "96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3833,7 +3754,7 @@ dependencies = [
  "similar",
  "snapbox-macros",
  "wait-timeout",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3938,10 +3859,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -4407,7 +4328,6 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "serde_json",
  "thiserror 2.0.16",
  "toml",
  "tracing",
@@ -4455,7 +4375,6 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "serde_json",
  "smallvec",
  "static_assertions",
  "strsim",
@@ -4524,7 +4443,6 @@ dependencies = [
  "colored 3.0.0",
  "insta",
  "memchr",
- "path-slash",
  "regex",
  "ruff_db",
  "ruff_index",
@@ -4542,6 +4460,7 @@ dependencies = [
  "thiserror 2.0.16",
  "toml",
  "tracing",
+ "ty_ide",
  "ty_python_semantic",
  "ty_static",
  "ty_vendored",
@@ -4564,7 +4483,7 @@ version = "0.0.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "js-sys",
  "log",
  "ruff_db",
@@ -4757,7 +4676,7 @@ version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "js-sys",
  "rand 0.9.2",
  "uuid-macro-internal",
@@ -4869,6 +4788,15 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
 [[package]]
 name = "wasip2"
 version = "1.0.1+wasi-0.2.4"
@@ -5020,7 +4948,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]

Cargo.toml

@@ -71,8 +71,8 @@ clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
 csv = { version = "1.3.1" }
-divan = { package = "codspeed-divan-compat", version = "4.0.4" }
-codspeed-criterion-compat = { version = "4.0.4", default-features = false }
+divan = { package = "codspeed-divan-compat", version = "3.0.2" }
+codspeed-criterion-compat = { version = "3.0.2", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
@@ -146,13 +146,13 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "ef9f9329be6923acd050c8dddd172e3bc93e8051", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "29ab321b45d00daa4315fa2a06f7207759a8c87e", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",
     "inventory",
 ] }
-schemars = { version = "1.0.4" }
+schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }
 serde-wasm-bindgen = { version = "0.6.4" }
@@ -268,7 +268,12 @@ large_stack_arrays = "allow"
 
 
 [profile.release]
-lto = "fat"
+# Note that we set these explicitly, and these values
+# were chosen based on a trade-off between compile times
+# and runtime performance[1].
+#
+# [1]: https://github.com/astral-sh/ruff/pull/9031
+lto = "thin"
 codegen-units = 16
 
 # Some crates don't change as much but benefit more from
@@ -278,8 +283,6 @@ codegen-units = 16
 codegen-units = 1
 [profile.release.package.ruff_python_ast]
 codegen-units = 1
-[profile.release.package.salsa]
-codegen-units = 1
 
 [profile.dev.package.insta]
 opt-level = 3
@@ -295,30 +298,11 @@ opt-level = 3
 [profile.dev.package.ruff_python_parser]
 opt-level = 1
 
-# This profile is meant to mimic the `release` profile as closely as
-# possible, but using settings that are more beneficial for iterative
-# development. That is, the `release` profile is intended for actually
-# building the release, where as `profiling` is meant for building ty/ruff
-# for running benchmarks.
-#
-# The main differences here are to avoid stripping debug information
-# and disabling fat lto. This does result in a mismatch between our release
-# configuration and our benchmarking configuration, which is unfortunate.
-# But compile times with `lto = fat` are completely untenable.
-#
-# This setup does risk that we are measuring something in benchmarks
-# that we aren't shipping, but in order to make those two the same, we'd
-# either need to make compile times way worse for development, or take
-# a hit to binary size and a slight hit to runtime performance in our
-# release builds.
-#
 # Use the `--profile profiling` flag to show symbols in release mode.
 # e.g. `cargo build --profile profiling`
 [profile.profiling]
 inherits = "release"
-strip = false
-debug = "full"
-lto = false
+debug = 1
 
 # The profile that 'cargo dist' will build with.
 [profile.dist]

README.md

@@ -28,7 +28,7 @@ An extremely fast Python linter and code formatter, written in Rust.
 - ⚡️ 10-100x faster than existing linters (like Flake8) and formatters (like Black)
 - 🐍 Installable via `pip`
 - 🛠️ `pyproject.toml` support
-- 🤝 Python 3.14 compatibility
+- 🤝 Python 3.13 compatibility
 - ⚖️ Drop-in parity with [Flake8](https://docs.astral.sh/ruff/faq/#how-does-ruffs-linter-compare-to-flake8), isort, and [Black](https://docs.astral.sh/ruff/faq/#how-does-ruffs-formatter-compare-to-black)
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
@@ -89,7 +89,8 @@ creator of [isort](https://github.com/PyCQA/isort):
 > Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe
 > it was working till I intentionally introduced some errors.
 
-[**Tim Abbott**](https://github.com/zulip/zulip/pull/23431#issuecomment-1302557034), lead developer of [Zulip](https://github.com/zulip/zulip) (also [here](https://github.com/astral-sh/ruff/issues/465#issuecomment-1317400028)):
+[**Tim Abbott**](https://github.com/astral-sh/ruff/issues/465#issuecomment-1317400028), lead
+developer of [Zulip](https://github.com/zulip/zulip):
 
 > This is just ridiculously fast... `ruff` is amazing.
 
@@ -147,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.14.1/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.1/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.0/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.0/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -181,7 +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.14.1
+  rev: v0.14.0
   hooks:
     # Run the linter.
     - id: ruff-check

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.14.1"
+version = "0.14.0"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/src/commands/rule.rs

@@ -7,7 +7,6 @@ use serde::{Serialize, Serializer};
 use strum::IntoEnumIterator;
 
 use ruff_linter::FixAvailability;
-use ruff_linter::codes::RuleGroup;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 
 use crate::args::HelpFormat;
@@ -20,11 +19,9 @@ struct Explanation<'a> {
     summary: &'a str,
     message_formats: &'a [&'a str],
     fix: String,
-    fix_availability: FixAvailability,
     #[expect(clippy::struct_field_names)]
     explanation: Option<&'a str>,
     preview: bool,
-    status: RuleGroup,
 }
 
 impl<'a> Explanation<'a> {
@@ -39,10 +36,8 @@ impl<'a> Explanation<'a> {
             summary: rule.message_formats()[0],
             message_formats: rule.message_formats(),
             fix,
-            fix_availability: rule.fixable(),
             explanation: rule.explanation(),
             preview: rule.is_preview(),
-            status: rule.group(),
         }
     }
 }

crates/ruff/src/diagnostics.rs

@@ -13,6 +13,7 @@ use log::{debug, warn};
 use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
+use ruff_linter::message::create_syntax_error_diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::settings::types::UnsafeFixes;
@@ -102,7 +103,11 @@ impl Diagnostics {
                 let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
                 let dummy = SourceFileBuilder::new(name, "").finish();
                 Self::new(
-                    vec![Diagnostic::invalid_syntax(dummy, err, TextRange::default())],
+                    vec![create_syntax_error_diagnostic(
+                        dummy,
+                        err,
+                        TextRange::default(),
+                    )],
                     FxHashMap::default(),
                 )
             }

crates/ruff/tests/cli/main.rs

@@ -15,7 +15,6 @@ use std::{
 };
 use tempfile::TempDir;
 
-mod format;
 mod lint;
 
 const BIN_NAME: &str = "ruff";
@@ -58,16 +57,6 @@ impl CliTest {
         Self::with_settings(|_, settings| settings)
     }
 
-    pub(crate) fn with_files<'a>(
-        files: impl IntoIterator<Item = (&'a str, &'a str)>,
-    ) -> anyhow::Result<Self> {
-        let case = Self::new()?;
-        for file in files {
-            case.write_file(file.0, file.1)?;
-        }
-        Ok(case)
-    }
-
     pub(crate) fn with_settings(
         setup_settings: impl FnOnce(&Path, insta::Settings) -> insta::Settings,
     ) -> Result<Self> {
@@ -185,10 +174,4 @@ impl CliTest {
 
         command
     }
-
-    pub(crate) fn format_command(&self) -> Command {
-        let mut command = self.command();
-        command.args(["format", "--no-cache"]);
-        command
-    }
 }

crates/ruff/tests/integration_test.rs

@@ -951,16 +951,6 @@ fn rule_f401() {
     assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401"]));
 }
 
-#[test]
-fn rule_f401_output_json() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401", "--output-format", "json"]));
-}
-
-#[test]
-fn rule_f401_output_text() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "F401", "--output-format", "text"]));
-}
-
 #[test]
 fn rule_invalid_rule_name() {
     assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @r"
@@ -975,34 +965,6 @@ fn rule_invalid_rule_name() {
     ");
 }
 
-#[test]
-fn rule_invalid_rule_name_output_json() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'RUF404' for '[RULE]'
-
-    For more information, try '--help'.
-    ");
-}
-
-#[test]
-fn rule_invalid_rule_name_output_text() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'RUF404' for '[RULE]'
-
-    For more information, try '--help'.
-    ");
-}
-
 #[test]
 fn show_statistics() {
     let mut cmd = RuffCheck::default()

crates/ruff/tests/snapshots/format__output_format_azure.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_concise.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_full.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_github.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_gitlab.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_grouped.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:
@@ -7,7 +7,6 @@ info:
     - "--no-cache"
     - "--output-format"
     - grouped
-    - "--preview"
     - "--check"
     - input.py
 ---

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

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_json.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_junit.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_pylint.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:
@@ -7,7 +7,6 @@ info:
     - "--no-cache"
     - "--output-format"
     - pylint
-    - "--preview"
     - "--check"
     - input.py
 ---

crates/ruff/tests/snapshots/format__output_format_rdjson.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/format__output_format_sarif.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/cli/format.rs
+source: crates/ruff/tests/format.rs
 info:
   program: ruff
   args:

crates/ruff/tests/snapshots/integration_test__rule_f401_output_json.snap

@@ -1,30 +0,0 @@
----
-source: crates/ruff/tests/integration_test.rs
-info:
-  program: ruff
-  args:
-    - rule
-    - F401
-    - "--output-format"
-    - json
----
-success: true
-exit_code: 0
------ stdout -----
-{
-  "name": "unused-import",
-  "code": "F401",
-  "linter": "Pyflakes",
-  "summary": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability",
-  "message_formats": [
-    "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability",
-    "`{name}` imported but unused; consider removing, adding to `__all__`, or using a redundant alias",
-    "`{name}` imported but unused"
-  ],
-  "fix": "Fix is sometimes available.",
-  "fix_availability": "Sometimes",
-  "explanation": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n",
-  "preview": false,
-  "status": "Stable"
-}
------ stderr -----

crates/ruff/tests/snapshots/integration_test__rule_f401_output_text.snap

@@ -1,140 +0,0 @@
----
-source: crates/ruff/tests/integration_test.rs
-info:
-  program: ruff
-  args:
-    - rule
-    - F401
-    - "--output-format"
-    - text
----
-success: true
-exit_code: 0
------ stdout -----
-# unused-import (F401)
-
-Derived from the **Pyflakes** linter.
-
-Fix is sometimes available.
-
-## What it does
-Checks for unused imports.
-
-## Why is this bad?
-Unused imports add a performance overhead at runtime, and risk creating
-import cycles. They also increase the cognitive load of reading the code.
-
-If an import statement is used to check for the availability or existence
-of a module, consider using `importlib.util.find_spec` instead.
-
-If an import statement is used to re-export a symbol as part of a module's
-public interface, consider using a "redundant" import alias, which
-instructs Ruff (and other tools) to respect the re-export, and avoid
-marking it as unused, as in:
-
-```python
-from module import member as member
-```
-
-Alternatively, you can use `__all__` to declare a symbol as part of the module's
-interface, as in:
-
-```python
-# __init__.py
-import some_module
-
-__all__ = ["some_module"]
-```
-
-## Preview
-When [preview] is enabled (and certain simplifying assumptions
-are met), we analyze all import statements for a given module
-when determining whether an import is used, rather than simply
-the last of these statements. This can result in both different and
-more import statements being marked as unused.
-
-For example, if a module consists of
-
-```python
-import a
-import a.b
-```
-
-then both statements are marked as unused under [preview], whereas
-only the second is marked as unused under stable behavior.
-
-As another example, if a module consists of
-
-```python
-import a.b
-import a
-
-a.b.foo()
-```
-
-then a diagnostic will only be emitted for the first line under [preview],
-whereas a diagnostic would only be emitted for the second line under
-stable behavior.
-
-Note that this behavior is somewhat subjective and is designed
-to conform to the developer's intuition rather than Python's actual
-execution. To wit, the statement `import a.b` automatically executes
-`import a`, so in some sense `import a` is _always_ redundant
-in the presence of `import a.b`.
-
-
-## Fix safety
-
-Fixes to remove unused imports are safe, except in `__init__.py` files.
-
-Applying fixes to `__init__.py` files is currently in preview. The fix offered depends on the
-type of the unused import. Ruff will suggest a safe fix to export first-party imports with
-either a redundant alias or, if already present in the file, an `__all__` entry. If multiple
-`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix
-to remove third-party and standard library imports -- the fix is unsafe because the module's
-interface changes.
-
-See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
-for more details on how Ruff
-determines whether an import is first or third-party.
-
-## Example
-
-```python
-import numpy as np  # unused import
-
-
-def area(radius):
-    return 3.14 * radius**2
-```
-
-Use instead:
-
-```python
-def area(radius):
-    return 3.14 * radius**2
-```
-
-To check the availability of a module, use `importlib.util.find_spec`:
-
-```python
-from importlib.util import find_spec
-
-if find_spec("numpy") is not None:
-    print("numpy is installed")
-else:
-    print("numpy is not installed")
-```
-
-## Options
-- `lint.ignore-init-module-imports`
-- `lint.pyflakes.allowed-unused-imports`
-
-## References
-- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
-- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
-- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
-
-[preview]: https://docs.astral.sh/ruff/preview/
-
------ stderr -----

crates/ruff_benchmark/benches/ty.rs

@@ -599,7 +599,7 @@ impl<'a> ProjectBenchmark<'a> {
             self.project
                 .check_paths()
                 .iter()
-                .map(|path| SystemPathBuf::from(*path))
+                .map(|path| path.to_path_buf())
                 .collect(),
         );
 
@@ -645,8 +645,8 @@ fn hydra(criterion: &mut Criterion) {
             name: "hydra-zen",
             repository: "https://github.com/mit-ll-responsible-ai/hydra-zen",
             commit: "dd2b50a9614c6f8c46c5866f283c8f7e7a960aa8",
-            paths: &["src"],
-            dependencies: &["pydantic", "beartype", "hydra-core"],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec!["pydantic", "beartype", "hydra-core"],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
@@ -662,8 +662,8 @@ fn attrs(criterion: &mut Criterion) {
             name: "attrs",
             repository: "https://github.com/python-attrs/attrs",
             commit: "a6ae894aad9bc09edc7cdad8c416898784ceec9b",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
@@ -679,8 +679,8 @@ fn anyio(criterion: &mut Criterion) {
             name: "anyio",
             repository: "https://github.com/agronholm/anyio",
             commit: "561d81270a12f7c6bbafb5bc5fad99a2a13f96be",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
             max_dep_date: "2025-06-17",
             python_version: PythonVersion::PY313,
         },
@@ -696,8 +696,8 @@ fn datetype(criterion: &mut Criterion) {
             name: "DateType",
             repository: "https://github.com/glyph/DateType",
             commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
             max_dep_date: "2025-07-04",
             python_version: PythonVersion::PY313,
         },

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -1,6 +1,7 @@
-use divan::{Bencher, bench};
 use std::fmt::{Display, Formatter};
 
+use divan::{Bencher, bench};
+
 use rayon::ThreadPoolBuilder;
 use ruff_benchmark::real_world_projects::{InstalledProject, RealWorldProject};
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
@@ -12,39 +13,29 @@ use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};
 
 struct Benchmark<'a> {
-    project: RealWorldProject<'a>,
-    installed_project: std::sync::OnceLock<InstalledProject<'a>>,
+    project: InstalledProject<'a>,
     max_diagnostics: usize,
 }
 
 impl<'a> Benchmark<'a> {
-    const fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
+    fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
+        let setup_project = project.setup().expect("Failed to setup project");
+
         Self {
-            project,
-            installed_project: std::sync::OnceLock::new(),
+            project: setup_project,
             max_diagnostics,
         }
     }
 
-    fn installed_project(&self) -> &InstalledProject<'a> {
-        self.installed_project.get_or_init(|| {
-            self.project
-                .clone()
-                .setup()
-                .expect("Failed to setup project")
-        })
-    }
-
     fn setup_iteration(&self) -> ProjectDatabase {
-        let installed_project = self.installed_project();
-        let root = SystemPathBuf::from_path_buf(installed_project.path.clone()).unwrap();
+        let root = SystemPathBuf::from_path_buf(self.project.path.clone()).unwrap();
         let system = OsSystem::new(&root);
 
         let mut metadata = ProjectMetadata::discover(&root, &system).unwrap();
 
         metadata.apply_options(Options {
             environment: Some(EnvironmentOptions {
-                python_version: Some(RangedValue::cli(installed_project.config.python_version)),
+                python_version: Some(RangedValue::cli(self.project.config.python_version)),
                 python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                 ..EnvironmentOptions::default()
             }),
@@ -55,7 +46,7 @@ impl<'a> Benchmark<'a> {
 
         db.project().set_included_paths(
             &mut db,
-            installed_project
+            self.project
                 .check_paths()
                 .iter()
                 .map(|path| SystemPath::absolute(path, &root))
@@ -67,7 +58,7 @@ impl<'a> Benchmark<'a> {
 
 impl Display for Benchmark<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        self.project.name.fmt(f)
+        f.write_str(self.project.config.name)
     }
 }
 
@@ -84,150 +75,166 @@ fn check_project(db: &ProjectDatabase, max_diagnostics: usize) {
     );
 }
 
-static ALTAIR: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "altair",
-        repository: "https://github.com/vega/altair",
-        commit: "d1f4a1ef89006e5f6752ef1f6df4b7a509336fba",
-        paths: &["altair"],
-        dependencies: &[
-            "jinja2",
-            "narwhals",
-            "numpy",
-            "packaging",
-            "pandas-stubs",
-            "pyarrow-stubs",
-            "pytest",
-            "scipy-stubs",
-            "types-jsonschema",
-        ],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY312,
-    },
-    1000,
-);
+static ALTAIR: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "altair",
+            repository: "https://github.com/vega/altair",
+            commit: "d1f4a1ef89006e5f6752ef1f6df4b7a509336fba",
+            paths: vec![SystemPath::new("altair")],
+            dependencies: vec![
+                "jinja2",
+                "narwhals",
+                "numpy",
+                "packaging",
+                "pandas-stubs",
+                "pyarrow-stubs",
+                "pytest",
+                "scipy-stubs",
+                "types-jsonschema",
+            ],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY312,
+        },
+        1000,
+    )
+});
 
-static COLOUR_SCIENCE: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "colour-science",
-        repository: "https://github.com/colour-science/colour",
-        commit: "a17e2335c29e7b6f08080aa4c93cfa9b61f84757",
-        paths: &["colour"],
-        dependencies: &[
-            "matplotlib",
-            "numpy",
-            "pandas-stubs",
-            "pytest",
-            "scipy-stubs",
-        ],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY310,
-    },
-    600,
-);
+static COLOUR_SCIENCE: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "colour-science",
+            repository: "https://github.com/colour-science/colour",
+            commit: "a17e2335c29e7b6f08080aa4c93cfa9b61f84757",
+            paths: vec![SystemPath::new("colour")],
+            dependencies: vec![
+                "matplotlib",
+                "numpy",
+                "pandas-stubs",
+                "pytest",
+                "scipy-stubs",
+            ],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY310,
+        },
+        600,
+    )
+});
 
-static FREQTRADE: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "freqtrade",
-        repository: "https://github.com/freqtrade/freqtrade",
-        commit: "2d842ea129e56575852ee0c45383c8c3f706be19",
-        paths: &["freqtrade"],
-        dependencies: &[
-            "numpy",
-            "pandas-stubs",
-            "pydantic",
-            "sqlalchemy",
-            "types-cachetools",
-            "types-filelock",
-            "types-python-dateutil",
-            "types-requests",
-            "types-tabulate",
-        ],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY312,
-    },
-    400,
-);
+static FREQTRADE: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "freqtrade",
+            repository: "https://github.com/freqtrade/freqtrade",
+            commit: "2d842ea129e56575852ee0c45383c8c3f706be19",
+            paths: vec![SystemPath::new("freqtrade")],
+            dependencies: vec![
+                "numpy",
+                "pandas-stubs",
+                "pydantic",
+                "sqlalchemy",
+                "types-cachetools",
+                "types-filelock",
+                "types-python-dateutil",
+                "types-requests",
+                "types-tabulate",
+            ],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY312,
+        },
+        400,
+    )
+});
 
-static PANDAS: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "pandas",
-        repository: "https://github.com/pandas-dev/pandas",
-        commit: "5909621e2267eb67943a95ef5e895e8484c53432",
-        paths: &["pandas"],
-        dependencies: &[
-            "numpy",
-            "types-python-dateutil",
-            "types-pytz",
-            "types-PyMySQL",
-            "types-setuptools",
-            "pytest",
-        ],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY312,
-    },
-    3000,
-);
+static PANDAS: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "pandas",
+            repository: "https://github.com/pandas-dev/pandas",
+            commit: "5909621e2267eb67943a95ef5e895e8484c53432",
+            paths: vec![SystemPath::new("pandas")],
+            dependencies: vec![
+                "numpy",
+                "types-python-dateutil",
+                "types-pytz",
+                "types-PyMySQL",
+                "types-setuptools",
+                "pytest",
+            ],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY312,
+        },
+        3000,
+    )
+});
 
-static PYDANTIC: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "pydantic",
-        repository: "https://github.com/pydantic/pydantic",
-        commit: "0c4a22b64b23dfad27387750cf07487efc45eb05",
-        paths: &["pydantic"],
-        dependencies: &[
-            "annotated-types",
-            "pydantic-core",
-            "typing-extensions",
-            "typing-inspection",
-        ],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY39,
-    },
-    1000,
-);
+static PYDANTIC: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "pydantic",
+            repository: "https://github.com/pydantic/pydantic",
+            commit: "0c4a22b64b23dfad27387750cf07487efc45eb05",
+            paths: vec![SystemPath::new("pydantic")],
+            dependencies: vec![
+                "annotated-types",
+                "pydantic-core",
+                "typing-extensions",
+                "typing-inspection",
+            ],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY39,
+        },
+        1000,
+    )
+});
 
-static SYMPY: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "sympy",
-        repository: "https://github.com/sympy/sympy",
-        commit: "22fc107a94eaabc4f6eb31470b39db65abb7a394",
-        paths: &["sympy"],
-        dependencies: &["mpmath"],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY312,
-    },
-    13000,
-);
+static SYMPY: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "sympy",
+            repository: "https://github.com/sympy/sympy",
+            commit: "22fc107a94eaabc4f6eb31470b39db65abb7a394",
+            paths: vec![SystemPath::new("sympy")],
+            dependencies: vec!["mpmath"],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY312,
+        },
+        13000,
+    )
+});
 
-static TANJUN: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "tanjun",
-        repository: "https://github.com/FasterSpeeding/Tanjun",
-        commit: "69f40db188196bc59516b6c69849c2d85fbc2f4a",
-        paths: &["tanjun"],
-        dependencies: &["hikari", "alluka"],
-        max_dep_date: "2025-06-17",
-        python_version: PythonVersion::PY312,
-    },
-    100,
-);
+static TANJUN: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "tanjun",
+            repository: "https://github.com/FasterSpeeding/Tanjun",
+            commit: "69f40db188196bc59516b6c69849c2d85fbc2f4a",
+            paths: vec![SystemPath::new("tanjun")],
+            dependencies: vec!["hikari", "alluka"],
+            max_dep_date: "2025-06-17",
+            python_version: PythonVersion::PY312,
+        },
+        100,
+    )
+});
 
-static STATIC_FRAME: Benchmark = Benchmark::new(
-    RealWorldProject {
-        name: "static-frame",
-        repository: "https://github.com/static-frame/static-frame",
-        commit: "34962b41baca5e7f98f5a758d530bff02748a421",
-        paths: &["static_frame"],
-        // N.B. `arraykit` is installed as a dependency during mypy_primer runs,
-        // but it takes much longer to be installed in a Codspeed run than it does in a mypy_primer run
-        // (seems to be built from source on the Codspeed CI runners for some reason).
-        dependencies: &["numpy"],
-        max_dep_date: "2025-08-09",
-        python_version: PythonVersion::PY311,
-    },
-    630,
-);
+static STATIC_FRAME: std::sync::LazyLock<Benchmark<'static>> = std::sync::LazyLock::new(|| {
+    Benchmark::new(
+        RealWorldProject {
+            name: "static-frame",
+            repository: "https://github.com/static-frame/static-frame",
+            commit: "34962b41baca5e7f98f5a758d530bff02748a421",
+            paths: vec![SystemPath::new("static_frame")],
+            // N.B. `arraykit` is installed as a dependency during mypy_primer runs,
+            // but it takes much longer to be installed in a Codspeed run than it does in a mypy_primer run
+            // (seems to be built from source on the Codspeed CI runners for some reason).
+            dependencies: vec!["numpy"],
+            max_dep_date: "2025-08-09",
+            python_version: PythonVersion::PY311,
+        },
+        600,
+    )
+});
 
 #[track_caller]
 fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
@@ -238,22 +245,22 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
         });
 }
 
-#[bench(args=[&ALTAIR, &FREQTRADE, &PYDANTIC, &TANJUN], sample_size=2, sample_count=3)]
+#[bench(args=[&*ALTAIR, &*FREQTRADE, &*PYDANTIC, &*TANJUN], sample_size=2, sample_count=3)]
 fn small(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
+#[bench(args=[&*COLOUR_SCIENCE, &*PANDAS, &*STATIC_FRAME], sample_size=1, sample_count=3)]
 fn medium(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&SYMPY], sample_size=1, sample_count=2)]
+#[bench(args=[&*SYMPY], sample_size=1, sample_count=2)]
 fn large(bencher: Bencher, benchmark: &Benchmark) {
     run_single_threaded(bencher, benchmark);
 }
 
-#[bench(args=[&PYDANTIC], sample_size=3, sample_count=8)]
+#[bench(args=[&*PYDANTIC], sample_size=3, sample_count=8)]
 fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
     let thread_pool = ThreadPoolBuilder::new().build().unwrap();
 

crates/ruff_benchmark/src/real_world_projects.rs

@@ -30,9 +30,9 @@ pub struct RealWorldProject<'a> {
     /// Specific commit hash to checkout
     pub commit: &'a str,
     /// List of paths within the project to check (`ty check <paths>`)
-    pub paths: &'a [&'a str],
+    pub paths: Vec<&'a SystemPath>,
     /// Dependencies to install via uv
-    pub dependencies: &'a [&'a str],
+    pub dependencies: Vec<&'a str>,
     /// Limit candidate packages to those that were uploaded prior to a given point in time (ISO 8601 format).
     /// Maps to uv's `exclude-newer`.
     pub max_dep_date: &'a str,
@@ -125,9 +125,9 @@ impl<'a> InstalledProject<'a> {
         &self.config
     }
 
-    /// Get the benchmark paths
-    pub fn check_paths(&self) -> &[&str] {
-        self.config.paths
+    /// Get the benchmark paths as `SystemPathBuf`
+    pub fn check_paths(&self) -> &[&SystemPath] {
+        &self.config.paths
     }
 
     /// Get the virtual environment path
@@ -297,7 +297,7 @@ fn install_dependencies(checkout: &Checkout) -> Result<()> {
         "--exclude-newer",
         checkout.project().max_dep_date,
     ])
-    .args(checkout.project().dependencies);
+    .args(&checkout.project().dependencies);
 
     let output = cmd
         .output()

crates/ruff_db/src/diagnostic/mod.rs

@@ -7,8 +7,7 @@ use ruff_annotate_snippets::Level as AnnotateLevel;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 pub use self::render::{
-    DisplayDiagnostic, DisplayDiagnostics, DummyFileResolver, FileResolver, Input,
-    ceil_char_boundary,
+    DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input, ceil_char_boundary,
     github::{DisplayGithubDiagnostics, GithubRenderer},
 };
 use crate::{Db, files::File};
@@ -84,14 +83,17 @@ impl Diagnostic {
     /// at time of writing, `ruff_db` depends on `ruff_python_parser` instead of
     /// the other way around. And since we want to do this conversion in a couple
     /// places, it makes sense to centralize it _somewhere_. So it's here for now.
+    ///
+    /// Note that `message` is stored in the primary annotation, _not_ in the primary diagnostic
+    /// message.
     pub fn invalid_syntax(
         span: impl Into<Span>,
         message: impl IntoDiagnosticMessage,
         range: impl Ranged,
     ) -> Diagnostic {
-        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
+        let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, "");
         let span = span.into().with_range(range.range());
-        diag.annotate(Annotation::primary(span));
+        diag.annotate(Annotation::primary(span).message(message));
         diag
     }
 

crates/ruff_db/src/diagnostic/render.rs

@@ -1170,31 +1170,6 @@ pub fn ceil_char_boundary(text: &str, offset: TextSize) -> TextSize {
         .unwrap_or_else(|| TextSize::from(upper_bound))
 }
 
-/// A stub implementation of [`FileResolver`] intended for testing.
-pub struct DummyFileResolver;
-
-impl FileResolver for DummyFileResolver {
-    fn path(&self, _file: File) -> &str {
-        unimplemented!()
-    }
-
-    fn input(&self, _file: File) -> Input {
-        unimplemented!()
-    }
-
-    fn notebook_index(&self, _file: &UnifiedFile) -> Option<NotebookIndex> {
-        None
-    }
-
-    fn is_notebook(&self, _file: &UnifiedFile) -> bool {
-        false
-    }
-
-    fn current_directory(&self) -> &Path {
-        Path::new(".")
-    }
-}
-
 #[cfg(test)]
 mod tests {
 

crates/ruff_db/src/files.rs

@@ -193,17 +193,6 @@ impl Files {
         roots.at(&absolute)
     }
 
-    /// The same as [`Self::root`] but panics if no root is found.
-    #[track_caller]
-    pub fn expect_root(&self, db: &dyn Db, path: &SystemPath) -> FileRoot {
-        if let Some(root) = self.root(db, path) {
-            return root;
-        }
-
-        let roots = self.inner.roots.read().unwrap();
-        panic!("No root found for path '{path}'. Known roots: {roots:#?}");
-    }
-
     /// Adds a new root for `path` and returns the root.
     ///
     /// The root isn't added nor is the file root's kind updated if a root for `path` already exists.

crates/ruff_db/src/files/file_root.rs

@@ -81,8 +81,6 @@ impl FileRoots {
             }
         }
 
-        tracing::debug!("Adding new file root '{path}' of kind {kind:?}");
-
         // normalize the path to use `/` separators and escape the '{' and '}' characters,
         // which matchit uses for routing parameters
         let mut route = normalized_path.replace('{', "{{").replace('}', "}}");

crates/ruff_dev/src/generate_json_schema.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use anyhow::{Result, bail};
 use pretty_assertions::StrComparison;
-use schemars::generate::SchemaSettings;
+use schemars::schema_for;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,9 +17,7 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let settings = SchemaSettings::draft07();
-    let generator = settings.into_generator();
-    let schema = generator.into_root_schema_for::<Options>();
+    let schema = schema_for!(Options);
     let schema_string = serde_json::to_string_pretty(&schema).unwrap();
     let filename = "ruff.schema.json";
     let schema_path = PathBuf::from(ROOT_DIR).join(filename);

crates/ruff_dev/src/generate_ty_rules.rs

@@ -93,39 +93,14 @@ fn generate_markdown() -> String {
             })
             .join("\n");
 
-        let status_text = match lint.status() {
-            ty_python_semantic::lint::LintStatus::Stable { since } => {
-                format!(
-                    r#"Added in <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>"#
-                )
-            }
-            ty_python_semantic::lint::LintStatus::Preview { since } => {
-                format!(
-                    r#"Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
-                )
-            }
-            ty_python_semantic::lint::LintStatus::Deprecated { since, .. } => {
-                format!(
-                    r#"Deprecated (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
-                )
-            }
-            ty_python_semantic::lint::LintStatus::Removed { since, .. } => {
-                format!(
-                    r#"Removed (since <a href="https://github.com/astral-sh/ty/releases/tag/{since}">{since}</a>)"#
-                )
-            }
-        };
-
         let _ = writeln!(
             &mut output,
             r#"<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of '{level}'."><code>{level}</code></a> ·
-{status_text} ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20{encoded_name}" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/{file}#L{line}" target="_blank">View source</a>
+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>
 
-
 {documentation}
 "#,
             level = lint.default_level(),

crates/ruff_dev/src/generate_ty_schema.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use anyhow::{Result, bail};
 use pretty_assertions::StrComparison;
-use schemars::generate::SchemaSettings;
+use schemars::schema_for;
 
 use crate::ROOT_DIR;
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
@@ -17,9 +17,7 @@ pub(crate) struct Args {
 }
 
 pub(crate) fn main(args: &Args) -> Result<()> {
-    let settings = SchemaSettings::draft07();
-    let generator = settings.into_generator();
-    let schema = generator.into_root_schema_for::<Options>();
+    let schema = schema_for!(Options);
     let schema_string = serde_json::to_string_pretty(&schema).unwrap();
     let filename = "ty.schema.json";
     let schema_path = PathBuf::from(ROOT_DIR).join(filename);

crates/ruff_graph/src/db.rs

@@ -98,10 +98,6 @@ impl Db for ModuleDb {
     fn lint_registry(&self) -> &LintRegistry {
         default_lint_registry()
     }
-
-    fn verbose(&self) -> bool {
-        false
-    }
 }
 
 #[salsa::db]

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.14.1"
+version = "0.14.0"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py

@@ -11,7 +11,7 @@ from airflow import (
 )
 from airflow.api_connexion.security import requires_access
 from airflow.contrib.aws_athena_hook import AWSAthenaHook
-from airflow.datasets import DatasetAliasEvent, DatasetEvent
+from airflow.datasets import DatasetAliasEvent
 from airflow.operators.postgres_operator import Mapping
 from airflow.operators.subdag import SubDagOperator
 from airflow.secrets.cache import SecretCache
@@ -48,7 +48,6 @@ AWSAthenaHook()
 
 # airflow.datasets
 DatasetAliasEvent()
-DatasetEvent()
 
 
 # airflow.operators.subdag.*

crates/ruff_linter/resources/test/fixtures/fastapi/FAST002_2.py

@@ -1,87 +0,0 @@
-"""Test FAST002 ellipsis handling."""
-
-from fastapi import Body, Cookie, FastAPI, Header, Query
-
-app = FastAPI()
-
-
-# Cases that should be fixed - ellipsis should be removed
-
-
-@app.get("/test1")
-async def test_ellipsis_query(
-    # This should become: param: Annotated[str, Query(description="Test param")]
-    param: str = Query(..., description="Test param"),
-) -> str:
-    return param
-
-
-@app.get("/test2")
-async def test_ellipsis_header(
-    # This should become: auth: Annotated[str, Header(description="Auth header")]
-    auth: str = Header(..., description="Auth header"),
-) -> str:
-    return auth
-
-
-@app.post("/test3")
-async def test_ellipsis_body(
-    # This should become: data: Annotated[dict, Body(description="Request body")]
-    data: dict = Body(..., description="Request body"),
-) -> dict:
-    return data
-
-
-@app.get("/test4")
-async def test_ellipsis_cookie(
-    # This should become: session: Annotated[str, Cookie(description="Session ID")]
-    session: str = Cookie(..., description="Session ID"),
-) -> str:
-    return session
-
-
-@app.get("/test5")
-async def test_simple_ellipsis(
-    # This should become: id: Annotated[str, Query()]
-    id: str = Query(...),
-) -> str:
-    return id
-
-
-@app.get("/test6")
-async def test_multiple_kwargs_with_ellipsis(
-    # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
-    param: str = Query(..., description="Test", min_length=1, max_length=10),
-) -> str:
-    return param
-
-
-# Cases with actual default values - these should preserve the default
-
-
-@app.get("/test7")
-async def test_with_default_value(
-    # This should become: param: Annotated[str, Query(description="Test")] = "default"
-    param: str = Query("default", description="Test"),
-) -> str:
-    return param
-
-
-@app.get("/test8")
-async def test_with_default_none(
-    # This should become: param: Annotated[str | None, Query(description="Test")] = None
-    param: str | None = Query(None, description="Test"),
-) -> str:
-    return param or "empty"
-
-
-@app.get("/test9")
-async def test_mixed_parameters(
-    # First param should be fixed with default preserved  
-    optional_param: str = Query("default", description="Optional"),
-    # Second param should not be fixed because of the preceding default
-    required_param: str = Query(..., description="Required"),
-    # Third param should be fixed with default preserved
-    another_optional_param: int = Query(42, description="Another optional"),
-) -> str:
-    return f"{required_param}-{optional_param}-{another_optional_param}"

crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py

@@ -227,41 +227,3 @@ async def read_thing(query: str):
 @app.get("/things/{ thing_id : str }")
 async def read_thing(query: str):
     return {"query": query}
-
-
-# https://github.com/astral-sh/ruff/issues/20680
-# These should NOT trigger FAST003 because FastAPI doesn't recognize them as path parameters
-
-# Non-ASCII characters in parameter name
-@app.get("/f1/{用户身份}")
-async def f1():
-    return locals()
-
-# Space in parameter name  
-@app.get("/f2/{x: str}")
-async def f2():
-    return locals()
-
-# Non-ASCII converter
-@app.get("/f3/{complex_number:ℂ}")
-async def f3():
-    return locals()
-
-# Mixed non-ASCII characters
-@app.get("/f4/{用户_id}")
-async def f4():
-    return locals()
-
-# Space in parameter name with converter
-@app.get("/f5/{param: int}")
-async def f5():
-    return locals()
-
-# https://github.com/astral-sh/ruff/issues/20941
-@app.get("/imports/{import}")
-async def get_import():
-    ...
-
-@app.get("/debug/{__debug__}")
-async def get_debug():
-    ...

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py

@@ -33,10 +33,3 @@ class ShellConfig:
 
     def run(self, username):
         Popen("true", shell={**self.shell_defaults, **self.fetch_shell_config(username)})
-
-# Additional truthiness cases for generator, lambda, and f-strings
-Popen("true", shell=(i for i in ()))
-Popen("true", shell=lambda: 0)
-Popen("true", shell=f"{b''}")
-x = 1
-Popen("true", shell=f"{x=}")

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py

@@ -6,19 +6,3 @@ foo(shell=True)
 
 foo(shell={**{}})
 foo(shell={**{**{}}})
-
-# Truthy non-bool values for `shell`
-foo(shell=(i for i in ()))
-foo(shell=lambda: 0)
-
-# f-strings guaranteed non-empty
-foo(shell=f"{b''}")
-x = 1
-foo(shell=f"{x=}")
-
-# Additional truthiness cases for generator, lambda, and f-strings
-foo(shell=(i for i in ()))
-foo(shell=lambda: 0)
-foo(shell=f"{b''}")
-x = 1
-foo(shell=f"{x=}")

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py

@@ -9,10 +9,3 @@ os.system("tar cf foo.tar bar/*")
 
 subprocess.Popen(["chmod", "+w", "*.py"], shell={**{}})
 subprocess.Popen(["chmod", "+w", "*.py"], shell={**{**{}}})
-
-# Additional truthiness cases for generator, lambda, and f-strings
-subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
-subprocess.Popen("chmod +w foo*", shell=lambda: 0)
-subprocess.Popen("chmod +w foo*", shell=f"{b''}")
-x = 1
-subprocess.Popen("chmod +w foo*", shell=f"{x=}")

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B905.py

@@ -1,10 +1,12 @@
 from itertools import count, cycle, repeat
 
 # Errors
+zip()
+zip(range(3))
 zip("a", "b")
 zip("a", "b", *zip("c"))
-zip(zip("a", "b"), strict=False)
-zip(zip("a", strict=True),"b")
+zip(zip("a"), strict=False)
+zip(zip("a", strict=True))
 
 # OK
 zip(range(3), strict=True)
@@ -25,10 +27,3 @@ zip([1, 2, 3], repeat(1, times=4))
 import builtins
 # Still an error even though it uses the qualified name
 builtins.zip([1, 2, 3])
-
-# Regression https://github.com/astral-sh/ruff/issues/20997
-# Ok
-zip()
-zip(range(3))
-# Error
-zip(*lot_of_iterators)

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B912.py

@@ -31,6 +31,3 @@ map(lambda x, y: x + y, [1, 2, 3], cycle([1, 2, 3]))
 map(lambda x, y: x + y, [1, 2, 3], repeat(1))
 map(lambda x, y: x + y, [1, 2, 3], repeat(1, times=None))
 map(lambda x, y: x + y, [1, 2, 3], count())
-
-# Regression https://github.com/astral-sh/ruff/issues/20997
-map(f, *lots_of_iterators)

crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py

@@ -2,52 +2,3 @@ _(f"{'value'}")
 
 # Don't trigger for t-strings
 _(t"{'value'}")
-
-gettext(f"{'value'}")
-ngettext(f"{'value'}", f"{'values'}", 2)
-
-_gettext(f"{'value'}")  # no lint
-gettext_fn(f"{'value'}")  # no lint
-
-
-# https://github.com/astral-sh/ruff/issues/19028 - import aliases
-import gettext as gettext_mod
-from gettext import (
-    gettext as gettext_fn,
-    ngettext as ngettext_fn,
-)
-
-name = "Guido"
-
-gettext_mod.gettext(f"Hello, {name}!")
-gettext_mod.ngettext(f"Hello, {name}!", f"Hello, {name}s!", 2)
-gettext_fn(f"Hello, {name}!")
-ngettext_fn(f"Hello, {name}!", f"Hello, {name}s!", 2)
-
-
-# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
-def _(message): return message
-
-animals = [_(f"{'mollusk'}"),
-           _(f"{'albatross'}"),
-           _(f"{'rat'}"),
-           _(f"{'penguin'}"),
-           _(f"{'python'}"),]
-
-del _
-
-for a in animals:
-    print(_(a))
-    print(_(f"{a}"))
-
-
-# https://github.com/astral-sh/ruff/issues/19028
-#  - installed translations/i18n functions dynamically assigned to builtins
-import builtins
-
-gettext_mod.install("domain")
-builtins.__dict__["gettext"] = gettext_fn
-
-builtins._(f"{'value'}")
-builtins.gettext(f"{'value'}")
-builtins.ngettext(f"{'value'}", f"{'values'}", 2)

crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT002.py

@@ -1,49 +1 @@
 _("{}".format("line"))
-gettext("{}".format("line"))
-ngettext("{}".format("line"), "{}".format("lines"), 2)
-
-_gettext("{}".format("line"))  # no lint
-gettext_fn("{}".format("line"))  # no lint
-
-
-# https://github.com/astral-sh/ruff/issues/19028
-import gettext as gettext_mod
-from gettext import (
-    gettext as gettext_fn,
-    ngettext as ngettext_fn,
-)
-
-name = "Guido"
-
-gettext_mod.gettext("Hello, {}!".format(name))
-gettext_mod.ngettext("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
-gettext_fn("Hello, {}!".format(name))
-ngettext_fn("Hello, {}!".format(name), "Hello, {}s!".format(name), 2)
-
-
-# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
-def _(message): return message
-
-animals = [_("{}".format("mollusk")),
-           _("{}".format("albatross")),
-           _("{}".format("rat")),
-           _("{}".format("penguin")),
-           _("{}".format("python")),]
-
-del _
-
-for a in animals:
-    print(_(a))
-    print(_("{}".format(a)))
-
-
-# https://github.com/astral-sh/ruff/issues/19028
-#  - installed translations/i18n functions dynamically assigned to builtins
-import builtins
-
-gettext_mod.install("domain")
-builtins.__dict__["gettext"] = gettext_fn
-
-builtins._("{}".format("line"))
-builtins.gettext("{}".format("line"))
-builtins.ngettext("{}".format("line"), "{}".format("lines"), 2)

crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT003.py

@@ -1,49 +1 @@
 _("%s" % "line")
-gettext("%s" % "line")
-ngettext("%s" % "line", "%s" % "lines", 2)
-
-_gettext("%s" % "line")  # no lint
-gettext_fn("%s" % "line")  # no lint
-
-
-# https://github.com/astral-sh/ruff/issues/19028
-import gettext as gettext_mod
-from gettext import (
-    gettext as gettext_fn,
-    ngettext as ngettext_fn,
-)
-
-name = "Guido"
-
-gettext_mod.gettext("Hello, %s!" % name)
-gettext_mod.ngettext("Hello, %s!" % name, "Hello, %ss!" % name, 2)
-gettext_fn("Hello, %s!" % name)
-ngettext_fn("Hello, %s!" % name, "Hello, %ss!" % name, 2)
-
-
-# https://github.com/astral-sh/ruff/issues/19028 - deferred translations
-def _(message): return message
-
-animals = [_("%s" %"mollusk"),
-           _("%s" %"albatross"),
-           _("%s" %"rat"),
-           _("%s" %"penguin"),
-           _("%s" %"python"),]
-
-del _
-
-for a in animals:
-    print(_(a))
-    print(_("%s" % a))
-
-
-# https://github.com/astral-sh/ruff/issues/19028
-#  - installed translations/i18n functions dynamically assigned to builtins
-import builtins
-
-gettext_mod.install("domain")
-builtins.__dict__["gettext"] = gettext_fn
-
-builtins._("%s" % "line")
-builtins.gettext("%s" % "line")
-builtins.ngettext("%s" % "line", "%s" % "lines", 2)

crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC_syntax_error.py

@@ -1,10 +1,10 @@
-# The lexer emits a string token if it's unterminated
+# The lexer doesn't emit a string token if it's unterminated
 "a" "b
 "a" "b" "c
 "a" """b
 c""" "d
 
-# This is also true for
+# For f-strings, the `FStringRanges` won't contain the range for
 # unterminated f-strings.
 f"a" f"b
 f"a" f"b" f"c

crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_implicit_concat.py

@@ -1,8 +0,0 @@
-import logging
-
-variablename = "value"
-
-log = logging.getLogger(__name__)
-log.info(f"a" f"b {variablename}")
-log.info("a " f"b {variablename}")
-log.info("prefix " f"middle {variablename}" f" suffix")

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

@@ -78,11 +78,3 @@ b: None | Literal[None] | None
 c: (None | Literal[None]) | None
 d: None | (Literal[None] | None)
 e: None | ((None | Literal[None]) | None) | None
-
-# Test cases for operator precedence issue (https://github.com/astral-sh/ruff/issues/20265)
-print(Literal[1, None].__dict__)  # Should become (Literal[1] | None).__dict__
-print(Literal[1, None].method())  # Should become (Literal[1] | None).method()
-print(Literal[1, None][0])  # Should become (Literal[1] | None)[0]
-print(Literal[1, None] + 1)  # Should become (Literal[1] | None) + 1
-print(Literal[1, None] * 2)  # Should become (Literal[1] | None) * 2
-print((Literal[1, None]).__dict__)  # Should become ((Literal[1] | None)).__dict__

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

@@ -197,10 +197,3 @@ for x in {**a, **b} or [None]:
 
 # https://github.com/astral-sh/ruff/issues/7127
 def f(a: "'b' or 'c'"): ...
-
-# https://github.com/astral-sh/ruff/issues/20703
-print(f"{b''}" or "bar")  # SIM222
-x = 1
-print(f"{x=}" or "bar")  # SIM222
-(lambda: 1) or True  # SIM222
-(i for i in range(1)) or "bar"  # SIM222

crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_google.py

@@ -1,264 +0,0 @@
-# DOC102
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Args:
-        a (int): The first number to add.
-        b (int): The second number to add.
-
-    Returns:
-        int: The sum of the two numbers.
-    """
-    return a + b
-
-
-# DOC102
-def multiply_list_elements(lst):
-    """
-    Multiplies each element in a list by a given multiplier.
-
-    Args:
-        lst (list of int): A list of integers.
-        multiplier (int): The multiplier for each element in the list.
-
-    Returns:
-        list of int: A new list with each element multiplied.
-    """
-    return [x * multiplier for x in lst]
-
-
-# DOC102
-def find_max_value():
-    """
-    Finds the maximum value in a list of numbers.
-
-    Args:
-        numbers (list of int): A list of integers to search through.
-
-    Returns:
-        int: The maximum value found in the list.
-    """
-    return max(numbers)
-
-
-# DOC102
-def create_user_profile(location="here"):
-    """
-    Creates a user profile with basic information.
-
-    Args:
-        name (str): The name of the user.
-        age (int): The age of the user.
-        email (str): The user's email address.
-        location (str): The location of the user.
-
-    Returns:
-        dict: A dictionary containing the user's profile.
-    """
-    return {
-        'name': name,
-        'age': age,
-        'email': email,
-        'location': location
-    }
-
-
-# DOC102
-def calculate_total_price(item_prices, discount):
-    """
-    Calculates the total price after applying tax and a discount.
-
-    Args:
-        item_prices (list of float): A list of prices for each item.
-        tax_rate (float): The tax rate to apply.
-        discount (float): The discount to subtract from the total.
-
-    Returns:
-        float: The final total price after tax and discount.
-    """
-    total = sum(item_prices)
-    total_with_tax = total + (total * tax_rate)
-    final_total = total_with_tax - discount
-    return final_total
-
-
-# DOC102
-def send_email(subject, body, bcc_address=None):
-    """
-    Sends an email to the specified recipients.
-
-    Args:
-        subject (str): The subject of the email.
-        body (str): The content of the email.
-        to_address (str): The recipient's email address.
-        cc_address (str, optional): The email address for CC. Defaults to None.
-        bcc_address (str, optional): The email address for BCC. Defaults to None.
-
-    Returns:
-        bool: True if the email was sent successfully, False otherwise.
-    """
-    return True
-
-
-# DOC102
-def concatenate_strings(*args):
-    """
-    Concatenates multiple strings with a specified separator.
-
-    Args:
-        separator (str): The separator to use between strings.
-        *args (str): Variable length argument list of strings to concatenate.
-
-    Returns:
-        str: A single concatenated string.
-    """
-    return separator.join(args)
-
-
-# DOC102
-def process_order(order_id):
-    """
-    Processes an order with a list of items and optional order details.
-
-    Args:
-        order_id (int): The unique identifier for the order.
-        *items (str): Variable length argument list of items in the order.
-        **details (dict): Additional details such as shipping method and address.
-
-    Returns:
-        dict: A dictionary containing the order summary.
-    """
-    return {
-        'order_id': order_id,
-        'items': items,
-        'details': details
-    }
-
-
-class Calculator:
-    """
-    A simple calculator class that can perform basic arithmetic operations.
-    """
-
-    # DOC102
-    def __init__(self):
-        """
-        Initializes the calculator with an initial value.
-
-        Args:
-            value (int, optional): The initial value of the calculator. Defaults to 0.
-        """
-        self.value = value
-
-    # DOC102
-    def add(self, number2):
-        """
-        Adds a number to the current value.
-
-        Args:
-            number (int or float): The number to add to the current value.
-
-        Returns:
-            int or float: The updated value after addition.
-        """
-        self.value += number + number2
-        return self.value
-
-    # DOC102
-    @classmethod
-    def from_string(cls):
-        """
-        Creates a Calculator instance from a string representation of a number.
-
-        Args:
-            value_str (str): The string representing the initial value.
-
-        Returns:
-            Calculator: A new instance of Calculator initialized with the value from the string.
-        """
-        value = float(value_str)
-        return cls(value)
-
-    # DOC102
-    @staticmethod
-    def is_valid_number():
-        """
-        Checks if a given number is valid (int or float).
-
-        Args:
-            number (any): The value to check.
-
-        Returns:
-            bool: True if the number is valid, False otherwise.
-        """
-        return isinstance(number, (int, float))
-
-# OK
-def foo(param1, param2, *args, **kwargs):
-    """Foo.
-
-    Args:
-        param1 (int): The first parameter.
-        param2 (:obj:`str`, optional): The second parameter. Defaults to None.
-            Second line of description: should be indented.
-        *args: Variable length argument list.
-        **kwargs: Arbitrary keyword arguments.
-    """
-    return
-
-# OK
-def on_server_unloaded(self, server_context: ServerContext) -> None:
-    ''' Execute ``on_server_unloaded`` from ``server_lifecycle.py`` (if
-    it is defined) when the server cleanly exits. (Before stopping the
-    server's ``IOLoop``.)
-
-    Args:
-        server_context (ServerContext) :
-
-    .. warning::
-        In practice this code may not run, since servers are often killed
-        by a signal.
-
-
-    '''
-    return self._lifecycle_handler.on_server_unloaded(server_context)
-
-# OK
-def function_with_kwargs(param1, param2, **kwargs):
-    """Function with **kwargs parameter.
-
-    Args:
-        param1 (int): The first parameter.
-        param2 (str): The second parameter.
-        extra_param (str): An extra parameter that may be passed via **kwargs.
-        another_extra (int): Another extra parameter.
-    """
-    return
-
-# OK
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Args:
-        b: The second number to add.
-
-    Returns:
-        int: The sum of the two numbers.
-    """
-    return
-
-# DOC102
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Args:
-        a: The first number to add.
-        b: The second number to add.
-
-    Returns:
-        int: The sum of the two numbers.
-    """
-    return a + b

crates/ruff_linter/resources/test/fixtures/pydoclint/DOC102_numpy.py

@@ -1,372 +0,0 @@
-# DOC102
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Parameters
-    ----------
-    a : int
-        The first number to add.
-    b : int
-        The second number to add.
-
-    Returns
-    -------
-    int
-        The sum of the two numbers.
-    """
-    return a + b
-
-
-# DOC102
-def multiply_list_elements(lst):
-    """
-    Multiplies each element in a list by a given multiplier.
-
-    Parameters
-    ----------
-    lst : list of int
-        A list of integers.
-    multiplier : int
-        The multiplier for each element in the list.
-
-    Returns
-    -------
-    list of int
-        A new list with each element multiplied.
-    """
-    return [x * multiplier for x in lst]
-
-
-# DOC102
-def find_max_value():
-    """
-    Finds the maximum value in a list of numbers.
-
-    Parameters
-    ----------
-    numbers : list of int
-        A list of integers to search through.
-
-    Returns
-    -------
-    int
-        The maximum value found in the list.
-    """
-    return max(numbers)
-
-
-# DOC102
-def create_user_profile(location="here"):
-    """
-    Creates a user profile with basic information.
-
-    Parameters
-    ----------
-    name : str
-        The name of the user.
-    age : int
-        The age of the user.
-    email : str
-        The user's email address.
-    location : str, optional
-        The location of the user, by default "here".
-
-    Returns
-    -------
-    dict
-        A dictionary containing the user's profile.
-    """
-    return {
-        'name': name,
-        'age': age,
-        'email': email,
-        'location': location
-    }
-
-
-# DOC102
-def calculate_total_price(item_prices, discount):
-    """
-    Calculates the total price after applying tax and a discount.
-
-    Parameters
-    ----------
-    item_prices : list of float
-        A list of prices for each item.
-    tax_rate : float
-        The tax rate to apply.
-    discount : float
-        The discount to subtract from the total.
-
-    Returns
-    -------
-    float
-        The final total price after tax and discount.
-    """
-    total = sum(item_prices)
-    total_with_tax = total + (total * tax_rate)
-    final_total = total_with_tax - discount
-    return final_total
-
-
-# DOC102
-def send_email(subject, body, bcc_address=None):
-    """
-    Sends an email to the specified recipients.
-
-    Parameters
-    ----------
-    subject : str
-        The subject of the email.
-    body : str
-        The content of the email.
-    to_address : str
-        The recipient's email address.
-    cc_address : str, optional
-        The email address for CC, by default None.
-    bcc_address : str, optional
-        The email address for BCC, by default None.
-
-    Returns
-    -------
-    bool
-        True if the email was sent successfully, False otherwise.
-    """
-    return True
-
-
-# DOC102
-def concatenate_strings(*args):
-    """
-    Concatenates multiple strings with a specified separator.
-
-    Parameters
-    ----------
-    separator : str
-        The separator to use between strings.
-    *args : str
-        Variable length argument list of strings to concatenate.
-
-    Returns
-    -------
-    str
-        A single concatenated string.
-    """
-    return True
-
-
-# DOC102
-def process_order(order_id):
-    """
-    Processes an order with a list of items and optional order details.
-
-    Parameters
-    ----------
-    order_id : int
-        The unique identifier for the order.
-    *items : str
-        Variable length argument list of items in the order.
-    **details : dict
-        Additional details such as shipping method and address.
-
-    Returns
-    -------
-    dict
-        A dictionary containing the order summary.
-    """
-    return {
-        'order_id': order_id,
-        'items': items,
-        'details': details
-    }
-
-
-class Calculator:
-    """
-    A simple calculator class that can perform basic arithmetic operations.
-    """
-
-    # DOC102
-    def __init__(self):
-        """
-        Initializes the calculator with an initial value.
-
-        Parameters
-        ----------
-        value : int, optional
-            The initial value of the calculator, by default 0.
-        """
-        self.value = value
-
-    # DOC102
-    def add(self, number2):
-        """
-        Adds two numbers to the current value.
-
-        Parameters
-        ----------
-        number : int or float
-            The first number to add.
-        number2 : int or float
-            The second number to add.
-
-        Returns
-        -------
-        int or float
-            The updated value after addition.
-        """
-        self.value += number + number2
-        return self.value
-
-    # DOC102
-    @classmethod
-    def from_string(cls):
-        """
-        Creates a Calculator instance from a string representation of a number.
-
-        Parameters
-        ----------
-        value_str : str
-            The string representing the initial value.
-
-        Returns
-        -------
-        Calculator
-            A new instance of Calculator initialized with the value from the string.
-        """
-        value = float(value_str)
-        return cls(value)
-
-    # DOC102
-    @staticmethod
-    def is_valid_number():
-        """
-        Checks if a given number is valid (int or float).
-
-        Parameters
-        ----------
-        number : any
-            The value to check.
-
-        Returns
-        -------
-        bool
-            True if the number is valid, False otherwise.
-        """
-        return isinstance(number, (int, float))
-
-# OK
-def function_with_kwargs(param1, param2, **kwargs):
-    """Function with **kwargs parameter.
-
-    Parameters
-    ----------
-    param1 : int
-        The first parameter.
-    param2 : str
-        The second parameter.
-    extra_param : str
-        An extra parameter that may be passed via **kwargs.
-    another_extra : int
-        Another extra parameter.
-    """
-    return True
-
-# OK
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Parameters
-    ----------
-    b
-        The second number to add.
-
-    Returns
-    -------
-    int
-        The sum of the two numbers.
-    """
-    return a + b
-
-# DOC102
-def add_numbers(b):
-    """
-    Adds two numbers and returns the result.
-
-    Parameters
-    ----------
-    a
-        The first number to add.
-    b
-        The second number to add.
-
-    Returns
-    -------
-    int
-        The sum of the two numbers.
-    """
-    return a + b
-
-class Foo:
-    # OK
-    def send_help(self, *args: Any) -> Any:
-        """|coro|
-
-        Shows the help command for the specified entity if given.
-        The entity can be a command or a cog.
-
-        If no entity is given, then it'll show help for the
-        entire bot.
-
-        If the entity is a string, then it looks up whether it's a
-        :class:`Cog` or a :class:`Command`.
-
-        .. note::
-
-            Due to the way this function works, instead of returning
-            something similar to :meth:`~.commands.HelpCommand.command_not_found`
-            this returns :class:`None` on bad input or no help command.
-
-        Parameters
-        ----------
-        entity: Optional[Union[:class:`Command`, :class:`Cog`, :class:`str`]]
-            The entity to show help for.
-
-        Returns
-        -------
-        Any
-            The result of the help command, if any.
-        """
-        return
-
-    # OK
-    @classmethod
-    async def convert(cls, ctx: Context, argument: str) -> Self:
-        """|coro|
-
-        The method that actually converters an argument to the flag mapping.
-
-        Parameters
-        ----------
-        cls: Type[:class:`FlagConverter`]
-            The flag converter class.
-        ctx: :class:`Context`
-            The invocation context.
-        argument: :class:`str`
-            The argument to convert from.
-
-        Raises
-        ------
-        FlagError
-            A flag related parsing error.
-        CommandError
-            A command related error.
-
-        Returns
-        -------
-        :class:`FlagConverter`
-            The flag converter instance with all flags parsed.
-        """
-        return

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

@@ -18,20 +18,3 @@ def print_third_word(word: Hello.Text) -> None:
 
 def print_fourth_word(word: Goodbye) -> None:
     print(word)
-    
-
-import typing_extensions
-import typing_extensions as TypingExt
-from typing_extensions import Text as TextAlias
-
-
-def print_fifth_word(word: typing_extensions.Text) -> None:
-    print(word)
-
-
-def print_sixth_word(word: TypingExt.Text) -> None:
-    print(word)
-
-
-def print_seventh_word(word: TextAlias) -> None:
-    print(word)

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

@@ -269,10 +269,3 @@ raise ValueError(
 # Not a valid type annotation but this test shouldn't result in a panic.
 # Refer: https://github.com/astral-sh/ruff/issues/11736
 x: "'{} + {}'.format(x, y)"
-
-# Regression https://github.com/astral-sh/ruff/issues/21000
-# Fix should parenthesize walrus
-if __name__ == "__main__":
-    number = 0
-    string = "{}".format(number := number + 1)
-    print(string)

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

@@ -43,7 +43,7 @@ class Foo:
 T = typing.TypeVar(*args)
 x: typing.TypeAlias = list[T]
 
-# `default` was added in Python 3.13
+# `default` should be skipped for now, added in Python 3.13
 T = typing.TypeVar("T", default=Any)
 x: typing.TypeAlias = list[T]
 
@@ -90,9 +90,9 @@ PositiveList = TypeAliasType(
     "PositiveList2", list[Annotated[T, Gt(0)]], type_params=(T,)
 )
 
-# `default` was added in Python 3.13
+# `default` should be skipped for now, added in Python 3.13
 T = typing.TypeVar("T", default=Any)
-AnyList = TypeAliasType("AnyList", list[T], type_params=(T,))
+AnyList = TypeAliasType("AnyList", list[T], typep_params=(T,))
 
 # unsafe fix if comments within the fix
 T = TypeVar("T")
@@ -128,7 +128,3 @@ T: TypeAlias = ( # comment0
     str  # comment6
     # comment7
 ) # comment8
-
-# Test case for TypeVar with default - should be converted when preview mode is enabled
-T_default = TypeVar("T_default", default=int)
-DefaultList: TypeAlias = list[T_default]

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

@@ -122,7 +122,7 @@ class MixedGenerics[U]:
         return (u, t)
 
 
-# default requires 3.13
+# TODO(brent) default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -130,14 +130,6 @@ class DefaultTypeVar(Generic[V]):  # -> [V: str = Any]
     var: V
 
 
-# Test case for TypeVar with default but no bound
-W = TypeVar("W", default=int)
-
-
-class DefaultOnlyTypeVar(Generic[W]):  # -> [W = int]
-    var: W
-
-
 # nested classes and functions are skipped
 class Outer:
     class Inner(Generic[T]):

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

@@ -44,7 +44,9 @@ def any_str_param(s: AnyStr) -> AnyStr:
     return s
 
 
-# default requires 3.13
+# these cases are not handled
+
+# TODO(brent) default requires 3.13
 V = TypeVar("V", default=Any, bound=str)
 
 
@@ -52,8 +54,6 @@ def default_var(v: V) -> V:
     return v
 
 
-# these cases are not handled
-
 def outer():
     def inner(t: T) -> T:
         return t

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

@@ -81,7 +81,6 @@ pub(crate) fn definitions(checker: &mut Checker) {
         Rule::UndocumentedPublicPackage,
     ]);
     let enforce_pydoclint = checker.any_rule_enabled(&[
-        Rule::DocstringExtraneousParameter,
         Rule::DocstringMissingReturns,
         Rule::DocstringExtraneousReturns,
         Rule::DocstringMissingYields,

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

@@ -1034,7 +1034,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::FormatInGetTextFuncCall,
                 Rule::PrintfInGetTextFuncCall,
             ]) && flake8_gettext::is_gettext_func_call(
-                checker,
                 func,
                 &checker.settings().flake8_gettext.functions_names,
             ) {

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

@@ -50,6 +50,24 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::nonlocal_and_global(checker, nonlocal);
             }
         }
+        Stmt::Break(_) => {
+            if checker.is_rule_enabled(Rule::BreakOutsideLoop) {
+                pyflakes::rules::break_outside_loop(
+                    checker,
+                    stmt,
+                    &mut checker.semantic.current_statements().skip(1),
+                );
+            }
+        }
+        Stmt::Continue(_) => {
+            if checker.is_rule_enabled(Rule::ContinueOutsideLoop) {
+                pyflakes::rules::continue_outside_loop(
+                    checker,
+                    stmt,
+                    &mut checker.semantic.current_statements().skip(1),
+                );
+            }
+        }
         Stmt::FunctionDef(
             function_def @ ast::StmtFunctionDef {
                 is_async,

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

@@ -697,7 +697,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                 }
             }
             SemanticSyntaxErrorKind::FutureFeatureNotDefined(name) => {
-                // F407
                 if self.is_rule_enabled(Rule::FutureFeatureNotDefined) {
                     self.report_diagnostic(
                         pyflakes::rules::FutureFeatureNotDefined { name },
@@ -705,25 +704,12 @@ impl SemanticSyntaxContext for Checker<'_> {
                     );
                 }
             }
-            SemanticSyntaxErrorKind::BreakOutsideLoop => {
-                // F701
-                if self.is_rule_enabled(Rule::BreakOutsideLoop) {
-                    self.report_diagnostic(pyflakes::rules::BreakOutsideLoop, error.range);
-                }
-            }
-            SemanticSyntaxErrorKind::ContinueOutsideLoop => {
-                // F702
-                if self.is_rule_enabled(Rule::ContinueOutsideLoop) {
-                    self.report_diagnostic(pyflakes::rules::ContinueOutsideLoop, error.range);
-                }
-            }
             SemanticSyntaxErrorKind::ReboundComprehensionVariable
             | SemanticSyntaxErrorKind::DuplicateTypeParameter
             | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
             | SemanticSyntaxErrorKind::IrrefutableCasePattern(_)
             | SemanticSyntaxErrorKind::SingleStarredAssignment
             | SemanticSyntaxErrorKind::WriteToDebug(_)
-            | SemanticSyntaxErrorKind::DifferentMatchPatternBindings
             | SemanticSyntaxErrorKind::InvalidExpression(..)
             | SemanticSyntaxErrorKind::DuplicateMatchKey(_)
             | SemanticSyntaxErrorKind::DuplicateMatchClassAttribute(_)
@@ -825,40 +811,19 @@ impl SemanticSyntaxContext for Checker<'_> {
             }
         )
     }
-
-    fn in_loop_context(&self) -> bool {
-        let mut child = self.semantic.current_statement();
-
-        for parent in self.semantic.current_statements().skip(1) {
-            match parent {
-                Stmt::For(ast::StmtFor { orelse, .. })
-                | Stmt::While(ast::StmtWhile { orelse, .. }) => {
-                    if !orelse.contains(child) {
-                        return true;
-                    }
-                }
-                Stmt::FunctionDef(_) | Stmt::ClassDef(_) => {
-                    break;
-                }
-                _ => {}
-            }
-            child = parent;
-        }
-        false
-    }
 }
 
 impl<'a> Visitor<'a> for Checker<'a> {
     fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        // Step 0: Pre-processing
-        self.semantic.push_node(stmt);
-
         // For functions, defer semantic syntax error checks until the body of the function is
         // visited
         if !stmt.is_function_def_stmt() {
             self.with_semantic_checker(|semantic, context| semantic.visit_stmt(stmt, context));
         }
 
+        // Step 0: Pre-processing
+        self.semantic.push_node(stmt);
+
         // For Jupyter Notebooks, we'll reset the `IMPORT_BOUNDARY` flag when
         // we encounter a cell boundary.
         if self.source_type.is_ipynb()

crates/ruff_linter/src/checkers/noqa.rs

@@ -130,7 +130,6 @@ pub(crate) fn check_noqa(
                         let edit = delete_comment(directive.range(), locator);
                         let mut diagnostic = context
                             .report_diagnostic(UnusedNOQA { codes: None }, directive.range());
-                        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
                         diagnostic.set_fix(Fix::safe_edit(edit));
                     }
                 }
@@ -227,7 +226,6 @@ pub(crate) fn check_noqa(
                             },
                             directive.range(),
                         );
-                        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Unnecessary);
                         diagnostic.set_fix(Fix::safe_edit(edit));
                     }
                 }

crates/ruff_linter/src/codes.rs

@@ -5,7 +5,6 @@
 use std::fmt::Formatter;
 
 use ruff_db::diagnostic::SecondaryCode;
-use serde::Serialize;
 use strum_macros::EnumIter;
 
 use crate::registry::Linter;
@@ -75,7 +74,7 @@ impl serde::Serialize for NoqaCode {
     }
 }
 
-#[derive(Debug, Copy, Clone, Serialize)]
+#[derive(Debug, Copy, Clone)]
 pub enum RuleGroup {
     /// The rule is stable.
     Stable,
@@ -989,7 +988,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (FastApi, "003") => (RuleGroup::Stable, rules::fastapi::rules::FastApiUnusedPathParameter),
 
         // pydoclint
-        (Pydoclint, "102") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringExtraneousParameter),
         (Pydoclint, "201") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringMissingReturns),
         (Pydoclint, "202") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringExtraneousReturns),
         (Pydoclint, "402") => (RuleGroup::Preview, rules::pydoclint::rules::DocstringMissingYields),

crates/ruff_linter/src/fs.rs

@@ -11,7 +11,8 @@ use crate::settings::types::CompiledPerFileIgnoreList;
 pub fn get_cwd() -> &'static Path {
     #[cfg(target_arch = "wasm32")]
     {
-        Path::new(".")
+        static CWD: std::sync::LazyLock<PathBuf> = std::sync::LazyLock::new(|| PathBuf::from("."));
+        &CWD
     }
     #[cfg(not(target_arch = "wasm32"))]
     path_absolutize::path_dedot::CWD.as_path()

crates/ruff_linter/src/linter.rs

@@ -24,6 +24,7 @@ use crate::checkers::tokens::check_tokens;
 use crate::directives::Directives;
 use crate::doc_lines::{doc_lines_from_ast, doc_lines_from_tokens};
 use crate::fix::{FixResult, fix_file};
+use crate::message::create_syntax_error_diagnostic;
 use crate::noqa::add_noqa;
 use crate::package::PackageRoot;
 use crate::registry::Rule;
@@ -495,15 +496,15 @@ fn diagnostics_to_messages(
     parse_errors
         .iter()
         .map(|parse_error| {
-            Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
+            create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
         })
         .chain(unsupported_syntax_errors.iter().map(|syntax_error| {
-            Diagnostic::invalid_syntax(source_file.clone(), syntax_error, syntax_error)
+            create_syntax_error_diagnostic(source_file.clone(), syntax_error, syntax_error)
         }))
         .chain(
             semantic_syntax_errors
                 .iter()
-                .map(|error| Diagnostic::invalid_syntax(source_file.clone(), error, error)),
+                .map(|error| create_syntax_error_diagnostic(source_file.clone(), error, error)),
         )
         .chain(diagnostics.into_iter().map(|mut diagnostic| {
             if let Some(range) = diagnostic.range() {

crates/ruff_linter/src/message/mod.rs

@@ -16,7 +16,7 @@ use ruff_db::files::File;
 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::{SourceFile, SourceFileBuilder};
-use ruff_text_size::{TextRange, TextSize};
+use ruff_text_size::{Ranged, TextRange, TextSize};
 pub use sarif::SarifEmitter;
 
 use crate::Fix;
@@ -26,6 +26,24 @@ use crate::settings::types::{OutputFormat, RuffOutputFormat};
 mod grouped;
 mod sarif;
 
+/// Creates a `Diagnostic` from a syntax error, with the format expected by Ruff.
+///
+/// This is almost identical to `ruff_db::diagnostic::create_syntax_error_diagnostic`, except the
+/// `message` is stored as the primary diagnostic message instead of on the primary annotation.
+///
+/// TODO(brent) These should be unified at some point, but we keep them separate for now to avoid a
+/// ton of snapshot changes while combining ruff's diagnostic type with `Diagnostic`.
+pub fn create_syntax_error_diagnostic(
+    span: impl Into<Span>,
+    message: impl std::fmt::Display,
+    range: impl Ranged,
+) -> Diagnostic {
+    let mut diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
+    let span = span.into().with_range(range.range());
+    diag.annotate(Annotation::primary(span));
+    diag
+}
+
 /// Create a `Diagnostic` from a panic.
 pub fn create_panic_diagnostic(error: &PanicError, path: Option<&Path>) -> Diagnostic {
     let mut diagnostic = Diagnostic::new(
@@ -242,6 +260,8 @@ mod tests {
     use crate::message::{Emitter, EmitterContext, create_lint_diagnostic};
     use crate::{Edit, Fix};
 
+    use super::create_syntax_error_diagnostic;
+
     pub(super) fn create_syntax_error_diagnostics() -> Vec<Diagnostic> {
         let source = r"from os import
 
@@ -254,7 +274,7 @@ if call(foo
             .errors()
             .iter()
             .map(|parse_error| {
-                Diagnostic::invalid_syntax(source_file.clone(), &parse_error.error, parse_error)
+                create_syntax_error_diagnostic(source_file.clone(), &parse_error.error, parse_error)
             })
             .collect()
     }

crates/ruff_linter/src/preview.rs

@@ -242,11 +242,6 @@ pub(crate) const fn is_refined_submodule_import_match_enabled(settings: &LinterS
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/20660
-pub(crate) const fn is_type_var_default_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // github.com/astral-sh/ruff/issues/20004
 pub(crate) const fn is_b006_check_guaranteed_mutable_expr_enabled(
     settings: &LinterSettings,
@@ -270,12 +265,3 @@ pub(crate) const fn is_fix_read_whole_file_enabled(settings: &LinterSettings) ->
 pub(crate) const fn is_fix_write_whole_file_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
-
-pub(crate) const fn is_typing_extensions_str_alias_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19045
-pub(crate) const fn is_extended_i18n_function_matching_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}

crates/ruff_linter/src/rule_selector.rs

@@ -257,8 +257,9 @@ pub struct PreviewOptions {
 #[cfg(feature = "schemars")]
 mod schema {
     use itertools::Itertools;
-    use schemars::{JsonSchema, Schema, SchemaGenerator};
-    use serde_json::Value;
+    use schemars::_serde_json::Value;
+    use schemars::JsonSchema;
+    use schemars::schema::{InstanceType, Schema, SchemaObject};
     use strum::IntoEnumIterator;
 
     use crate::RuleSelector;
@@ -266,65 +267,64 @@ mod schema {
     use crate::rule_selector::{Linter, RuleCodePrefix};
 
     impl JsonSchema for RuleSelector {
-        fn schema_name() -> std::borrow::Cow<'static, str> {
-            std::borrow::Cow::Borrowed("RuleSelector")
+        fn schema_name() -> String {
+            "RuleSelector".to_string()
         }
 
-        fn json_schema(_gen: &mut SchemaGenerator) -> Schema {
-            let enum_values: Vec<String> = [
-                // Include the non-standard "ALL" selectors.
-                "ALL".to_string(),
-                // Include the legacy "C" and "T" selectors.
-                "C".to_string(),
-                "T".to_string(),
-                // Include some common redirect targets for those legacy selectors.
-                "C9".to_string(),
-                "T1".to_string(),
-                "T2".to_string(),
-            ]
-            .into_iter()
-            .chain(
-                RuleCodePrefix::iter()
-                    .map(|p| {
-                        let prefix = p.linter().common_prefix();
-                        let code = p.short_code();
-                        format!("{prefix}{code}")
+        fn json_schema(_gen: &mut schemars::r#gen::SchemaGenerator) -> Schema {
+            Schema::Object(SchemaObject {
+                instance_type: Some(InstanceType::String.into()),
+                enum_values: Some(
+                    [
+                        // Include the non-standard "ALL" selectors.
+                        "ALL".to_string(),
+                        // Include the legacy "C" and "T" selectors.
+                        "C".to_string(),
+                        "T".to_string(),
+                        // Include some common redirect targets for those legacy selectors.
+                        "C9".to_string(),
+                        "T1".to_string(),
+                        "T2".to_string(),
+                    ]
+                    .into_iter()
+                    .chain(
+                        RuleCodePrefix::iter()
+                            .map(|p| {
+                                let prefix = p.linter().common_prefix();
+                                let code = p.short_code();
+                                format!("{prefix}{code}")
+                            })
+                            .chain(Linter::iter().filter_map(|l| {
+                                let prefix = l.common_prefix();
+                                (!prefix.is_empty()).then(|| prefix.to_string())
+                            })),
+                    )
+                    .filter(|p| {
+                        // Exclude any prefixes where all of the rules are removed
+                        if let Ok(Self::Rule { prefix, .. } | Self::Prefix { prefix, .. }) =
+                            RuleSelector::parse_no_redirect(p)
+                        {
+                            !prefix.rules().all(|rule| rule.is_removed())
+                        } else {
+                            true
+                        }
                     })
-                    .chain(Linter::iter().filter_map(|l| {
-                        let prefix = l.common_prefix();
-                        (!prefix.is_empty()).then(|| prefix.to_string())
-                    })),
-            )
-            .filter(|p| {
-                // Exclude any prefixes where all of the rules are removed
-                if let Ok(Self::Rule { prefix, .. } | Self::Prefix { prefix, .. }) =
-                    RuleSelector::parse_no_redirect(p)
-                {
-                    !prefix.rules().all(|rule| rule.is_removed())
-                } else {
-                    true
-                }
+                    .filter(|_rule| {
+                        // Filter out all test-only rules
+                        #[cfg(any(feature = "test-rules", test))]
+                        #[expect(clippy::used_underscore_binding)]
+                        if _rule.starts_with("RUF9") || _rule == "PLW0101" {
+                            return false;
+                        }
+
+                        true
+                    })
+                    .sorted()
+                    .map(Value::String)
+                    .collect(),
+                ),
+                ..SchemaObject::default()
             })
-            .filter(|_rule| {
-                // Filter out all test-only rules
-                #[cfg(any(feature = "test-rules", test))]
-                #[expect(clippy::used_underscore_binding)]
-                if _rule.starts_with("RUF9") || _rule == "PLW0101" {
-                    return false;
-                }
-
-                true
-            })
-            .sorted()
-            .collect();
-
-            let mut schema = schemars::json_schema!({ "type": "string" });
-            schema.ensure_object().insert(
-                "enum".to_string(),
-                Value::Array(enum_values.into_iter().map(Value::String).collect()),
-            );
-
-            schema
         }
     }
 }

crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs

@@ -655,11 +655,6 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         },
         // airflow.datasets
         ["airflow", "datasets", "DatasetAliasEvent"] => Replacement::None,
-        ["airflow", "datasets", "DatasetEvent"] => Replacement::Message(
-            "`DatasetEvent` has been made private in Airflow 3. \
-             Use `dict[str, Any]` for the time being. \
-             An `AssetEvent` type will be added to the apache-airflow-task-sdk in a future version.",
-        ),
 
         // airflow.hooks
         ["airflow", "hooks", "base_hook", "BaseHook"] => Replacement::Rename {

crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap

@@ -104,49 +104,38 @@ AIR301 `airflow.datasets.DatasetAliasEvent` is removed in Airflow 3.0
 49 | # airflow.datasets
 50 | DatasetAliasEvent()
    | ^^^^^^^^^^^^^^^^^
-51 | DatasetEvent()
    |
 
-AIR301 `airflow.datasets.DatasetEvent` is removed in Airflow 3.0
-  --> AIR301_names.py:51:1
-   |
-49 | # airflow.datasets
-50 | DatasetAliasEvent()
-51 | DatasetEvent()
-   | ^^^^^^^^^^^^
-   |
-help: `DatasetEvent` has been made private in Airflow 3. Use `dict[str, Any]` for the time being. An `AssetEvent` type will be added to the apache-airflow-task-sdk in a future version.
-
 AIR301 `airflow.operators.subdag.SubDagOperator` is removed in Airflow 3.0
-  --> AIR301_names.py:55:1
+  --> AIR301_names.py:54:1
    |
-54 | # airflow.operators.subdag.*
-55 | SubDagOperator()
+53 | # airflow.operators.subdag.*
+54 | SubDagOperator()
    | ^^^^^^^^^^^^^^
-56 |
-57 | # airflow.operators.postgres_operator
+55 |
+56 | # airflow.operators.postgres_operator
    |
 help: The whole `airflow.subdag` module has been removed.
 
 AIR301 `airflow.operators.postgres_operator.Mapping` is removed in Airflow 3.0
-  --> AIR301_names.py:58:1
+  --> AIR301_names.py:57:1
    |
-57 | # airflow.operators.postgres_operator
-58 | Mapping()
+56 | # airflow.operators.postgres_operator
+57 | Mapping()
    | ^^^^^^^
-59 |
-60 | # airflow.secrets
+58 |
+59 | # airflow.secrets
    |
 
 AIR301 [*] `airflow.secrets.cache.SecretCache` is removed in Airflow 3.0
-  --> AIR301_names.py:65:1
+  --> AIR301_names.py:64:1
    |
-64 | # airflow.secrets.cache
-65 | SecretCache()
+63 | # airflow.secrets.cache
+64 | SecretCache()
    | ^^^^^^^^^^^
    |
 help: Use `SecretCache` from `airflow.sdk` instead.
-14 | from airflow.datasets import DatasetAliasEvent, DatasetEvent
+14 | from airflow.datasets import DatasetAliasEvent
 15 | from airflow.operators.postgres_operator import Mapping
 16 | from airflow.operators.subdag import SubDagOperator
    - from airflow.secrets.cache import SecretCache
@@ -164,211 +153,211 @@ help: Use `SecretCache` from `airflow.sdk` instead.
 note: This is an unsafe fix and may change runtime behavior
 
 AIR301 `airflow.triggers.external_task.TaskStateTrigger` is removed in Airflow 3.0
-  --> AIR301_names.py:69:1
+  --> AIR301_names.py:68:1
    |
-68 | # airflow.triggers.external_task
-69 | TaskStateTrigger()
+67 | # airflow.triggers.external_task
+68 | TaskStateTrigger()
    | ^^^^^^^^^^^^^^^^
-70 |
-71 | # airflow.utils.date
+69 |
+70 | # airflow.utils.date
    |
 
 AIR301 `airflow.utils.dates.date_range` is removed in Airflow 3.0
-  --> AIR301_names.py:72:1
+  --> AIR301_names.py:71:1
    |
-71 | # airflow.utils.date
-72 | dates.date_range
+70 | # airflow.utils.date
+71 | dates.date_range
    | ^^^^^^^^^^^^^^^^
-73 | dates.days_ago
+72 | dates.days_ago
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:73:1
+  --> AIR301_names.py:72:1
    |
-71 | # airflow.utils.date
-72 | dates.date_range
-73 | dates.days_ago
+70 | # airflow.utils.date
+71 | dates.date_range
+72 | dates.days_ago
    | ^^^^^^^^^^^^^^
-74 |
-75 | date_range
+73 |
+74 | date_range
    |
 help: Use `pendulum.today('UTC').add(days=-N, ...)` instead
 
 AIR301 `airflow.utils.dates.date_range` is removed in Airflow 3.0
-  --> AIR301_names.py:75:1
+  --> AIR301_names.py:74:1
    |
-73 | dates.days_ago
-74 |
-75 | date_range
+72 | dates.days_ago
+73 |
+74 | date_range
    | ^^^^^^^^^^
-76 | days_ago
-77 | infer_time_unit
+75 | days_ago
+76 | infer_time_unit
    |
 
 AIR301 `airflow.utils.dates.days_ago` is removed in Airflow 3.0
-  --> AIR301_names.py:76:1
+  --> AIR301_names.py:75:1
    |
-75 | date_range
-76 | days_ago
+74 | date_range
+75 | days_ago
    | ^^^^^^^^
-77 | infer_time_unit
-78 | parse_execution_date
+76 | infer_time_unit
+77 | parse_execution_date
    |
 help: Use `pendulum.today('UTC').add(days=-N, ...)` instead
 
 AIR301 `airflow.utils.dates.infer_time_unit` is removed in Airflow 3.0
-  --> AIR301_names.py:77:1
+  --> AIR301_names.py:76:1
    |
-75 | date_range
-76 | days_ago
-77 | infer_time_unit
+74 | date_range
+75 | days_ago
+76 | infer_time_unit
    | ^^^^^^^^^^^^^^^
-78 | parse_execution_date
-79 | round_time
+77 | parse_execution_date
+78 | round_time
    |
 
 AIR301 `airflow.utils.dates.parse_execution_date` is removed in Airflow 3.0
-  --> AIR301_names.py:78:1
+  --> AIR301_names.py:77:1
    |
-76 | days_ago
-77 | infer_time_unit
-78 | parse_execution_date
+75 | days_ago
+76 | infer_time_unit
+77 | parse_execution_date
    | ^^^^^^^^^^^^^^^^^^^^
-79 | round_time
-80 | scale_time_units
+78 | round_time
+79 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.round_time` is removed in Airflow 3.0
-  --> AIR301_names.py:79:1
+  --> AIR301_names.py:78:1
    |
-77 | infer_time_unit
-78 | parse_execution_date
-79 | round_time
+76 | infer_time_unit
+77 | parse_execution_date
+78 | round_time
    | ^^^^^^^^^^
-80 | scale_time_units
+79 | scale_time_units
    |
 
 AIR301 `airflow.utils.dates.scale_time_units` is removed in Airflow 3.0
-  --> AIR301_names.py:80:1
+  --> AIR301_names.py:79:1
    |
-78 | parse_execution_date
-79 | round_time
-80 | scale_time_units
+77 | parse_execution_date
+78 | round_time
+79 | scale_time_units
    | ^^^^^^^^^^^^^^^^
-81 |
-82 | # This one was not deprecated.
+80 |
+81 | # This one was not deprecated.
    |
 
 AIR301 `airflow.utils.dag_cycle_tester.test_cycle` is removed in Airflow 3.0
-  --> AIR301_names.py:87:1
+  --> AIR301_names.py:86:1
    |
-86 | # airflow.utils.dag_cycle_tester
-87 | test_cycle
+85 | # airflow.utils.dag_cycle_tester
+86 | test_cycle
    | ^^^^^^^^^^
    |
 
 AIR301 `airflow.utils.db.create_session` is removed in Airflow 3.0
-  --> AIR301_names.py:91:1
+  --> AIR301_names.py:90:1
    |
-90 | # airflow.utils.db
-91 | create_session
+89 | # airflow.utils.db
+90 | create_session
    | ^^^^^^^^^^^^^^
-92 |
-93 | # airflow.utils.decorators
+91 |
+92 | # airflow.utils.decorators
    |
 
 AIR301 `airflow.utils.decorators.apply_defaults` is removed in Airflow 3.0
-  --> AIR301_names.py:94:1
+  --> AIR301_names.py:93:1
    |
-93 | # airflow.utils.decorators
-94 | apply_defaults
+92 | # airflow.utils.decorators
+93 | apply_defaults
    | ^^^^^^^^^^^^^^
-95 |
-96 | # airflow.utils.file
+94 |
+95 | # airflow.utils.file
    |
 help: `apply_defaults` is now unconditionally done and can be safely removed.
 
 AIR301 `airflow.utils.file.mkdirs` is removed in Airflow 3.0
-  --> AIR301_names.py:97:1
+  --> AIR301_names.py:96:1
    |
-96 | # airflow.utils.file
-97 | mkdirs
+95 | # airflow.utils.file
+96 | mkdirs
    | ^^^^^^
    |
 help: Use `pathlib.Path({path}).mkdir` instead
 
 AIR301 `airflow.utils.state.SHUTDOWN` is removed in Airflow 3.0
-   --> AIR301_names.py:101:1
+   --> AIR301_names.py:100:1
     |
-100 | # airflow.utils.state
-101 | SHUTDOWN
+ 99 | # airflow.utils.state
+100 | SHUTDOWN
     | ^^^^^^^^
-102 | terminating_states
+101 | terminating_states
     |
 
 AIR301 `airflow.utils.state.terminating_states` is removed in Airflow 3.0
-   --> AIR301_names.py:102:1
+   --> AIR301_names.py:101:1
     |
-100 | # airflow.utils.state
-101 | SHUTDOWN
-102 | terminating_states
+ 99 | # airflow.utils.state
+100 | SHUTDOWN
+101 | terminating_states
     | ^^^^^^^^^^^^^^^^^^
-103 |
-104 | #  airflow.utils.trigger_rule
+102 |
+103 | #  airflow.utils.trigger_rule
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.DUMMY` is removed in Airflow 3.0
-   --> AIR301_names.py:105:1
+   --> AIR301_names.py:104:1
     |
-104 | #  airflow.utils.trigger_rule
-105 | TriggerRule.DUMMY
+103 | #  airflow.utils.trigger_rule
+104 | TriggerRule.DUMMY
     | ^^^^^^^^^^^^^^^^^
-106 | TriggerRule.NONE_FAILED_OR_SKIPPED
+105 | TriggerRule.NONE_FAILED_OR_SKIPPED
     |
 
 AIR301 `airflow.utils.trigger_rule.TriggerRule.NONE_FAILED_OR_SKIPPED` is removed in Airflow 3.0
-   --> AIR301_names.py:106:1
+   --> AIR301_names.py:105:1
     |
-104 | #  airflow.utils.trigger_rule
-105 | TriggerRule.DUMMY
-106 | TriggerRule.NONE_FAILED_OR_SKIPPED
+103 | #  airflow.utils.trigger_rule
+104 | TriggerRule.DUMMY
+105 | TriggerRule.NONE_FAILED_OR_SKIPPED
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
 
 AIR301 `airflow.www.auth.has_access` is removed in Airflow 3.0
-   --> AIR301_names.py:110:1
+   --> AIR301_names.py:109:1
     |
-109 | # airflow.www.auth
-110 | has_access
+108 | # airflow.www.auth
+109 | has_access
     | ^^^^^^^^^^
-111 | has_access_dataset
+110 | has_access_dataset
     |
 
 AIR301 `airflow.www.auth.has_access_dataset` is removed in Airflow 3.0
-   --> AIR301_names.py:111:1
+   --> AIR301_names.py:110:1
     |
-109 | # airflow.www.auth
-110 | has_access
-111 | has_access_dataset
+108 | # airflow.www.auth
+109 | has_access
+110 | has_access_dataset
     | ^^^^^^^^^^^^^^^^^^
-112 |
-113 | # airflow.www.utils
+111 |
+112 | # airflow.www.utils
     |
 
 AIR301 `airflow.www.utils.get_sensitive_variables_fields` is removed in Airflow 3.0
-   --> AIR301_names.py:114:1
+   --> AIR301_names.py:113:1
     |
-113 | # airflow.www.utils
-114 | get_sensitive_variables_fields
+112 | # airflow.www.utils
+113 | get_sensitive_variables_fields
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-115 | should_hide_value_for_key
+114 | should_hide_value_for_key
     |
 
 AIR301 `airflow.www.utils.should_hide_value_for_key` is removed in Airflow 3.0
-   --> AIR301_names.py:115:1
+   --> AIR301_names.py:114:1
     |
-113 | # airflow.www.utils
-114 | get_sensitive_variables_fields
-115 | should_hide_value_for_key
+112 | # airflow.www.utils
+113 | get_sensitive_variables_fields
+114 | should_hide_value_for_key
     | ^^^^^^^^^^^^^^^^^^^^^^^^^
     |

crates/ruff_linter/src/rules/fastapi/mod.rs

@@ -18,7 +18,6 @@ mod tests {
     #[test_case(Rule::FastApiRedundantResponseModel, Path::new("FAST001.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_0.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_1.py"))]
-    #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_2.py"))]
     #[test_case(Rule::FastApiUnusedPathParameter, Path::new("FAST003.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.name(), path.to_string_lossy());
@@ -57,7 +56,6 @@ mod tests {
     // since `typing.Annotated` was added in Python 3.9
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_0.py"))]
     #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_1.py"))]
-    #[test_case(Rule::FastApiNonAnnotatedDependency, Path::new("FAST002_2.py"))]
     fn rules_py38(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}_py38", rule_code.name(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff_linter/src/rules/fastapi/rules/fastapi_non_annotated_dependency.rs

@@ -275,42 +275,19 @@ fn create_diagnostic(
                     .collect::<Vec<_>>()
                     .join(", ");
 
-                // Check if the default argument is ellipsis (...), which in FastAPI means "required"
-                let is_default_argument_ellipsis = matches!(
-                    dependency_call.default_argument.value(),
-                    ast::Expr::EllipsisLiteral(_)
-                );
-
-                if is_default_argument_ellipsis && seen_default {
-                    // For ellipsis after a parameter with default, can't remove the default
-                    return Ok(None);
-                }
-
-                if !is_default_argument_ellipsis {
-                    // For actual default values, mark that we've seen a default
-                    seen_default = true;
-                }
-
-                let base_format = format!(
-                    "{parameter_name}: {binding}[{annotation}, {default_}({kwarg_list})]",
+                seen_default = true;
+                format!(
+                    "{parameter_name}: {binding}[{annotation}, {default_}({kwarg_list})] \
+                            = {default_value}",
                     parameter_name = parameter.name,
                     annotation = checker.locator().slice(parameter.annotation.range()),
                     default_ = checker
                         .locator()
                         .slice(map_callable(parameter.default).range()),
-                );
-
-                if is_default_argument_ellipsis {
-                    // For ellipsis, don't add a default value since the parameter
-                    // should remain required after conversion to Annotated
-                    base_format
-                } else {
-                    // For actual default values, preserve them
-                    let default_value = checker
+                    default_value = checker
                         .locator()
-                        .slice(dependency_call.default_argument.value().range());
-                    format!("{base_format} = {default_value}")
-                }
+                        .slice(dependency_call.default_argument.value().range()),
+                )
             }
             _ => {
                 if seen_default {

crates/ruff_linter/src/rules/fastapi/rules/fastapi_unused_path_parameter.rs

@@ -1,7 +1,6 @@
+use std::iter::Peekable;
 use std::ops::Range;
-use std::sync::LazyLock;
-
-use regex::{CaptureMatches, Regex};
+use std::str::CharIndices;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast as ast;
@@ -166,6 +165,11 @@ pub(crate) fn fastapi_unused_path_parameter(
 
     // Check if any of the path parameters are not in the function signature.
     for (path_param, range) in path_params {
+        // Ignore invalid identifiers (e.g., `user-id`, as opposed to `user_id`)
+        if !is_identifier(path_param) {
+            continue;
+        }
+
         // If the path parameter is already in the function or the dependency signature,
         // we don't need to do anything.
         if named_args.contains(&path_param) {
@@ -192,7 +196,7 @@ pub(crate) fn fastapi_unused_path_parameter(
                 .add_start(TextSize::from(range.start as u32 + 1))
                 .sub_end(TextSize::from((path.len() - range.end + 1) as u32)),
         );
-        if !is_positional && is_identifier(path_param) && path_param != "__debug__" {
+        if !is_positional {
             diagnostic.set_fix(Fix::unsafe_edit(add_parameter(
                 path_param,
                 &function_def.parameters,
@@ -457,19 +461,15 @@ fn parameter_alias<'a>(parameter: &'a Parameter, semantic: &SemanticModel) -> Op
 /// the parameter name. For example, `/{x}` is a valid parameter, but `/{ x }` is treated literally.
 #[derive(Debug)]
 struct PathParamIterator<'a> {
-    inner: CaptureMatches<'a, 'a>,
+    input: &'a str,
+    chars: Peekable<CharIndices<'a>>,
 }
 
 impl<'a> PathParamIterator<'a> {
     fn new(input: &'a str) -> Self {
-        /// Matches the Starlette pattern for path parameters with optional converters from
-        /// <https://github.com/Kludex/starlette/blob/e18637c68e36d112b1983bc0c8b663681e6a4c50/starlette/routing.py#L121>
-        static FASTAPI_PATH_PARAM_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-            Regex::new(r"\{([a-zA-Z_][a-zA-Z0-9_]*)(?::[a-zA-Z_][a-zA-Z0-9_]*)?\}").unwrap()
-        });
-
-        Self {
-            inner: FASTAPI_PATH_PARAM_REGEX.captures_iter(input),
+        PathParamIterator {
+            input,
+            chars: input.char_indices().peekable(),
         }
     }
 }
@@ -478,10 +478,19 @@ impl<'a> Iterator for PathParamIterator<'a> {
     type Item = (&'a str, Range<usize>);
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.inner
-            .next()
-            // Extract the first capture group (the path parameter), but return the range of the
-            // whole match (everything in braces and including the braces themselves).
-            .and_then(|capture| Some((capture.get(1)?.as_str(), capture.get(0)?.range())))
+        while let Some((start, c)) = self.chars.next() {
+            if c == '{' {
+                if let Some((end, _)) = self.chars.by_ref().find(|&(_, ch)| ch == '}') {
+                    let param_content = &self.input[start + 1..end];
+                    // We ignore text after a colon, since those are path converters
+                    // See also: https://fastapi.tiangolo.com/tutorial/path-params/?h=path#path-convertor
+                    let param_name_end = param_content.find(':').unwrap_or(param_content.len());
+                    let param_name = &param_content[..param_name_end];
+
+                    return Some((param_name, start..end + 1));
+                }
+            }
+        }
+        None
     }
 }

crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py.snap

@@ -1,303 +0,0 @@
----
-source: crates/ruff_linter/src/rules/fastapi/mod.rs
----
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:14:5
-   |
-12 | async def test_ellipsis_query(
-13 |     # This should become: param: Annotated[str, Query(description="Test param")]
-14 |     param: str = Query(..., description="Test param"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15 | ) -> str:
-16 |     return param
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-12 | @app.get("/test1")
-13 | async def test_ellipsis_query(
-14 |     # This should become: param: Annotated[str, Query(description="Test param")]
-   -     param: str = Query(..., description="Test param"),
-15 +     param: Annotated[str, Query(description="Test param")],
-16 | ) -> str:
-17 |     return param
-18 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:22:5
-   |
-20 | async def test_ellipsis_header(
-21 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
-22 |     auth: str = Header(..., description="Auth header"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23 | ) -> str:
-24 |     return auth
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-20 | @app.get("/test2")
-21 | async def test_ellipsis_header(
-22 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
-   -     auth: str = Header(..., description="Auth header"),
-23 +     auth: Annotated[str, Header(description="Auth header")],
-24 | ) -> str:
-25 |     return auth
-26 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:30:5
-   |
-28 | async def test_ellipsis_body(
-29 |     # This should become: data: Annotated[dict, Body(description="Request body")]
-30 |     data: dict = Body(..., description="Request body"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-31 | ) -> dict:
-32 |     return data
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-28 | @app.post("/test3")
-29 | async def test_ellipsis_body(
-30 |     # This should become: data: Annotated[dict, Body(description="Request body")]
-   -     data: dict = Body(..., description="Request body"),
-31 +     data: Annotated[dict, Body(description="Request body")],
-32 | ) -> dict:
-33 |     return data
-34 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:38:5
-   |
-36 | async def test_ellipsis_cookie(
-37 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
-38 |     session: str = Cookie(..., description="Session ID"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-39 | ) -> str:
-40 |     return session
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-36 | @app.get("/test4")
-37 | async def test_ellipsis_cookie(
-38 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
-   -     session: str = Cookie(..., description="Session ID"),
-39 +     session: Annotated[str, Cookie(description="Session ID")],
-40 | ) -> str:
-41 |     return session
-42 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:46:5
-   |
-44 | async def test_simple_ellipsis(
-45 |     # This should become: id: Annotated[str, Query()]
-46 |     id: str = Query(...),
-   |     ^^^^^^^^^^^^^^^^^^^^
-47 | ) -> str:
-48 |     return id
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-44 | @app.get("/test5")
-45 | async def test_simple_ellipsis(
-46 |     # This should become: id: Annotated[str, Query()]
-   -     id: str = Query(...),
-47 +     id: Annotated[str, Query()],
-48 | ) -> str:
-49 |     return id
-50 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:54:5
-   |
-52 | async def test_multiple_kwargs_with_ellipsis(
-53 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
-54 |     param: str = Query(..., description="Test", min_length=1, max_length=10),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-55 | ) -> str:
-56 |     return param
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-52 | @app.get("/test6")
-53 | async def test_multiple_kwargs_with_ellipsis(
-54 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
-   -     param: str = Query(..., description="Test", min_length=1, max_length=10),
-55 +     param: Annotated[str, Query(description="Test", min_length=1, max_length=10)],
-56 | ) -> str:
-57 |     return param
-58 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:65:5
-   |
-63 | async def test_with_default_value(
-64 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
-65 |     param: str = Query("default", description="Test"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-66 | ) -> str:
-67 |     return param
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-63 | @app.get("/test7")
-64 | async def test_with_default_value(
-65 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
-   -     param: str = Query("default", description="Test"),
-66 +     param: Annotated[str, Query(description="Test")] = "default",
-67 | ) -> str:
-68 |     return param
-69 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:73:5
-   |
-71 | async def test_with_default_none(
-72 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
-73 |     param: str | None = Query(None, description="Test"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-74 | ) -> str:
-75 |     return param or "empty"
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-71 | @app.get("/test8")
-72 | async def test_with_default_none(
-73 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
-   -     param: str | None = Query(None, description="Test"),
-74 +     param: Annotated[str | None, Query(description="Test")] = None,
-75 | ) -> str:
-76 |     return param or "empty"
-77 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:81:5
-   |
-79 | async def test_mixed_parameters(
-80 |     # First param should be fixed with default preserved  
-81 |     optional_param: str = Query("default", description="Optional"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-82 |     # Second param should not be fixed because of the preceding default
-83 |     required_param: str = Query(..., description="Required"),
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-79 | @app.get("/test9")
-80 | async def test_mixed_parameters(
-81 |     # First param should be fixed with default preserved  
-   -     optional_param: str = Query("default", description="Optional"),
-82 +     optional_param: Annotated[str, Query(description="Optional")] = "default",
-83 |     # Second param should not be fixed because of the preceding default
-84 |     required_param: str = Query(..., description="Required"),
-85 |     # Third param should be fixed with default preserved
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 FastAPI dependency without `Annotated`
-  --> FAST002_2.py:83:5
-   |
-81 |     optional_param: str = Query("default", description="Optional"),
-82 |     # Second param should not be fixed because of the preceding default
-83 |     required_param: str = Query(..., description="Required"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-84 |     # Third param should be fixed with default preserved
-85 |     another_optional_param: int = Query(42, description="Another optional"),
-   |
-help: Replace with `typing.Annotated`
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:85:5
-   |
-83 |     required_param: str = Query(..., description="Required"),
-84 |     # Third param should be fixed with default preserved
-85 |     another_optional_param: int = Query(42, description="Another optional"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-86 | ) -> str:
-87 |     return f"{required_param}-{optional_param}-{another_optional_param}"
-   |
-help: Replace with `typing.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-83 |     # Second param should not be fixed because of the preceding default
-84 |     required_param: str = Query(..., description="Required"),
-85 |     # Third param should be fixed with default preserved
-   -     another_optional_param: int = Query(42, description="Another optional"),
-86 +     another_optional_param: Annotated[int, Query(description="Another optional")] = 42,
-87 | ) -> str:
-88 |     return f"{required_param}-{optional_param}-{another_optional_param}"
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_2.py_py38.snap

@@ -1,303 +0,0 @@
----
-source: crates/ruff_linter/src/rules/fastapi/mod.rs
----
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:14:5
-   |
-12 | async def test_ellipsis_query(
-13 |     # This should become: param: Annotated[str, Query(description="Test param")]
-14 |     param: str = Query(..., description="Test param"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-15 | ) -> str:
-16 |     return param
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-12 | @app.get("/test1")
-13 | async def test_ellipsis_query(
-14 |     # This should become: param: Annotated[str, Query(description="Test param")]
-   -     param: str = Query(..., description="Test param"),
-15 +     param: Annotated[str, Query(description="Test param")],
-16 | ) -> str:
-17 |     return param
-18 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:22:5
-   |
-20 | async def test_ellipsis_header(
-21 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
-22 |     auth: str = Header(..., description="Auth header"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23 | ) -> str:
-24 |     return auth
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-20 | @app.get("/test2")
-21 | async def test_ellipsis_header(
-22 |     # This should become: auth: Annotated[str, Header(description="Auth header")]
-   -     auth: str = Header(..., description="Auth header"),
-23 +     auth: Annotated[str, Header(description="Auth header")],
-24 | ) -> str:
-25 |     return auth
-26 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:30:5
-   |
-28 | async def test_ellipsis_body(
-29 |     # This should become: data: Annotated[dict, Body(description="Request body")]
-30 |     data: dict = Body(..., description="Request body"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-31 | ) -> dict:
-32 |     return data
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-28 | @app.post("/test3")
-29 | async def test_ellipsis_body(
-30 |     # This should become: data: Annotated[dict, Body(description="Request body")]
-   -     data: dict = Body(..., description="Request body"),
-31 +     data: Annotated[dict, Body(description="Request body")],
-32 | ) -> dict:
-33 |     return data
-34 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:38:5
-   |
-36 | async def test_ellipsis_cookie(
-37 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
-38 |     session: str = Cookie(..., description="Session ID"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-39 | ) -> str:
-40 |     return session
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-36 | @app.get("/test4")
-37 | async def test_ellipsis_cookie(
-38 |     # This should become: session: Annotated[str, Cookie(description="Session ID")]
-   -     session: str = Cookie(..., description="Session ID"),
-39 +     session: Annotated[str, Cookie(description="Session ID")],
-40 | ) -> str:
-41 |     return session
-42 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:46:5
-   |
-44 | async def test_simple_ellipsis(
-45 |     # This should become: id: Annotated[str, Query()]
-46 |     id: str = Query(...),
-   |     ^^^^^^^^^^^^^^^^^^^^
-47 | ) -> str:
-48 |     return id
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-44 | @app.get("/test5")
-45 | async def test_simple_ellipsis(
-46 |     # This should become: id: Annotated[str, Query()]
-   -     id: str = Query(...),
-47 +     id: Annotated[str, Query()],
-48 | ) -> str:
-49 |     return id
-50 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:54:5
-   |
-52 | async def test_multiple_kwargs_with_ellipsis(
-53 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
-54 |     param: str = Query(..., description="Test", min_length=1, max_length=10),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-55 | ) -> str:
-56 |     return param
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-52 | @app.get("/test6")
-53 | async def test_multiple_kwargs_with_ellipsis(
-54 |     # This should become: param: Annotated[str, Query(description="Test", min_length=1, max_length=10)]
-   -     param: str = Query(..., description="Test", min_length=1, max_length=10),
-55 +     param: Annotated[str, Query(description="Test", min_length=1, max_length=10)],
-56 | ) -> str:
-57 |     return param
-58 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:65:5
-   |
-63 | async def test_with_default_value(
-64 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
-65 |     param: str = Query("default", description="Test"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-66 | ) -> str:
-67 |     return param
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-63 | @app.get("/test7")
-64 | async def test_with_default_value(
-65 |     # This should become: param: Annotated[str, Query(description="Test")] = "default"
-   -     param: str = Query("default", description="Test"),
-66 +     param: Annotated[str, Query(description="Test")] = "default",
-67 | ) -> str:
-68 |     return param
-69 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:73:5
-   |
-71 | async def test_with_default_none(
-72 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
-73 |     param: str | None = Query(None, description="Test"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-74 | ) -> str:
-75 |     return param or "empty"
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-71 | @app.get("/test8")
-72 | async def test_with_default_none(
-73 |     # This should become: param: Annotated[str | None, Query(description="Test")] = None
-   -     param: str | None = Query(None, description="Test"),
-74 +     param: Annotated[str | None, Query(description="Test")] = None,
-75 | ) -> str:
-76 |     return param or "empty"
-77 | 
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:81:5
-   |
-79 | async def test_mixed_parameters(
-80 |     # First param should be fixed with default preserved  
-81 |     optional_param: str = Query("default", description="Optional"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-82 |     # Second param should not be fixed because of the preceding default
-83 |     required_param: str = Query(..., description="Required"),
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-79 | @app.get("/test9")
-80 | async def test_mixed_parameters(
-81 |     # First param should be fixed with default preserved  
-   -     optional_param: str = Query("default", description="Optional"),
-82 +     optional_param: Annotated[str, Query(description="Optional")] = "default",
-83 |     # Second param should not be fixed because of the preceding default
-84 |     required_param: str = Query(..., description="Required"),
-85 |     # Third param should be fixed with default preserved
-note: This is an unsafe fix and may change runtime behavior
-
-FAST002 FastAPI dependency without `Annotated`
-  --> FAST002_2.py:83:5
-   |
-81 |     optional_param: str = Query("default", description="Optional"),
-82 |     # Second param should not be fixed because of the preceding default
-83 |     required_param: str = Query(..., description="Required"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-84 |     # Third param should be fixed with default preserved
-85 |     another_optional_param: int = Query(42, description="Another optional"),
-   |
-help: Replace with `typing_extensions.Annotated`
-
-FAST002 [*] FastAPI dependency without `Annotated`
-  --> FAST002_2.py:85:5
-   |
-83 |     required_param: str = Query(..., description="Required"),
-84 |     # Third param should be fixed with default preserved
-85 |     another_optional_param: int = Query(42, description="Another optional"),
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-86 | ) -> str:
-87 |     return f"{required_param}-{optional_param}-{another_optional_param}"
-   |
-help: Replace with `typing_extensions.Annotated`
-1  | """Test FAST002 ellipsis handling."""
-2  | 
-3  | from fastapi import Body, Cookie, FastAPI, Header, Query
-4  + from typing_extensions import Annotated
-5  | 
-6  | app = FastAPI()
-7  | 
---------------------------------------------------------------------------------
-83 |     # Second param should not be fixed because of the preceding default
-84 |     required_param: str = Query(..., description="Required"),
-85 |     # Third param should be fixed with default preserved
-   -     another_optional_param: int = Query(42, description="Another optional"),
-86 +     another_optional_param: Annotated[int, Query(description="Another optional")] = 42,
-87 | ) -> str:
-88 |     return f"{required_param}-{optional_param}-{another_optional_param}"
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap

@@ -363,26 +363,3 @@ help: Add `id` to function signature
 206 | 
 207 | # No errors
 note: This is an unsafe fix and may change runtime behavior
-
-FAST003 Parameter `import` appears in route path, but not in `get_import` signature
-   --> FAST003.py:261:20
-    |
-260 | # https://github.com/astral-sh/ruff/issues/20941
-261 | @app.get("/imports/{import}")
-    |                    ^^^^^^^^
-262 | async def get_import():
-263 |     ...
-    |
-help: Add `import` to function signature
-
-FAST003 Parameter `__debug__` appears in route path, but not in `get_debug` signature
-   --> FAST003.py:265:18
-    |
-263 |     ...
-264 |
-265 | @app.get("/debug/{__debug__}")
-    |                  ^^^^^^^^^^^
-266 | async def get_debug():
-267 |     ...
-    |
-help: Add `__debug__` to function signature

crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs

@@ -1091,12 +1091,9 @@ fn suspicious_function(
         ] => checker.report_diagnostic_if_enabled(SuspiciousInsecureCipherModeUsage, range),
 
         // Mktemp
-        ["tempfile", "mktemp"] => checker
-            .report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
-            .map(|mut diagnostic| {
-                diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
-                diagnostic
-            }),
+        ["tempfile", "mktemp"] => {
+            checker.report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
+        }
 
         // Eval
         ["" | "builtins", "eval"] => {

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S602_S602.py.snap

@@ -127,44 +127,3 @@ S602 `subprocess` call with `shell=True` identified, security issue
 21 |
 22 | # Check dict display with only double-starred expressions can be falsey.
    |
-
-S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
-  --> S602.py:38:1
-   |
-37 | # Additional truthiness cases for generator, lambda, and f-strings
-38 | Popen("true", shell=(i for i in ()))
-   | ^^^^^
-39 | Popen("true", shell=lambda: 0)
-40 | Popen("true", shell=f"{b''}")
-   |
-
-S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
-  --> S602.py:39:1
-   |
-37 | # Additional truthiness cases for generator, lambda, and f-strings
-38 | Popen("true", shell=(i for i in ()))
-39 | Popen("true", shell=lambda: 0)
-   | ^^^^^
-40 | Popen("true", shell=f"{b''}")
-41 | x = 1
-   |
-
-S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
-  --> S602.py:40:1
-   |
-38 | Popen("true", shell=(i for i in ()))
-39 | Popen("true", shell=lambda: 0)
-40 | Popen("true", shell=f"{b''}")
-   | ^^^^^
-41 | x = 1
-42 | Popen("true", shell=f"{x=}")
-   |
-
-S602 `subprocess` call with truthy `shell` seems safe, but may be changed in the future; consider rewriting without `shell`
-  --> S602.py:42:1
-   |
-40 | Popen("true", shell=f"{b''}")
-41 | x = 1
-42 | Popen("true", shell=f"{x=}")
-   | ^^^^^
-   |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S604_S604.py.snap

@@ -9,85 +9,3 @@ S604 Function call with `shell=True` parameter identified, security issue
 6 |
 7 | foo(shell={**{}})
   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:11:1
-   |
-10 | # Truthy non-bool values for `shell`
-11 | foo(shell=(i for i in ()))
-   | ^^^
-12 | foo(shell=lambda: 0)
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:12:1
-   |
-10 | # Truthy non-bool values for `shell`
-11 | foo(shell=(i for i in ()))
-12 | foo(shell=lambda: 0)
-   | ^^^
-13 |
-14 | # f-strings guaranteed non-empty
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:15:1
-   |
-14 | # f-strings guaranteed non-empty
-15 | foo(shell=f"{b''}")
-   | ^^^
-16 | x = 1
-17 | foo(shell=f"{x=}")
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:17:1
-   |
-15 | foo(shell=f"{b''}")
-16 | x = 1
-17 | foo(shell=f"{x=}")
-   | ^^^
-18 |
-19 | # Additional truthiness cases for generator, lambda, and f-strings
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:20:1
-   |
-19 | # Additional truthiness cases for generator, lambda, and f-strings
-20 | foo(shell=(i for i in ()))
-   | ^^^
-21 | foo(shell=lambda: 0)
-22 | foo(shell=f"{b''}")
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:21:1
-   |
-19 | # Additional truthiness cases for generator, lambda, and f-strings
-20 | foo(shell=(i for i in ()))
-21 | foo(shell=lambda: 0)
-   | ^^^
-22 | foo(shell=f"{b''}")
-23 | x = 1
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:22:1
-   |
-20 | foo(shell=(i for i in ()))
-21 | foo(shell=lambda: 0)
-22 | foo(shell=f"{b''}")
-   | ^^^
-23 | x = 1
-24 | foo(shell=f"{x=}")
-   |
-
-S604 Function call with truthy `shell` parameter identified, security issue
-  --> S604.py:24:1
-   |
-22 | foo(shell=f"{b''}")
-23 | x = 1
-24 | foo(shell=f"{x=}")
-   | ^^^
-   |

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S609_S609.py.snap

@@ -43,44 +43,3 @@ S609 Possible wildcard injection in call due to `*` usage
  9 |
 10 | subprocess.Popen(["chmod", "+w", "*.py"], shell={**{}})
    |
-
-S609 Possible wildcard injection in call due to `*` usage
-  --> S609.py:14:18
-   |
-13 | # Additional truthiness cases for generator, lambda, and f-strings
-14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
-   |                  ^^^^^^^^^^^^^^^
-15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
-16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
-   |
-
-S609 Possible wildcard injection in call due to `*` usage
-  --> S609.py:15:18
-   |
-13 | # Additional truthiness cases for generator, lambda, and f-strings
-14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
-15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
-   |                  ^^^^^^^^^^^^^^^
-16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
-17 | x = 1
-   |
-
-S609 Possible wildcard injection in call due to `*` usage
-  --> S609.py:16:18
-   |
-14 | subprocess.Popen("chmod +w foo*", shell=(i for i in ()))
-15 | subprocess.Popen("chmod +w foo*", shell=lambda: 0)
-16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
-   |                  ^^^^^^^^^^^^^^^
-17 | x = 1
-18 | subprocess.Popen("chmod +w foo*", shell=f"{x=}")
-   |
-
-S609 Possible wildcard injection in call due to `*` usage
-  --> S609.py:18:18
-   |
-16 | subprocess.Popen("chmod +w foo*", shell=f"{b''}")
-17 | x = 1
-18 | subprocess.Popen("chmod +w foo*", shell=f"{x=}")
-   |                  ^^^^^^^^^^^^^^^
-   |

crates/ruff_linter/src/rules/flake8_bugbear/rules/map_without_explicit_strict.rs

@@ -9,7 +9,7 @@ use crate::rules::flake8_bugbear::helpers::any_infinite_iterables;
 use crate::{AlwaysFixableViolation, Applicability, Fix};
 
 /// ## What it does
-/// Checks for `map` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
+/// Checks for `map` calls without an explicit `strict` parameter when called with two or more iterables.
 ///
 /// This rule applies to Python 3.14 and later, where `map` accepts a `strict` keyword
 /// argument. For details, see: [What’s New in Python 3.14](https://docs.python.org/dev/whatsnew/3.14.html).
@@ -62,12 +62,7 @@ pub(crate) fn map_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
 
     if semantic.match_builtin_expr(&call.func, "map")
         && call.arguments.find_keyword("strict").is_none()
-        && (
-            // at least 2 iterables (+ 1 function)
-            call.arguments.args.len() >= 3
-            // or a starred argument
-            || call.arguments.args.iter().any(ast::Expr::is_starred_expr)
-        )
+        && call.arguments.args.len() >= 3 // function + at least 2 iterables
         && !any_infinite_iterables(call.arguments.args.iter().skip(1), semantic)
     {
         checker

crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs

@@ -188,10 +188,16 @@ fn move_initialization(
     content.push_str(stylist.line_ending().as_str());
     content.push_str(stylist.indentation());
     if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
+        let annotation = if let Some(ann) = parameter.annotation() {
+            format!(": {}", locator.slice(ann))
+        } else {
+            String::new()
+        };
         let _ = write!(
             &mut content,
-            "{} = {}",
+            "{}{} = {}",
             parameter.parameter.name(),
+            annotation,
             locator.slice(
                 parenthesized_range(
                     default.into(),

crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs

@@ -9,7 +9,7 @@ use crate::rules::flake8_bugbear::helpers::any_infinite_iterables;
 use crate::{AlwaysFixableViolation, Applicability, Fix};
 
 /// ## What it does
-/// Checks for `zip` calls without an explicit `strict` parameter when called with two or more iterables, or any starred argument.
+/// Checks for `zip` calls without an explicit `strict` parameter.
 ///
 /// ## Why is this bad?
 /// By default, if the iterables passed to `zip` are of different lengths, the
@@ -58,12 +58,6 @@ pub(crate) fn zip_without_explicit_strict(checker: &Checker, call: &ast::ExprCal
 
     if semantic.match_builtin_expr(&call.func, "zip")
         && call.arguments.find_keyword("strict").is_none()
-        && (
-            // at least 2 iterables
-            call.arguments.args.len() >= 2
-            // or a starred argument
-            || call.arguments.args.iter().any(ast::Expr::is_starred_expr)
-        )
         && !any_infinite_iterables(call.arguments.args.iter(), semantic)
     {
         checker

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap

@@ -1,140 +1,204 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+assertion_line: 156
 ---
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:4:1
   |
 3 | # Errors
-4 | zip("a", "b")
-  | ^^^^^^^^^^^^^
-5 | zip("a", "b", *zip("c"))
-6 | zip(zip("a", "b"), strict=False)
+4 | zip()
+  | ^^^^^
+5 | zip(range(3))
+6 | zip("a", "b")
   |
 help: Add explicit value for parameter `strict=`
 1 | from itertools import count, cycle, repeat
 2 | 
 3 | # Errors
-  - zip("a", "b")
-4 + zip("a", "b", strict=False)
-5 | zip("a", "b", *zip("c"))
-6 | zip(zip("a", "b"), strict=False)
-7 | zip(zip("a", strict=True),"b")
+  - zip()
+4 + zip(strict=False)
+5 | zip(range(3))
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:5:1
   |
 3 | # Errors
-4 | zip("a", "b")
-5 | zip("a", "b", *zip("c"))
-  | ^^^^^^^^^^^^^^^^^^^^^^^^
-6 | zip(zip("a", "b"), strict=False)
-7 | zip(zip("a", strict=True),"b")
+4 | zip()
+5 | zip(range(3))
+  | ^^^^^^^^^^^^^
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
   |
 help: Add explicit value for parameter `strict=`
 2 | 
 3 | # Errors
-4 | zip("a", "b")
-  - zip("a", "b", *zip("c"))
-5 + zip("a", "b", *zip("c"), strict=False)
-6 | zip(zip("a", "b"), strict=False)
-7 | zip(zip("a", strict=True),"b")
-8 | 
+4 | zip()
+  - zip(range(3))
+5 + zip(range(3), strict=False)
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
+8 | zip(zip("a"), strict=False)
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
- --> B905.py:6:5
+ --> B905.py:6:1
   |
-4 | zip("a", "b")
-5 | zip("a", "b", *zip("c"))
-6 | zip(zip("a", "b"), strict=False)
-  |     ^^^^^^^^^^^^^
-7 | zip(zip("a", strict=True),"b")
+4 | zip()
+5 | zip(range(3))
+6 | zip("a", "b")
+  | ^^^^^^^^^^^^^
+7 | zip("a", "b", *zip("c"))
+8 | zip(zip("a"), strict=False)
   |
 help: Add explicit value for parameter `strict=`
 3 | # Errors
-4 | zip("a", "b")
-5 | zip("a", "b", *zip("c"))
-  - zip(zip("a", "b"), strict=False)
-6 + zip(zip("a", "b", strict=False), strict=False)
-7 | zip(zip("a", strict=True),"b")
-8 | 
-9 | # OK
+4 | zip()
+5 | zip(range(3))
+  - zip("a", "b")
+6 + zip("a", "b", strict=False)
+7 | zip("a", "b", *zip("c"))
+8 | zip(zip("a"), strict=False)
+9 | zip(zip("a", strict=True))
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
  --> B905.py:7:1
   |
-5 | zip("a", "b", *zip("c"))
-6 | zip(zip("a", "b"), strict=False)
-7 | zip(zip("a", strict=True),"b")
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 |
-9 | # OK
+5 | zip(range(3))
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
+8 | zip(zip("a"), strict=False)
+9 | zip(zip("a", strict=True))
   |
 help: Add explicit value for parameter `strict=`
-4  | zip("a", "b")
-5  | zip("a", "b", *zip("c"))
-6  | zip(zip("a", "b"), strict=False)
-   - zip(zip("a", strict=True),"b")
-7  + zip(zip("a", strict=True),"b", strict=False)
-8  | 
-9  | # OK
-10 | zip(range(3), strict=True)
+4  | zip()
+5  | zip(range(3))
+6  | zip("a", "b")
+   - zip("a", "b", *zip("c"))
+7  + zip("a", "b", *zip("c"), strict=False)
+8  | zip(zip("a"), strict=False)
+9  | zip(zip("a", strict=True))
+10 | 
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:22:1
+ --> B905.py:7:16
+  |
+5 | zip(range(3))
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
+  |                ^^^^^^^^
+8 | zip(zip("a"), strict=False)
+9 | zip(zip("a", strict=True))
+  |
+help: Add explicit value for parameter `strict=`
+4  | zip()
+5  | zip(range(3))
+6  | zip("a", "b")
+   - zip("a", "b", *zip("c"))
+7  + zip("a", "b", *zip("c", strict=False))
+8  | zip(zip("a"), strict=False)
+9  | zip(zip("a", strict=True))
+10 | 
+note: This is an unsafe fix and may change runtime behavior
+
+B905 [*] `zip()` without an explicit `strict=` parameter
+ --> B905.py:8:5
+  |
+6 | zip("a", "b")
+7 | zip("a", "b", *zip("c"))
+8 | zip(zip("a"), strict=False)
+  |     ^^^^^^^^
+9 | zip(zip("a", strict=True))
+  |
+help: Add explicit value for parameter `strict=`
+5  | zip(range(3))
+6  | zip("a", "b")
+7  | zip("a", "b", *zip("c"))
+   - zip(zip("a"), strict=False)
+8  + zip(zip("a", strict=False), strict=False)
+9  | zip(zip("a", strict=True))
+10 | 
+11 | # OK
+note: This is an unsafe fix and may change runtime behavior
+
+B905 [*] `zip()` without an explicit `strict=` parameter
+  --> B905.py:9:1
    |
-21 | # Errors (limited iterators).
-22 | zip([1, 2, 3], repeat(1, 1))
+ 7 | zip("a", "b", *zip("c"))
+ 8 | zip(zip("a"), strict=False)
+ 9 | zip(zip("a", strict=True))
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 |
+11 | # OK
+   |
+help: Add explicit value for parameter `strict=`
+6  | zip("a", "b")
+7  | zip("a", "b", *zip("c"))
+8  | zip(zip("a"), strict=False)
+   - zip(zip("a", strict=True))
+9  + zip(zip("a", strict=True), strict=False)
+10 | 
+11 | # OK
+12 | zip(range(3), strict=True)
+note: This is an unsafe fix and may change runtime behavior
+
+B905 [*] `zip()` without an explicit `strict=` parameter
+  --> B905.py:24:1
+   |
+23 | # Errors (limited iterators).
+24 | zip([1, 2, 3], repeat(1, 1))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-23 | zip([1, 2, 3], repeat(1, times=4))
+25 | zip([1, 2, 3], repeat(1, times=4))
    |
 help: Add explicit value for parameter `strict=`
-19 | zip([1, 2, 3], repeat(1, times=None))
-20 | 
-21 | # Errors (limited iterators).
+21 | zip([1, 2, 3], repeat(1, times=None))
+22 | 
+23 | # Errors (limited iterators).
    - zip([1, 2, 3], repeat(1, 1))
-22 + zip([1, 2, 3], repeat(1, 1), strict=False)
-23 | zip([1, 2, 3], repeat(1, times=4))
-24 | 
-25 | import builtins
+24 + zip([1, 2, 3], repeat(1, 1), strict=False)
+25 | zip([1, 2, 3], repeat(1, times=4))
+26 | 
+27 | import builtins
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:23:1
+  --> B905.py:25:1
    |
-21 | # Errors (limited iterators).
-22 | zip([1, 2, 3], repeat(1, 1))
-23 | zip([1, 2, 3], repeat(1, times=4))
+23 | # Errors (limited iterators).
+24 | zip([1, 2, 3], repeat(1, 1))
+25 | zip([1, 2, 3], repeat(1, times=4))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-24 |
-25 | import builtins
+26 |
+27 | import builtins
    |
 help: Add explicit value for parameter `strict=`
-20 | 
-21 | # Errors (limited iterators).
-22 | zip([1, 2, 3], repeat(1, 1))
+22 | 
+23 | # Errors (limited iterators).
+24 | zip([1, 2, 3], repeat(1, 1))
    - zip([1, 2, 3], repeat(1, times=4))
-23 + zip([1, 2, 3], repeat(1, times=4), strict=False)
-24 | 
-25 | import builtins
-26 | # Still an error even though it uses the qualified name
+25 + zip([1, 2, 3], repeat(1, times=4), strict=False)
+26 | 
+27 | import builtins
+28 | # Still an error even though it uses the qualified name
 note: This is an unsafe fix and may change runtime behavior
 
 B905 [*] `zip()` without an explicit `strict=` parameter
-  --> B905.py:34:1
+  --> B905.py:29:1
    |
-32 | zip(range(3))
-33 | # Error
-34 | zip(*lot_of_iterators)
-   | ^^^^^^^^^^^^^^^^^^^^^^
+27 | import builtins
+28 | # Still an error even though it uses the qualified name
+29 | builtins.zip([1, 2, 3])
+   | ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: Add explicit value for parameter `strict=`
-31 | zip()
-32 | zip(range(3))
-33 | # Error
-   - zip(*lot_of_iterators)
-34 + zip(*lot_of_iterators, strict=False)
+26 | 
+27 | import builtins
+28 | # Still an error even though it uses the qualified name
+   - builtins.zip([1, 2, 3])
+29 + builtins.zip([1, 2, 3], strict=False)
 note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_5.py.snap

@@ -16,7 +16,7 @@ help: Replace with `None`; initialize within function
 5  + def import_module_wrong(value: dict[str, str] = None):
 6  |     import os
 7  +     if value is None:
-8  +         value = {}
+8  +         value: dict[str, str] = {}
 9  | 
 10 | 
 11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
@@ -38,7 +38,7 @@ help: Replace with `None`; initialize within function
 10 |     import os
 11 | 
 12 +     if value is None:
-13 +         value = {}
+13 +         value: dict[str, str] = {}
 14 |     return 2
 15 | 
 16 | 
@@ -62,7 +62,7 @@ help: Replace with `None`; initialize within function
 17 |     import sys
 18 |     import itertools
 19 +     if value is None:
-20 +         value = {}
+20 +         value: dict[str, str] = {}
 21 | 
 22 | 
 23 | def from_import_module_wrong(value: dict[str, str] = {}):
@@ -83,7 +83,7 @@ help: Replace with `None`; initialize within function
 21 + def from_import_module_wrong(value: dict[str, str] = None):
 22 |     from os import path
 23 +     if value is None:
-24 +         value = {}
+24 +         value: dict[str, str] = {}
 25 | 
 26 | 
 27 | def from_imports_module_wrong(value: dict[str, str] = {}):
@@ -106,7 +106,7 @@ help: Replace with `None`; initialize within function
 26 |     from os import path
 27 |     from sys import version_info
 28 +     if value is None:
-29 +         value = {}
+29 +         value: dict[str, str] = {}
 30 | 
 31 | 
 32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
@@ -129,7 +129,7 @@ help: Replace with `None`; initialize within function
 31 |     import os
 32 |     from sys import version_info
 33 +     if value is None:
-34 +         value = {}
+34 +         value: dict[str, str] = {}
 35 | 
 36 | 
 37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
@@ -152,7 +152,7 @@ help: Replace with `None`; initialize within function
 36 |     """Docstring"""
 37 |     import os
 38 +     if value is None:
-39 +         value = {}
+39 +         value: dict[str, str] = {}
 40 | 
 41 | 
 42 | def import_module_wrong(value: dict[str, str] = {}):
@@ -175,7 +175,7 @@ help: Replace with `None`; initialize within function
 41 |     """Docstring"""
 42 |     import os; import sys
 43 +     if value is None:
-44 +         value = {}
+44 +         value: dict[str, str] = {}
 45 | 
 46 | 
 47 | def import_module_wrong(value: dict[str, str] = {}):
@@ -197,7 +197,7 @@ help: Replace with `None`; initialize within function
 45 + def import_module_wrong(value: dict[str, str] = None):
 46 |     """Docstring"""
 47 +     if value is None:
-48 +         value = {}
+48 +         value: dict[str, str] = {}
 49 |     import os; import sys; x = 1
 50 | 
 51 | 
@@ -220,7 +220,7 @@ help: Replace with `None`; initialize within function
 51 |     """Docstring"""
 52 |     import os; import sys
 53 +     if value is None:
-54 +         value = {}
+54 +         value: dict[str, str] = {}
 55 | 
 56 | 
 57 | def import_module_wrong(value: dict[str, str] = {}):
@@ -241,7 +241,7 @@ help: Replace with `None`; initialize within function
 55 + def import_module_wrong(value: dict[str, str] = None):
 56 |     import os; import sys
 57 +     if value is None:
-58 +         value = {}
+58 +         value: dict[str, str] = {}
 59 | 
 60 | 
 61 | def import_module_wrong(value: dict[str, str] = {}):
@@ -261,7 +261,7 @@ help: Replace with `None`; initialize within function
    - def import_module_wrong(value: dict[str, str] = {}):
 59 + def import_module_wrong(value: dict[str, str] = None):
 60 +     if value is None:
-61 +         value = {}
+61 +         value: dict[str, str] = {}
 62 |     import os; import sys; x = 1
 63 | 
 64 | 
@@ -282,7 +282,7 @@ help: Replace with `None`; initialize within function
 63 + def import_module_wrong(value: dict[str, str] = None):
 64 |     import os; import sys
 65 +     if value is None:
-66 +         value = {}
+66 +         value: dict[str, str] = {}
 67 | 
 68 | 
 69 | def import_module_wrong(value: dict[str, str] = {}): import os

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_8.py.snap

@@ -51,7 +51,7 @@ help: Replace with `None`; initialize within function
 10 + def baz(a: list = None):
 11 |     """This one raises a different exception"""
 12 +     if a is None:
-13 +         a = []
+13 +         a: list = []
 14 |     raise IndexError()
 15 | 
 16 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B912_B912.py.snap

@@ -1,5 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
+assertion_line: 112
 ---
 B912 [*] `map()` without an explicit `strict=` parameter
  --> B912.py:5:1
@@ -146,18 +147,3 @@ help: Add explicit value for parameter `strict=`
 19 | # OK
 20 | map(lambda x: x, [1, 2, 3], strict=True)
 note: This is an unsafe fix and may change runtime behavior
-
-B912 [*] `map()` without an explicit `strict=` parameter
-  --> B912.py:36:1
-   |
-35 | # Regression https://github.com/astral-sh/ruff/issues/20997
-36 | map(f, *lots_of_iterators)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-help: Add explicit value for parameter `strict=`
-33 | map(lambda x, y: x + y, [1, 2, 3], count())
-34 | 
-35 | # Regression https://github.com/astral-sh/ruff/issues/20997
-   - map(f, *lots_of_iterators)
-36 + map(f, *lots_of_iterators, strict=False)
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/flake8_datetimez/rules/call_date_fromtimestamp.rs

@@ -11,15 +11,15 @@ use crate::checkers::ast::Checker;
 /// Checks for usage of `datetime.date.fromtimestamp()`.
 ///
 /// ## Why is this bad?
-/// Python date objects are naive, that is, not timezone-aware. While an aware
+/// Python datetime objects can be naive or timezone-aware. While an aware
 /// object represents a specific moment in time, a naive object does not
 /// contain enough information to unambiguously locate itself relative to other
 /// datetime objects. Since this can lead to errors, it is recommended to
 /// always use timezone-aware objects.
 ///
-/// `datetime.date.fromtimestamp(ts)` returns a naive date object.
-/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...).date()` to
-/// create a timezone-aware datetime object and retrieve its date component.
+/// `datetime.date.fromtimestamp(ts)` returns a naive datetime object.
+/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...)` to create a
+/// timezone-aware object.
 ///
 /// ## Example
 /// ```python
@@ -32,14 +32,14 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc).date()
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc)
 /// ```
 ///
 /// Or, for Python 3.11 and later:
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC).date()
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC)
 /// ```
 ///
 /// ## References